Index: openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl,v diff -u -r1.13.4.1 -r1.13.4.2 --- openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl 25 Jun 2007 17:46:54 -0000 1.13.4.1 +++ openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl 26 Jun 2007 10:27:55 -0000 1.13.4.2 @@ -161,13 +161,15 @@ from imsld_propertiesi where component_id = :component_item_id and type = 'loc' + and content_revision__is_live(property_id) = 't' } { if { ![db_0or1row loc_already_instantiated_p { select 1 - from imsld_property_instancesi + from imsld_property_instances where property_id = :property_id and identifier = :identifier and run_id = :run_id + and content_revision__is_live(property_id) = 't' }] } { set instance_id [imsld::item_revision_new -attributes [list [list run_id $run_id] \ [list value $initial_value] \ @@ -195,6 +197,7 @@ from imsld_propertiesi where component_id = :component_item_id and type = 'locpers' + and content_revision__is_live(property_id) = 't' }] { set property_id [lindex $property_list 0] set identifier [lindex $property_list 1] @@ -209,11 +212,12 @@ } { if { ![db_0or1row locrole_already_instantiated_p { select 1 - from imsld_property_instancesi + from imsld_property_instances where property_id = :property_id and identifier = :identifier and party_id = :party_id and run_id = :run_id + and content_revision__is_live(property_id) = 't' }] } { set instance_id [imsld::item_revision_new -attributes [list [list run_id $run_id] \ [list value $initial_value] \ @@ -242,6 +246,7 @@ from imsld_propertiesi where component_id = :component_item_id and type = 'locrole' + and content_revision__is_live(property_id) = 't' } { db_foreach roles_instances_in_run { select ar1.object_id_two as party_id @@ -256,11 +261,12 @@ } { if { ![db_0or1row locrole_already_instantiated_p { select 1 - from imsld_property_instancesi + from imsld_property_instances where property_id = :property_id and identifier = :identifier and party_id = :party_id and run_id = :run_id + and content_revision__is_live(property_id) = 't' }] } { set instance_id [imsld::item_revision_new -attributes [list [list run_id $run_id] \ @@ -296,6 +302,7 @@ from imsld_propertiesi where component_id = :component_item_id and type = 'globpers' + and content_revision__is_live(property_id) = 't' }] { set property_id [lindex $property_list 0] set identifier [lindex $property_list 1] @@ -315,6 +322,7 @@ from imsld_property_instances where identifier = :identifier and party_id = :party_id + and content_revision__is_live(property_id) = 't' }] } { # not instantiated... is it already defined (existing href)? or must we use the one of the global definition? if { ![string eq $existing_href ""] } { @@ -353,11 +361,13 @@ from imsld_propertiesi where component_id = :component_item_id and type = 'global' + and content_revision__is_live(property_id) = 't' } { if { ![db_0or1row global_already_instantiated_p { select 1 - from imsld_property_instancesi + from imsld_property_instances where identifier = :identifier + and content_revision__is_live(property_id) = 't' }] } { # not instantiated... is it already defined (existing href)? or must we use the one of the global definition? if { ![string eq $existing_href ""] } { Index: openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl,v diff -u -r1.16.4.1 -r1.16.4.2 --- openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl 25 Jun 2007 17:46:54 -0000 1.16.4.1 +++ openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl 26 Jun 2007 10:27:55 -0000 1.16.4.2 @@ -40,6 +40,7 @@ imsld_properties prop where ins.instance_id = :instance_id and ins.property_id = prop.property_id + and content_revision__is_live(ins.property_id) = 't' } # db_dml update_instance_value { *SQL* } Index: openacs-4/packages/imsld/www/properties-value-set.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/properties-value-set.tcl,v diff -u -r1.4.4.1 -r1.4.4.2 --- openacs-4/packages/imsld/www/properties-value-set.tcl 25 Jun 2007 17:46:54 -0000 1.4.4.1 +++ openacs-4/packages/imsld/www/properties-value-set.tcl 26 Jun 2007 10:27:55 -0000 1.4.4.2 @@ -26,6 +26,7 @@ imsld_properties prop where ins.instance_id = :instance_id and ins.property_id = prop.property_id + and content_revision__is_live(ins.property_id) = 't' } if { [string eq "file" $datatype] } { Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl,v diff -u -r1.2.4.1 -r1.2.4.2 --- openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl 30 May 2007 08:06:18 -0000 1.2.4.1 +++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl 26 Jun 2007 10:27:55 -0000 1.2.4.2 @@ -31,6 +31,7 @@ from imsld_property_instances where run_id = :run_id or run_id is null + and content_revision__is_live(property_id) = 't' }] } { # there is at least one property dom createDocument ul props_doc