Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v diff -u -r1.63 -r1.64 --- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 25 Apr 2007 10:52:30 -0000 1.63 +++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 16 Jan 2008 10:30:40 -0000 1.64 @@ -1946,7 +1946,9 @@ # an error happened, abort and return the list whit the error return $item_list } - + if { ![info exist role_id] } { + set role_id ""; + } # create the monitor service set monitor_service_id [imsld::item_revision_new -attributes [list [list service_id $service_id] \ [list role_id $role_id] \ 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 -r1.17 --- openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl 25 Apr 2007 10:52:30 -0000 1.16 +++ openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl 16 Jan 2008 10:30:40 -0000 1.17 @@ -255,10 +255,11 @@ } else { incr recursivity_count } +#FIXME: the parameter has to be set as a package parameter. Meanwhile, I use a constant + set ConditionsRecursionLimit [parameter::get -package_id [apm_package_id_from_key imsld-portlet] -parameter ConditionsRecursionLimit ] + set ConditionsRecursionLimit 20 - set ConditionsRecursionLimit [parameter::get -package_id [apm_package_id_from_key imsld-portlet] -parameter ConditionsRecursionLimit] - - if { $recursivity_count >= $ConditionsRecursionLimit } { + if { $recursivity_count >= $ConditionsRecursionLimit } { ns_log error "IMSLD::imsld::runtime::property::property_value_set [_ imsld.lt_Unstable_state_reache]" ad_return_error "[_ imsld.lt_Unestable_state_reach]" "[_ imsld.lt_Unstable_state_reache]" ad_script_abort Index: openacs-4/packages/imsld/www/monitor-frame.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/monitor-frame.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/imsld/www/monitor-frame.tcl 20 Jun 2006 19:20:38 -0000 1.1 +++ openacs-4/packages/imsld/www/monitor-frame.tcl 16 Jan 2008 10:30:40 -0000 1.2 @@ -16,8 +16,15 @@ set user_id [ad_conn user_id] -db_1row monitor_service_info { *SQL* } +ns_log Notice "role_id: $role_id" +if { ![ string eq $role_id ""] } { + db_1row monitor_service_info { *SQL* } +} else { + db_1row monitor_service_info_no_role_id { *SQL* } +} + + template::multirow create users_in_role role_user_id user_name set monitoring_user_name "[_ imsld.None]" Index: openacs-4/packages/imsld/www/monitor-frame.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/monitor-frame.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/imsld/www/monitor-frame.xql 20 Jun 2006 19:20:38 -0000 1.1 +++ openacs-4/packages/imsld/www/monitor-frame.xql 16 Jan 2008 10:30:40 -0000 1.2 @@ -13,10 +13,25 @@ where ims.monitor_id = :monitor_id and cr.item_id = ims.imsld_item_id and content_revision__is_live(cr.live_revision) = 't' - and ims.role_id = cr2.item_id + and ims.role_id = cr2.item_id + + + select ims.title as monitor_service_title, + ims.monitor_id, + ims.item_id as monitor_item_id, + ims.self_p, + cr.live_revision as imsld_item_id + from imsld_monitor_servicesi ims, cr_items cr + where ims.monitor_id = :monitor_id + and cr.item_id = ims.imsld_item_id + and content_revision__is_live(cr.live_revision) = 't' + + + +