Index: openacs-4/packages/assessment/tcl/as-assessment-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-assessment-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment/tcl/as-assessment-procs.tcl 22 Nov 2004 11:40:42 -0000 1.4 +++ openacs-4/packages/assessment/tcl/as-assessment-procs.tcl 22 Nov 2004 11:59:22 -0000 1.5 @@ -40,7 +40,7 @@ # Insert as_assessment in the CR (and as_assessments table) getting the revision_id (as_assessment_id) db_transaction { - set assessment_item_id [content::item::new -parent_id $folder_id -content_type {as_assessments} -name [ad_generate_random_string] -title $title ] + set assessment_item_id [content::item::new -parent_id $folder_id -content_type {as_assessments} -name [exec uuidgen] -title $title ] set as_assessment_id [content::revision::new \ -item_id $assessment_item_id \ Index: openacs-4/packages/assessment/tcl/as-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-file-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/tcl/as-file-procs.tcl 25 Oct 2004 16:05:11 -0000 1.1 +++ openacs-4/packages/assessment/tcl/as-file-procs.tcl 22 Nov 2004 11:59:22 -0000 1.2 @@ -23,7 +23,7 @@ set file_name $file_pathname } # TODO make the CR name be a SHA1 of the file to prevent too much files repeated - set file_item_id [content::item::new -parent_id $folder_id -content_type {as_files} -name [ad_generate_random_string] -title $file_name] + set file_item_id [content::item::new -parent_id $folder_id -content_type {as_files} -name [exec uuidgen] -title $file_name] set file_revision_id [content::revision::new -item_id $file_item_id -content_type {as_files} -title $file_name ] set filename [cr_create_content_file $file_item_id $file_revision_id $file_pathname] set title [template::util::file::get_property filename $file_pathname] Index: openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -26,7 +26,7 @@ # Insert as_item_answer in the CR (and as_item_sa_answers table) getting the revision_id (as_item_answer_id) db_transaction { - set item_answer_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [ad_generate_random_string] -title $title ] + set item_answer_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [exec uuidgen] -title $title ] set as_item_answer_id [content::revision::new \ -item_id $item_answer_id \ -content_type {as_item_answers} \ Index: openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -31,7 +31,7 @@ # Insert as_item_choice in the CR (and as_item_choices table) getting the revision_id (as_item_choice_id) db_transaction { - set item_choice_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [ad_generate_random_string] -title $title ] + set item_choice_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [exec uuidgen] -title $title ] set as_item_choice_id [content::revision::new \ -item_id $item_choice_id \ -content_type {as_item_choices} \ Index: openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -24,7 +24,7 @@ # Insert as_item_display_cb in the CR (and as_item_display_cb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_cb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_cb} -name [ad_generate_random_string]] + set item_item_display_cb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_cb} -name [exec uuidgen]] set as_item_display_cb_id [content::revision::new \ -item_id $item_item_display_cb_id \ -content_type {as_item_display_cb} \ Index: openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -24,7 +24,7 @@ # Insert as_item_display_rb in the CR (and as_item_display_rb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_rb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_rb} -name [ad_generate_random_string]] + set item_item_display_rb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_rb} -name [exec uuidgen]] set as_item_display_rb_id [content::revision::new \ -item_id $item_item_display_rb_id \ -content_type {as_item_display_rb} \ Index: openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -21,7 +21,7 @@ # Insert as_item_display_sa in the CR (and as_item_display_sa table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_display_sa} -name [ad_generate_random_string]] + set item_item_display_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_display_sa} -name [exec uuidgen]] set as_item_display_sa_id [content::revision::new \ -item_id $item_item_display_sa_id \ -content_type {as_item_display_sa} \ Index: openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -22,7 +22,7 @@ # Insert as_item_display_ta in the CR (and as_item_display_ta table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_ta_id [content::item::new -parent_id $folder_id -content_type {as_item_display_ta} -name [ad_generate_random_string]] + set item_item_display_ta_id [content::item::new -parent_id $folder_id -content_type {as_item_display_ta} -name [exec uuidgen]] set as_item_display_ta_id [content::revision::new \ -item_id $item_item_display_ta_id \ -content_type {as_item_display_ta} \ Index: openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -21,7 +21,7 @@ # Insert as_item_display_tb in the CR (and as_item_display_tb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_tb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_tb} -name [ad_generate_random_string]] + set item_item_display_tb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_tb} -name [exec uuidgen]] set as_item_display_tb_id [content::revision::new \ -item_id $item_item_display_tb_id \ -content_type {as_item_display_tb} \ 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.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -27,7 +27,7 @@ # Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id) db_transaction { - set item_item_id [content::item::new -parent_id $folder_id -content_type {as_items} -name [ad_generate_random_string] -title $title ] + set item_item_id [content::item::new -parent_id $folder_id -content_type {as_items} -name [exec uuidgen] -title $title ] set as_item_id [content::revision::new -item_id $item_item_id \ -content_type {as_items} \ -title $title \ Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -25,7 +25,7 @@ # Insert as_item_type_mc in the CR (and as_item_type_mc table) getting the revision_id (as_item_type_id) db_transaction { - set item_item_type_mc_id [content::item::new -parent_id $folder_id -content_type {as_item_type_mc} -name [ad_generate_random_string] -title $title ] + set item_item_type_mc_id [content::item::new -parent_id $folder_id -content_type {as_item_type_mc} -name [exec uuidgen] -title $title ] set as_item_type_mc_id [content::revision::new \ -item_id $item_item_type_mc_id \ -content_type {as_item_type_mc} \ Index: openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -21,7 +21,7 @@ # Insert as_item_type_oq in the CR (and as_item_type_oq table) getting the revision_id (as_item_type_id) db_transaction { - set item_item_type_oq_id [content::item::new -parent_id $folder_id -content_type {as_item_type_oq} -name [ad_generate_random_string] -title $title ] + set item_item_type_oq_id [content::item::new -parent_id $folder_id -content_type {as_item_type_oq} -name [exec uuidgen] -title $title ] set as_item_type_oq_id [content::revision::new \ -item_id $item_item_type_oq_id \ -content_type {as_item_type_oq} \ Index: openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl 22 Nov 2004 11:59:22 -0000 1.3 @@ -21,7 +21,7 @@ # Insert as_item_type_sa in the CR (and as_item_type_sa table) getting the revision_id (as_item_type_id) db_transaction { - set item_item_type_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_type_sa} -name [ad_generate_random_string] -title $title ] + set item_item_type_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_type_sa} -name [exec uuidgen] -title $title ] set as_item_type_sa_id [content::revision::new \ -item_id $item_item_type_sa_id \ -content_type {as_item_type_sa} \ 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.3 -r1.4 --- openacs-4/packages/assessment/tcl/as-section-procs.tcl 15 Nov 2004 17:17:15 -0000 1.3 +++ openacs-4/packages/assessment/tcl/as-section-procs.tcl 22 Nov 2004 11:59:22 -0000 1.4 @@ -26,7 +26,7 @@ # Insert as_section in the CR (and as_sections table) getting the revision_id (as_section_id) db_transaction { - set section_item_id [content::item::new -parent_id $folder_id -content_type {as_sections} -name [ad_generate_random_string] -title $title -description $description ] + set section_item_id [content::item::new -parent_id $folder_id -content_type {as_sections} -name [exec uuidgen] -title $title -description $description ] set as_section_id [content::revision::new \ -item_id $section_item_id \ Index: openacs-4/packages/assessment/tcl/as-session-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-session-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-session-procs.tcl 15 Nov 2004 17:17:15 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-session-procs.tcl 22 Nov 2004 11:59:23 -0000 1.3 @@ -31,11 +31,11 @@ # db_0or1row as_session_last {SELECT session_id AS as_session_id FROM as_sessionsx WHERE subject_id = :subject_id AND assessment_id = :assessment_id} # if { ! [info exists as_session_id] } { # Insert as_session in the CR (and as_sessions table) getting the revision_id (session_id) - set session_id [content::item::new -parent_id $folder_id -content_type {as_sessions} -name "$subject_id-$assessment_id-[ad_generate_random_string]" -title "$subject_id-$assessment_id-[ad_generate_random_string]" ] + set session_id [content::item::new -parent_id $folder_id -content_type {as_sessions} -name "$subject_id-$assessment_id-[exec uuidgen]" -title "$subject_id-$assessment_id-[exec uuidgen]" ] set as_session_id [content::revision::new \ -item_id $session_id \ -content_type {as_sessions} \ - -title "$subject_id-$assessment_id-[ad_generate_random_string]" \ + -title "$subject_id-$assessment_id-[exec uuidgen]" \ -attributes [list [list assessment_id $assessment_id] \ [list subject_id $subject_id] \ [list staff_id $staff_id] \