Index: openacs-4/packages/lors/tcl/lors-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-test-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lors/tcl/lors-test-procs.tcl	17 Nov 2008 13:35:04 -0000	1.3
+++ openacs-4/packages/lors/tcl/lors-test-procs.tcl	3 Dec 2008 12:36:42 -0000	1.4
@@ -28,96 +28,21 @@
             set fs_package_id ""
 
             # get package_id
-            set __package_id [db_string get_package \
-                "select package_id
-                from apm_packages
-                where package_key='lorsm' limit 1"]
+            set __package_id [db_string get_package {}]
             # get community_id
 
             # create a new manifest
             set man_id \
-                [db_exec_plsql man {
-                    select ims_manifest__new(
-                                      null,
-                                      '__test_course__',
-                                      '__identifier__',
-                                      '__version__',
-                                      '__orgs_default__',
-                                      false,
-                                      null,
-                                      false, -- is scorm, test true?
-                                      :folder_id,
-                                      :fs_package_id,
-                                      now(),
-                                      null,
-                                      null,
-                                      :__package_id,
-                                      null, --community_id
-                                      null, --class_key
-                                      null) --presentation_format
-                }]
+                [db_exec_plsql man {}]
 
             # create organization
-            set org_id \
-                [db_exec_plsql org {
-                    select ims_organization__new (
-                                           null, -- org_id,
-                                           :man_id,
-                                           '__identifier__',
-                                           '__structure__',
-                                           '__title__',
-                                           false, -- hasmetadata,
-                                           now(),
-                                           null,
-                                           null,
-                                           :__package_id
-                                           )
-                }]
+            set org_id [db_exec_plsql org {}]
 
             # create some resources
-            set res_id \
-                [db_exec_plsql res {
-                    select ims_resource__new (
-                                       null,
-                                       :man_id,
-                                       '__indentifier__',
-                                       '__type__',
-                                       '__href__',
-                                       '__scorm_type__',
-                                       false, --hasmetadata
-                                       now(),
-                                       null,
-                                       null,
-                                       :__package_id
-                                       )
-                }]
+            set res_id [db_exec_plsql res {}]
 
             # create some items
-            set item_id \
-                [db_exec_plsql item {
-                    select ims_item__new (
-                                    null,
-                                    :org_id,
-                                    '__identifier__',
-                                    '__identifier_href__',
-                                    true,
-                                    '__parameters__',
-                                    '__title__',
-                                    null, --parent_item
-                                    false, --hasmetadata
-                                    '__prereq_t__',
-                                    '__prereq_s__',
-                                    '__type__',
-                                    '__maxtimeallowed__',
-                                    '__timelimitaction__',
-                                    '__datafromlms__',
-                                    '__masteryscore__',
-                                    now(),
-                                    null,
-                                    null,
-                                    :__package_id
-                                    )
-                }]
+            set item_id [db_exec_plsql item {}]
 
             # create some files
             set file_id \
@@ -129,20 +54,10 @@
                                     [list title "__title__"]] \
                     content_item new]
 
-            db_exec_plsql file {
-                select ims_file__new (
-                                      :file_id,
-                                      :res_id,
-                                      '__path_to_filename__',
-                                      '__filename__',
-                                      false --hasmetadata
-                                      )
-            }
+            db_exec_plsql file {}
 
             # create item_to_resource mapping
-            db_dml i_to_r \
-                "insert into ims_cp_items_to_resources (item_id,res_id)
-                values (:item_id,:res_id)"
+            db_dml i_to_r {}
 
             # create student_tracking
 
@@ -153,8 +68,5 @@
             # try to delete the whole couse
             lors::imscp::manifest_delete -man_id $man_id -delete_all t
         }
-    aa_false "Manifest $man_id deleted" [db_0or1row get_man \
-                                            "select man_id
-                                            from ims_cp_manifests
-                                            where man_id=:man_id"]
+    aa_false "Manifest $man_id deleted" [db_0or1row get_man {}]
 }