Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 17 Dec 2004 18:11:00 -0000 1.19 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 22 Dec 2004 22:06:39 -0000 1.20 @@ -2,7 +2,7 @@ Procedures in the evaluation namespace. @creation-date Feb 2004 - @author jopez@galileo.edu + @author jopez@galileo.edu and cesarhj@galileo.edu @cvs-id $Id$ } @@ -227,8 +227,7 @@ set revision_id [db_nextval acs_object_id_seq] set revision_name "${content_type}_${revision_id}" -# set folder_id [content::folder::new -name "$content_type_$package_id" -label "$content_type_$package_id" -package_id $package_id ] - set folder_id [db_exec_plsql get_folder_id {select content_item__get_id(:content_type||'_'||:package_id,null,'f')}] + set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] if { $new_item_p } { set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id] } @@ -363,14 +362,12 @@ set package_id [ad_conn package_id] set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] -# set folder_id [content::folder::new -name "$content_type_$package_id" -label "$content_type_$package_id" -package_id $package_id ] - set folder_id [db_exec_plsql get_folder_id {select content_item__get_id(:content_type||'_'||:package_id,null,'f')}] + set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] if { [empty_string_p $item_name] } { set item_name "${item_id}_${title}" } set revision_id [db_nextval acs_object_id_seq] if { $new_item_p } { -# db_exec_plsql content_item_new { *SQL* } set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type {evaluation_tasks} -name $item_name -context_id $package_id -mime_type $mime_type -title $title -storage_type $storage_type] } set revision_id [content::revision::new \ @@ -381,7 +378,6 @@ -description $description \ -attributes [list [list weight $weight] \ [list task_name $name] \ [list task_item_id $item_id] \ [list online_p $online_p] \ [list grade_item_id $grade_item_id] \ [list due_date $due_date] \ [list late_submit_p $late_submit_p] \ [list requires_grade_p $requires_grade_p] \ [list number_of_members $number_of_members]] ] - # db_exec_plsql content_revision_new { *SQL* } # in order to find the file we have to set the name in cr_items the same that in cr_revisions db_dml update_item_name { *SQL* } return $revision_id @@ -418,8 +414,7 @@ set package_id [ad_conn package_id] set creation_user [ad_verify_and_get_user_id] set creation_ip [ad_conn peeraddr] - #set folder_id [content::folder::new -name "$content_type_$package_id" -label "$content_type_$package_id" -package_id $package_id ] - set folder_id [db_exec_plsql get_folder_id {select content_item__get_id(:content_type||'_'||:package_id,null,'f')}] + set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] set item_name "${item_id}_${title}" set revision_id [db_nextval acs_object_id_seq] @@ -433,7 +428,6 @@ } if { $new_item_p } { -# db_exec_plsql content_item_new { *SQL* } set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -storage_type $storage_type -title $title] } set revision_id [content::revision::new \ @@ -444,8 +438,6 @@ -attributes [list [list task_item_id $task_item_id] \ [list solution_item_id $item_id]] ] -# db_exec_plsql content_revision_new { *SQL* } - # in order to find the file we have to set the name in cr_items the same that in cr_revisions db_dml update_item_name { *SQL* } return $revision_id @@ -484,8 +476,7 @@ set package_id [ad_conn package_id] set creation_user [ad_verify_and_get_user_id] set creation_ip [ad_conn peeraddr] - #set folder_id [content::folder::new -name "$content_type_$package_id" -label "$content_type_$package_id" -package_id $package_id ] - set folder_id [db_exec_plsql get_folder_id {select content_item__get_id(:content_type||'_'||:package_id,null,'f')}] + set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] set item_name "${item_id}_${title}" set revision_id [db_nextval acs_object_id_seq] @@ -499,11 +490,9 @@ } if { $new_item_p } { -# db_exec_plsql content_item_new { *SQL* } set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -title $title -storage_type $storage_type] } -# db_exec_plsql content_revision_new { *SQL* } set revision_id [content::revision::new \ -item_id $item_id \ -content_type $content_type \ @@ -555,8 +544,7 @@ set package_id [ad_conn package_id] set creation_user [ad_verify_and_get_user_id] set creation_ip [ad_conn peeraddr] - #set folder_id [content::folder::new -name "$content_type_$package_id" -label "$content_type_$package_id" -package_id $package_id ] - set folder_id [db_exec_plsql get_folder_id {select content_item__get_id(:content_type||'_'||:package_id,null,'f')}] + set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] set item_name "${item_id}_${title}" set revision_id [db_nextval acs_object_id_seq] @@ -570,10 +558,8 @@ } if { $new_item_p } { -# db_exec_plsql content_item_new { *SQL* } set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -title $title -storage_type $storage_type] } -# db_exec_plsql content_revision_new { *SQL* } set revision_id [content::revision::new \ -item_id $item_id \ -content_type $content_type \ @@ -665,8 +651,7 @@ set package_id [ad_conn package_id] set creation_user [ad_verify_and_get_user_id] set creation_ip [ad_conn peeraddr] - #set folder_id [content::folder::new -name "$content_type_$package_id" -label "$content_type_$package_id" -package_id $package_id ] - set folder_id [db_exec_plsql get_folder_id {select content_item__get_id(:content_type||'_'||:package_id,null,'f')}] + set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] set item_name "${item_id}_${title}" set revision_id [db_nextval acs_object_id_seq] @@ -680,11 +665,9 @@ } if { $new_item_p } { -#db_exec_plsql content_item_new { *SQL* } set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -mime_type $mime_type -title $title -storage_type $storage_type] } -#db_exec_plsql content_revision_new { *SQL* } set revision_id [content::revision::new \ -item_id $item_id \ -content_type $content_type \ @@ -894,7 +877,6 @@ Helper for the apm_proc } { #Delete all content templates -ns_log notice "Por Aqui paso esto" db_foreach v1 { select ea.answer_id from evaluation_answersi ea, acs_objects ao where ea.item_id = ao.object_id and ao.context_id = p_package_id } { content::revision::delete -revision_id $answer_id } @@ -909,9 +891,7 @@ content::revision::delete -revision_id $grade_id} #Evaluation_Task_Sols -ns_log notice "Eliminado folder de Evaluation_Task_Sols" set v_folder_id [content::item::get_id -item_path "evaluation_tasks_sols_$package_id" -resolve_index {f}] -ns_log notice "Numero de Folder $v_folder_id este es el numero" db_foreach v11 { select item_id from cr_items where parent_id = :v_folder_id } { evaluation::delete_grade -grade_item_id $item_id } @@ -921,9 +901,7 @@ content::folder::delete -folder_id $v_folder_id #evaluation_answers -ns_log notice "Eliminando folder de evaluation_answer" set v_folder_id [content::item::get_id -item_path "evaluation_answers_$package_id" -resolve_index {f}] -ns_log notice "Numero de Folder $v_folder_id este es el numero" db_foreach v12 {select item_id from cr_items where parent_id = :v_folder_id } { evaluation::delete_grade -grade_item_id $item_id } content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t} @@ -932,9 +910,7 @@ content::folder::delete -folder_id $v_folder_id #evaluation_students_eval -ns_log notice "Eliminando folder de evaluation_students_eval" set v_folder_id [content::item::get_id -item_path "evaluation_student_evals_$package_id" -resolve_index {f}] -ns_log notice "Numero de Folder $v_folder_id este es el numero" db_foreach v13 { select item_id from cr_items where parent_id = :v_folder_id } { evaluation::delete_grade -grade_item_id $item_id } content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t} @@ -943,9 +919,7 @@ content::folder::delete -folder_id $v_folder_id #evaluation_grades_sheets -ns_log notice "Elimiando folder de evaluation_grades_sheets" set v_folder_id [content::item::get_id -item_path "evaluation_grades_sheets_$package_id" -resolve_index {f}] -ns_log notice "Numero de Folder $v_folder_id este es el numero" db_foreach v14 { select item_id from cr_items where parent_id = :v_folder_id } { evaluation::delete_grade -grade_item_id $item_id } content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t} @@ -954,9 +928,7 @@ content::folder::delete -folder_id $v_folder_id #evaluation_tasks -ns_log notice "Elimando folder de evaluation_tasks" set v_folder_id [content::item::get_id -item_path "evaluation_tasks_$package_id" -resolve_index {f}] -ns_log notice "Numero de Folder $v_folder_id este es el numero" db_foreach v15 { select etg.group_id from evaluation_tasks et, evaluation_task_groups etg where etg.task_item_id = et.task_item_id } { evaluation::delete_grade -grade_item_id $item_id } content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t} @@ -965,39 +937,13 @@ content::folder::delete -folder_id $v_folder_id #evaluation_grades -ns_log notice "Elimando folder de evaluation_grades" set v_folder_id [content::item::get_id -item_path "evaluation_grades_$package_id" -resolve_index {f}] -ns_log notice "Numero de Folder $v_folder_id este es el numero" db_foreach v16 { select item_id from cr_items where parent_id = :v_folder_id } { evaluation::delete_grade -grade_item_id $item_id } content::folder::unregister_content_type -folder_id $v_folder_id -content_type {content_revision} -include_subtypes {t} content::folder::unregister_content_type -folder_id $v_folder_id -content_type {evaluation_grades} -include_subtypes {t} db_dml delete_v16 "delete from cr_folder_type_map where content_type = 'evaluation_grades'" content::folder::delete -folder_id $v_folder_id - - -# set ev_grades_fid [db_string get_f_id "select content_item__get_id('evaluation_grades_'||:package_id,null,'f')"] -# set ev_grades_sheets_fid [db_string get_f_id "select content_item__get_id('evaluation_grades_sheets_'||:package_id,null,'f')"] -# set ev_tasks_fid [db_string get_f_id "select content_item__get_id('evaluation_tasks_'||:package_id,null,'f')"] -# set ev_tasks_sols_fid [db_string get_f_id "select content_item__get_id('evaluation_tasks_sols_'||:package_id,null,'f')"] -# set ev_answers_fid [db_string get_f_id "select content_item__get_id('evaluation_answers_'||:package_id,null,'f')"] -# set ev_student_evals_fid [db_string get_f_id "select content_item__get_id('evaluation_student_evals_'||:package_id,null,'f')"] - -# db_transaction { -# db_exec_plsql delte_evaluation_contents { *SQL* } - -# db_exec_plsql delte_grades_sheets_folder { *SQL* } - -# db_exec_plsql delte_grades_folder { *SQL* } - -# db_exec_plsql delte_task_folder { *SQL* } - -# db_exec_plsql delte_task_sols_folder { *SQL* } - -# db_exec_plsql delte_answers_folder { *SQL* } - -# db_exec_plsql delte_evals_folder { *SQL* } - } } ad_proc -public evaluation::get_archive_command {