Index: openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl	14 May 2001 23:16:08 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl	16 May 2001 00:40:41 -0000	1.4
@@ -866,19 +866,7 @@
 /* 
  * Declare the object type
  */
-declare
-    v_workflow_key varchar2(40);
-begin
-    v_workflow_key := workflow.create_workflow(
-	workflow_key => '[db_quote $new_workflow_key]', 
-	pretty_name => '[db_quote $new_workflow_pretty_name]', 
-	pretty_plural => '[db_quote $new_workflow_pretty_plural]', 
-	description => '[db_quote $description]', 
-	table_name => '[db_quote $new_table_name]'
-    );
-end;
-/
-show errors
+[db_map declare_object_type]
 
 "
 
@@ -1017,9 +1005,8 @@
  * Attributes
  */
 
-declare
-    v_attribute_id acs_attributes.attribute_id%TYPE;
-begin
+[db_map declare_attr_id]
+
 "
 
     db_foreach attributes {
@@ -1031,15 +1018,8 @@
 	from   acs_attributes
 	where  object_type = :workflow_key
     } {
-	append sql "    v_attribute_id := workflow.create_attribute(
-        workflow_key => '[db_quote $new_workflow_key]',
-        attribute_name => '[db_quote $attribute_name]',
-        datatype => '[db_quote $datatype]',
-        pretty_name => '[db_quote $pretty_name]',
-        default_value => '[db_quote $default_value]'
-    );
 
-"
+        append sql [db_map create_attribute]
 
 	db_foreach transition_attribute_map {
 	    select transition_key,
@@ -1048,27 +1028,14 @@
 	    where  workflow_key = :workflow_key
 	    and    attribute_id = :attribute_id
 	} {
-	    append sql "    insert into wf_transition_attribute_map
-    (workflow_key, 
-     transition_key, 
-     attribute_id, 
-     sort_order)
-    values 
-    ('[db_quote $new_workflow_key]', 
-     '[db_quote $transition_key]', 
-     v_attribute_id, 
-     [ad_decode $sort_order "" "null" $sort_order]);
 
-"
+            append sql [db_map transition_attribute]
 	}
     
     }
     
-    append sql "end;
-/
-show errors;
+    append sql "[db_map end_attribute]
 
-
 "    
 
 
@@ -1233,9 +1200,7 @@
 "
     }
 
-    append sql "
-commit;
-"
+    append sql [db_map commit]
 
     return $sql
 }