Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-b-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-b-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/imsld/sql/postgresql/imsld-level-b-create.sql	21 Jun 2006 10:43:08 -0000	1.6
+++ openacs-4/packages/imsld/sql/postgresql/imsld-level-b-create.sql	21 Jun 2006 11:12:13 -0000	1.7
@@ -141,14 +141,10 @@
                             constraint imsld_then_ref_fk
                             references cr_items     --imsld_roles
                             not null,
-    expression_id           integer
-                            constraint imsld_then_cpv_fk
-                            references cr_items     --imsld_properties_values
-                            not null
+    expression_xml          text
 );
 
 create index imsld_when_role_idx on imsld_when_condition_true(role_id);
-create index imsld_when_exp_idx on imsld_when_condition_true(expression_id);
 
 comment on table imsld_when_condition_true is '
 Simple expression for a condition. This condition applies to all the individual users mentioned in the containing role-ref. When the contained expression is true for all users in the specified roles, this condition is true.';
@@ -164,8 +160,6 @@
 alter table imsld_services drop constraint imsld_serv_type_ck;
 alter table imsld_services add constraint imsld_serv_type_ck check (service_type in ('send-mail','conference','monitor'));
 
-
-
 create table imsld_conditions (
     condition_id    integer 
                     constraint imsld_cond_fk