Index: openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl 10 Sep 2015 08:27:56 -0000 1.2.2.1 +++ openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl 4 Jul 2016 11:35:25 -0000 1.2.2.2 @@ -17,8 +17,8 @@ - db_1row select_inter_item_check_name {*SQL*} - db_1row select_user_name {*SQL*} + db_1row select_inter_item_check_name {} + db_1row select_user_name {} set text "" set package_id [ad_conn package_id] Index: openacs-4/packages/assessment/tcl/as-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-callback-procs.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/assessment/tcl/as-callback-procs.tcl 10 Sep 2015 08:27:56 -0000 1.9.2.1 +++ openacs-4/packages/assessment/tcl/as-callback-procs.tcl 4 Jul 2016 11:35:25 -0000 1.9.2.2 @@ -43,13 +43,13 @@ set msg "Assessment items of user $user_id" set result [list $msg] - lappend result [list "Staff of sessions: [db_list sel_sessions { *SQL* }] "] + lappend result [list "Staff of sessions: [db_list sel_sessions {}] "] lappend result [list "Subject of sessions: [db_list sel_sessions2 {*SQL*}] "] - lappend result [list "Subject of section data id: [db_list sel_sections { *SQL* }] "] + lappend result [list "Subject of section data id: [db_list sel_sections {}] "] lappend result [list "Staff of section data id: [db_list sel_sections2 { *SQL* }] "] - lappend result [list "Subject of item data id : [db_list sel_items { *SQL* }] "] + lappend result [list "Subject of item data id : [db_list sel_items {}] "] lappend result [list "Staff of item_data_id: [db_list sel_items2 { *SQL* }] "] return $result @@ -69,11 +69,11 @@ set result [list $msg] ns_log Notice $msg db_transaction { - db_dml upd_from_sessions { *SQL* } + db_dml upd_from_sessions {} db_dml upd_from_sessions2 { *SQL* } - db_dml upd_from_sections { *SQL* } + db_dml upd_from_sections {} db_dml upd_from_sections2 { *SQL* } - db_dml upd_from_items { *SQL* } + db_dml upd_from_items {} db_dml upd_from_items2 { *SQL* } } Index: openacs-4/packages/assessment/tcl/as-checks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.tcl,v diff -u -r1.28.2.2 -r1.28.2.3 --- openacs-4/packages/assessment/tcl/as-checks-procs.tcl 3 Oct 2015 18:26:39 -0000 1.28.2.2 +++ openacs-4/packages/assessment/tcl/as-checks-procs.tcl 4 Jul 2016 11:35:25 -0000 1.28.2.3 @@ -229,7 +229,7 @@ } { set error_txt "" - db_foreach get_check_params { } { + db_foreach get_check_params {} { set parameter_name [db_1row select_name {}] set $varname "" @@ -298,7 +298,7 @@ } { db_0or1row subject_id {select subject_id from as_sessions where session_id=:session_id} - db_foreach get_check_params { } { + db_foreach get_check_params {} { set parameter_name [db_1row select_name {}] set $varname "" @@ -368,7 +368,7 @@ } { - set section_checks [db_list_of_lists section_checks { }] + set section_checks [db_list_of_lists section_checks {}] foreach check $section_checks { set check_sql [lindex $check 1] @@ -400,7 +400,7 @@ set perform [db_string check_sql "[lindex $check 0]" -default 0] if {$perform == 1} { - set order [db_string get_order { }] + set order [db_string get_order {}] } } @@ -468,7 +468,7 @@ } { - set section_checks [db_list_of_lists section_checks { }] + set section_checks [db_list_of_lists section_checks {}] foreach check $section_checks { set check_sql [lindex $check 1] Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v diff -u -r1.43.2.1 -r1.43.2.2 --- openacs-4/packages/assessment/tcl/as-install-procs.tcl 10 Sep 2015 08:27:57 -0000 1.43.2.1 +++ openacs-4/packages/assessment/tcl/as-install-procs.tcl 4 Jul 2016 11:35:25 -0000 1.43.2.2 @@ -404,14 +404,14 @@ # update as_param_map table to set the item_id as a cr_item and not a cr_revision id db_foreach as_parameter { select cr.item_id, pm.parameter_id from as_param_map pm, cr_revisions cr where cr.revision_id = pm.item_id} { - db_dml update_parameters { update as_param_map set item_id=:item_id where parameter_id=:parameter_id} + db_dml update_parameters { update as_param_map set item_id=:item_id where parameter_id=:parameter_id} } } 0.14 0.15 { # update as_inter_item_check_id table to set the check_sql condition using the item_id of a choice instead of using the revision_id - db_foreach check { select inter_item_check_id, check_sql from as_inter_item_checks } { + db_foreach check { select inter_item_check_id, check_sql from as_inter_item_checks } { set cond_list [split $check_sql "="] set item_id [lindex [split [lindex $cond_list 2] " "] 0] set choice_id [lindex [split [lindex $cond_list 1] " "] 0] Index: openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl 10 Sep 2015 08:27:58 -0000 1.6.2.1 +++ openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl 4 Jul 2016 11:35:25 -0000 1.6.2.2 @@ -112,7 +112,7 @@ content::item::set_live_revision -revision_id $file_revision_id set as_item_data_id [as::item_data::new -session_id $session_id -subject_id $subject_id -staff_id $staff_id -as_item_id $as_item_id -section_id $section_id -text_answer [lindex $response 0] -points "" -allow_overwrite_p $allow_overwrite_p -package_id $package_id] } - db_dml update_item_data { } + db_dml update_item_data {} } Index: openacs-4/packages/assessment/tcl/as-section-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs.tcl,v diff -u -r1.33.2.1 -r1.33.2.2 --- openacs-4/packages/assessment/tcl/as-section-procs.tcl 10 Sep 2015 08:28:00 -0000 1.33.2.1 +++ openacs-4/packages/assessment/tcl/as-section-procs.tcl 4 Jul 2016 11:35:25 -0000 1.33.2.2 @@ -388,7 +388,7 @@ Return a list of checks for the section within the assessment } { - return [db_list_of_lists checks_related { } ] + return [db_list_of_lists checks_related {} ] } ad_proc -private as::section::update_section_in_assessment { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/callback-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/callback-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/tcl/callback-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/callback-procs.xql,v diff -u -r1.3 -r1.3.6.1 --- openacs-4/packages/assessment/tcl/callback-procs.xql 2 Sep 2008 17:21:29 -0000 1.3 +++ openacs-4/packages/assessment/tcl/callback-procs.xql 4 Jul 2016 11:35:25 -0000 1.3.6.1 @@ -3,39 +3,9 @@ - select package_id from cr_folders where folder_id=(select context_id from acs_objects where object_id=:assessment_id) + select package_id from cr_folders + where folder_id = (select context_id from acs_objects where object_id=:assessment_id) - - - select ci.item_id as assessment_id, cr.title, ci.publish_status, - (select count(*) from (select distinct subject_id from as_sessions - where assessment_id in (select revision_id - from cr_revisions where item_id=ci.item_id) - and completed_datetime is not null) c - ) as completed_number - from cr_items ci, cr_revisions cr, acs_objects o - where cr.revision_id = ci.latest_revision - and o.package_id in ([template::util::tcl_to_sql_list $list_of_package_ids]) - and o.object_id = ci.item_id - and ci.content_type = 'as_assessments' -and not exists (select 1 from -as_assessment_section_map m, -ims_cp_resources r, -cr_revisions cr, -cr_revisions cr2 -where r.identifier= cr2.item_id -and cr2.revision_id = m.section_id -and m.assessment_id = cr.revision_id -and cr.item_id = ci.item_id) - $folder_id_clause - and exists (select 1 from acs_object_party_privilege_map ppm - where ppm.object_id = ci.item_id - and ppm.privilege = 'admin' - and ppm.party_id = :user_id) - order by cr.title - - - - \ No newline at end of file + Index: openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql,v diff -u -r1.1.14.1 -r1.1.14.2 --- openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql 4 Jul 2016 11:23:05 -0000 1.1.14.1 +++ openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql 4 Jul 2016 11:35:25 -0000 1.1.14.2 @@ -20,7 +20,7 @@ select ci.item_id as assessment_id, cr.title, ci.publish_status - from cr_items ci, cr_revisions cr + from cr_items ci, cr_revisions cr where cr.revision_id = ci.latest_revision and ci.content_type = 'as_assessments' and ci.parent_id = :folder_id