Index: openacs-4/packages/assessment/tcl/as-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-procs.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/assessment/tcl/as-item-procs.tcl 15 Jun 2018 22:47:45 -0000 1.24 +++ openacs-4/packages/assessment/tcl/as-item-procs.tcl 15 Jun 2018 23:11:09 -0000 1.25 @@ -28,34 +28,34 @@ New item to the database } { if { $package_id eq "" } { - set package_id [ad_conn package_id] + set package_id [ad_conn package_id] } set folder_id [as::assessment::folder_id -package_id $package_id] # Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id) db_transaction { - if {$item_item_id eq ""} { - set item_item_id [db_nextval acs_object_id_seq] - } - set name "QUE_$item_item_id" - if {$field_name eq ""} { - set field_name $name - } + if {$item_item_id eq ""} { + set item_item_id [db_nextval acs_object_id_seq] + } + set name "QUE_$item_item_id" + if {$field_name eq ""} { + set field_name $name + } set item_item_id [content::item::new -item_id $item_item_id -parent_id $folder_id -content_type {as_items} -name $name -creation_user [ad_conn user_id] -creation_ip [ad_conn peeraddr] -storage_type text] set as_item_id [content::revision::new -item_id $item_item_id \ - -content_type {as_items} \ - -title [string range $title 0 999] \ + -content_type {as_items} \ + -title [string range $title 0 999] \ -content $title \ -mime_type "text/html" \ - -description $description \ - -attributes [list [list subtext $subtext] \ - [list field_name $field_name] \ - [list field_code $field_code] \ - [list required_p $required_p] \ - [list data_type $data_type] \ - [list max_time_to_complete $max_time_to_complete] \ - [list points $points] ] ] + -description $description \ + -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ + [list field_code $field_code] \ + [list required_p $required_p] \ + [list data_type $data_type] \ + [list max_time_to_complete $max_time_to_complete] \ + [list points $points] ] ] } db_dml update_clobs "" -clobs [list $feedback_right $feedback_wrong $validate_block] return $as_item_id @@ -83,22 +83,22 @@ } { # Update as_item in the CR (and as_items table) getting the revision_id (as_item_id) db_transaction { - set item_item_id [db_string item_item_id {}] + set item_item_id [db_string item_item_id {}] set new_item_id [content::revision::new \ - -item_id $item_item_id \ - -content_type {as_items} \ - -title [string range $title 0 999] \ - -content $title \ - -description $description \ - -attributes [list [list subtext $subtext] \ - [list field_name $field_name] \ - [list field_code $field_code] \ - [list required_p $required_p] \ - [list data_type $data_type] \ - [list max_time_to_complete $max_time_to_complete] \ - [list points $points] ] ] + -item_id $item_item_id \ + -content_type {as_items} \ + -title [string range $title 0 999] \ + -content $title \ + -description $description \ + -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ + [list field_code $field_code] \ + [list required_p $required_p] \ + [list data_type $data_type] \ + [list max_time_to_complete $max_time_to_complete] \ + [list points $points] ] ] - copy_types -as_item_id $as_item_id -new_item_id $new_item_id + copy_types -as_item_id $as_item_id -new_item_id $new_item_id } db_dml update_clobs "" -clobs [list $feedback_right $feedback_wrong $validate_block] return $new_item_id @@ -114,23 +114,23 @@ } { # Update as_item in the CR (and as_items table) getting the revision_id (as_item_id) db_transaction { - db_1row item_data {} - set new_item_id [content::revision::new \ - -item_id $item_item_id \ - -content_type {as_items} \ - -title $title \ - -description $description \ - -content $content \ - -attributes [list [list subtext $subtext] \ - [list field_name $field_name] \ - [list field_code $field_code] \ - [list required_p $required_p] \ - [list data_type $data_type] \ - [list max_time_to_complete $max_time_to_complete] \ - [list points $points] ] ] + db_1row item_data {} + set new_item_id [content::revision::new \ + -item_id $item_item_id \ + -content_type {as_items} \ + -title $title \ + -description $description \ + -content $content \ + -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ + [list field_code $field_code] \ + [list required_p $required_p] \ + [list data_type $data_type] \ + [list max_time_to_complete $max_time_to_complete] \ + [list points $points] ] ] - copy_types -as_item_id $as_item_id -new_item_id $new_item_id - as::assessment::copy_categories -from_id $as_item_id -to_id $new_item_id + copy_types -as_item_id $as_item_id -new_item_id $new_item_id + as::assessment::copy_categories -from_id $as_item_id -to_id $new_item_id } db_dml update_clobs "" -clobs [list $feedback_right $feedback_wrong $validate_block] @@ -148,7 +148,7 @@ Returns the latest revision of an item } { if {![db_0or1row get_latest_item_id {}] && $default ne ""} { - return $default + return $default } return $as_item_id } @@ -167,45 +167,45 @@ } { # Update as_item in the CR (and as_items table) getting the revision_id (as_item_id) if { $package_id eq "" } { - set package_id [ad_conn package_id] + set package_id [ad_conn package_id] } set folder_id [as::assessment::folder_id -package_id $package_id] set new_title $title db_transaction { - db_1row item_data {} + db_1row item_data {} - set item_item_id [db_nextval acs_object_id_seq] - set name "QUE_$item_item_id" - if {$field_name eq ""} { - set field_name $name - } + set item_item_id [db_nextval acs_object_id_seq] + set name "QUE_$item_item_id" + if {$field_name eq ""} { + set field_name $name + } set item_item_id [content::item::new -item_id $item_item_id -parent_id $folder_id -content_type {as_items} -name $name -storage_type text] set new_item_id [content::revision::new \ - -item_id $item_item_id \ - -content_type {as_items} \ - -title [string range $new_title 0 999] \ - -content $new_title \ - -description $description \ - -attributes [list [list subtext $subtext] \ - [list field_name $field_name] \ - [list field_code $field_code] \ - [list required_p $required_p] \ - [list data_type $data_type] \ - [list max_time_to_complete $max_time_to_complete] \ - [list feedback_right $feedback_right] \ - [list feedback_wrong $feedback_wrong] \ - [list points $points] \ - [list validate_block $validate_block] ] ] + -item_id $item_item_id \ + -content_type {as_items} \ + -title [string range $new_title 0 999] \ + -content $new_title \ + -description $description \ + -attributes [list [list subtext $subtext] \ + [list field_name $field_name] \ + [list field_code $field_code] \ + [list required_p $required_p] \ + [list data_type $data_type] \ + [list max_time_to_complete $max_time_to_complete] \ + [list feedback_right $feedback_right] \ + [list feedback_wrong $feedback_wrong] \ + [list points $points] \ + [list validate_block $validate_block] ] ] - as::assessment::copy_categories -from_id $as_item_id -to_id $new_item_id + as::assessment::copy_categories -from_id $as_item_id -to_id $new_item_id - set subtypes [db_list_of_lists item_subtypes {}] - foreach subtype $subtypes { - lassign $subtype type_id type - set new_type_id [eval as::[string range $type 3 end]::copy -type_id $type_id] - as::item_rels::new -item_rev_id $new_item_id -target_rev_id $new_type_id -type "[string range $type 0 end-2]rel" - } + set subtypes [db_list_of_lists item_subtypes {}] + foreach subtype $subtypes { + lassign $subtype type_id type + set new_type_id [eval as::[string range $type 3 end]::copy -type_id $type_id] + as::item_rels::new -item_rev_id $new_item_id -target_rev_id $new_type_id -type "[string range $type 0 end-2]rel" + } } return $new_item_id @@ -254,22 +254,22 @@ args } { Generate a unique string to be used as item name - + @author Roel Canicula (roelmc@info.com.ph) @creation-date 2005-05-06 - + @param args - @return - - @error + @return + + @error } { if { [llength $args] } { - return [join $args "-"] + return [join $args "-"] } elseif { ! [catch {set uuid [exec uuidgen]}] } { - return $uuid + return $uuid } else { - return "[clock seconds]-[expr round([ns_rand]*100000)]" + return "[clock seconds]-[expr round([ns_rand]*100000)]" } } @@ -278,7 +278,7 @@ {-array_name item_type_info} } { An array of revision_id, item_type, object_type of a certain as_item - + @param as_item_id Revision_id of as_item object @param array_name Name of array to create in caller's scope via upvar @@ -299,7 +299,7 @@ question (as_item), and the associated as_item_type object that was related changed. @param item_type_id revision_id of as_item_type_* object @parma as_item_id revision_id of as_item_object - + @return does not return anything interesting @author Dave Bauer (dave@solutiongrove.com) @@ -329,11 +329,11 @@ } ad_proc -private as::item::get_item_type_id { - -as_item_id + -as_item_id } { Get the item type id } { - return [db_string item_type_id {}] + return [db_string item_type_id {}] } # Local variables: