Index: openacs-4/packages/cms/tcl/form-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/tcl/form-procs.xql	21 Sep 2001 05:01:38 -0000	1.8
+++ openacs-4/packages/cms/tcl/form-procs.xql	19 Sep 2002 13:09:12 -0000	1.9
@@ -210,7 +210,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="cc_update_cr_revisions.cc_update_cr_revisions">
+<fullquery name="content::copy_content.cc_update_cr_revisions">
 	<querytext>
 
            update cr_revisions
Index: openacs-4/packages/cms/www/modules/categories/create-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/create-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/categories/create-oracle.xql	18 Sep 2002 16:39:21 -0000	1.2
+++ openacs-4/packages/cms/www/modules/categories/create-oracle.xql	19 Sep 2002 13:09:13 -0000	1.3
@@ -25,11 +25,8 @@
 </fullquery>
 
 <partialquery name="pid">      
-      <querytext>
-      
-         ,parent_id => :parent_id
-
-  
+      <querytext>      
+         ,parent_id => :parent_id  
       </querytext>
 </partialquery>
 
Index: openacs-4/packages/cms/www/modules/categories/create-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/create-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/categories/create-postgresql.xql	18 Sep 2002 16:39:21 -0000	1.2
+++ openacs-4/packages/cms/www/modules/categories/create-postgresql.xql	19 Sep 2002 13:09:13 -0000	1.3
@@ -30,11 +30,8 @@
 
  
 <partialquery name="pid">      
-      <querytext>
-      
-         $parent_id
-
-  
+      <querytext>      
+$parent_id  
       </querytext>
 </partialquery>
 
Index: openacs-4/packages/cms/www/modules/categories/create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/create.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/categories/create.tcl	18 Sep 2002 16:39:21 -0000	1.4
+++ openacs-4/packages/cms/www/modules/categories/create.tcl	19 Sep 2002 13:09:13 -0000	1.5
@@ -31,7 +31,7 @@
   db_transaction {
 
       if { ![template::util::is_nil parent_id] } {
-          set pid [db_map pid]
+          set pid [string trim [db_map pid]]
       } else {
           set pid ""
       }
Index: openacs-4/packages/cms/www/modules/items/attributes-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes-edit.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	17 Sep 2002 21:43:30 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	19 Sep 2002 13:09:14 -0000	1.5
@@ -6,7 +6,7 @@
 # check permissions - user must have cm_write on the item
 content::check_access $item_id cm_write -user_id [User::getID]
 
-db_0or1row get_item_info ""
+db_0or1row get_item ""
 
 # flush the sitemap folder listing cache in anticipation 
 # of the new item
Index: openacs-4/packages/cms/www/modules/items/content-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-add-1.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/content-add-1.tcl	16 Aug 2002 03:57:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/content-add-1.tcl	19 Sep 2002 13:09:14 -0000	1.5
@@ -4,7 +4,7 @@
 request create
 request set_param revision_id -datatype integer
 
-db_1row get_revision_one ""
+db_1row get_revision ""
 
 # permissions check - must have cm_write on the item
 content::check_access $item_id cm_write -user_id [User::getID]
Index: openacs-4/packages/cms/www/modules/items/publish-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/publish-status.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/publish-status.tcl	17 Sep 2002 21:43:30 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/publish-status.tcl	19 Sep 2002 13:09:14 -0000	1.6
@@ -9,7 +9,7 @@
 
 # Query for publish status and release schedule, if any
 
-db_string get_info "" -column_array info
+db_1row get_info "" -column_array info
 
 # Build a sentence describing the publishing status
 
Index: openacs-4/packages/cms/www/modules/items/revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/revision.tcl	19 Aug 2002 03:30:59 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/revision.tcl	19 Sep 2002 13:09:14 -0000	1.7
@@ -8,7 +8,8 @@
 # flag indicating this is the live revision
 set live_revision_p 0
 
-db_1row get_revision_one "" 
+db_1row get_revision "" -column_array one_revision
+template::util::array_to_vars one_revision
 
 # Check permissions - must have cm_examine on the item
 content::check_access $item_id cm_examine \
Index: openacs-4/packages/cms/www/modules/workflow/case-create.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-create.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/case-create.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/case-create.xql	19 Sep 2002 13:09:16 -0000	1.2
@@ -29,5 +29,19 @@
       </querytext>
 </fullquery>
 
+
+<fullquery name="get_name_key">      
+      <querytext>
+  select 
+    transition_name, transition_key 
+  from 
+    wf_transitions
+  where 
+    workflow_key = 'publishing_wf' 
+  order by 
+    sort_order      
+      </querytext>
+</fullquery>
+
  
 </queryset>