Index: openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql	22 May 2001 22:46:13 -0000	1.3
+++ openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql	14 Jun 2001 00:28:06 -0000	1.4
@@ -66,7 +66,7 @@
   v_result                         boolean;
 begin
 
-    v_next_place := workflow_case__get_attribute_value(case_id,''next_place'');
+    v_next_place := workflow_case__get_attribute_value(p_case_id,''next_place'');
 
     if v_next_place = p_place_key then
       v_result := ''t'';
@@ -144,7 +144,7 @@
 insert into wf_arcs (
   workflow_key, transition_key, place_key, direction, guard_callback
 ) values (
-  'publishing_wf', 'authoring', 'authored', 'out', 'publishing_wf.is_next'
+  'publishing_wf', 'authoring', 'authored', 'out', 'publishing_wf__is_next'
 );
 
 insert into wf_arcs (
@@ -172,13 +172,13 @@
 insert into wf_arcs (
   workflow_key, transition_key, place_key, direction, guard_callback
 ) values (
-  'publishing_wf', 'editing', 'edited', 'out', 'publishing_wf.is_next'
+  'publishing_wf', 'editing', 'edited', 'out', 'publishing_wf__is_next'
 );
 
 insert into wf_arcs (
   workflow_key, transition_key, place_key, direction, guard_callback
 ) values (
-  'publishing_wf', 'editing', 'start', 'out', 'publishing_wf.is_next'
+  'publishing_wf', 'editing', 'start', 'out', 'publishing_wf__is_next'
 );
 
 insert into wf_arcs (
@@ -201,19 +201,19 @@
 insert into wf_arcs (
   workflow_key, transition_key, place_key, direction, guard_callback
 ) values (
-  'publishing_wf', 'approval', 'end', 'out', 'publishing_wf.is_next'
+  'publishing_wf', 'approval', 'end', 'out', 'publishing_wf__is_next'
 );
 
 insert into wf_arcs (
   workflow_key, transition_key, place_key, direction, guard_callback
 ) values (
-  'publishing_wf', 'approval', 'authored', 'out', 'publishing_wf.is_next'
+  'publishing_wf', 'approval', 'authored', 'out', 'publishing_wf__is_next'
 );
 
 insert into wf_arcs (
   workflow_key, transition_key, place_key, direction, guard_callback
 ) values (
-  'publishing_wf', 'approval', 'start', 'out', 'publishing_wf.is_next'
+  'publishing_wf', 'approval', 'start', 'out', 'publishing_wf__is_next'
 );
 
 
Index: openacs-4/packages/cms/sql/postgresql/cms-workflow.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-workflow.sql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/cms/sql/postgresql/cms-workflow.sql	12 Jun 2001 04:13:46 -0000	1.7
+++ openacs-4/packages/cms/sql/postgresql/cms-workflow.sql	14 Jun 2001 00:28:06 -0000	1.8
@@ -564,7 +564,7 @@
       wf_tasks
     where
       task_id = p_task_id;
-
+   
     -- someone else has already holds this task
     -- we need to check in the task as the other person before 
     --    this user can check it out
@@ -595,13 +595,13 @@
 
       v_this_place := content_workflow__get_this_place( v_transition_key );
 
-      workflow_case__set_attribute_value(
+      PERFORM workflow_case__set_attribute_value(
           v_journal_id,
 	  ''next_place'',
 	  v_transition_key
       );
 
-      workflow_case__end_task_action(
+      PERFORM workflow_case__end_task_action(
           v_journal_id,
           ''start'',
           p_task_id
@@ -626,7 +626,7 @@
       end if;
 
     else
-      raise EXCEPTION ''-20000: Cannot check out this task because it is in an invalid state %'', v_task_state
+      raise EXCEPTION ''-20000: Cannot check out this task because it is in an invalid state %'', v_task_state;
     end if;
 
     return 0; 
@@ -858,13 +858,13 @@
           p_transition_key
       );
 
-      workflow_case__set_attribute_value(
+      PERFORM workflow_case__set_attribute_value(
           v_journal_id,
 	  ''next_place'',
 	  v_previous_place
       );
 
-      workflow_case__end_task_action(
+      PERFORM workflow_case__end_task_action(
           v_journal_id,
           ''finish'',
           p_task_id
Index: openacs-4/packages/cms/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/index-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/index-oracle.xql	12 Jun 2001 04:42:28 -0000	1.1
+++ openacs-4/packages/cms/www/index-oracle.xql	14 Jun 2001 00:28:06 -0000	1.2
@@ -12,7 +12,7 @@
 </fullquery>
 
  
-<fullquery name="content_template">      
+<fullquery name="template_root">      
       <querytext>
 
       select content_template.get_root_folder from dual
Index: openacs-4/packages/cms/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/index-postgresql.xql	12 Jun 2001 04:42:28 -0000	1.1
+++ openacs-4/packages/cms/www/index-postgresql.xql	14 Jun 2001 00:28:06 -0000	1.2
@@ -12,7 +12,7 @@
 </fullquery>
 
  
-<fullquery name="content_template">      
+<fullquery name="template_root">      
       <querytext>
 
       select content_template__get_root_folder()
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 -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/revision.tcl	25 May 2001 02:15:56 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/revision.tcl	14 Jun 2001 00:28:06 -0000	1.4
@@ -38,6 +38,7 @@
 	-return_url "modules/sitemap/index" 
 
 
+ns_log notice "user_permissions = [array get user_permissions]"
 # validate revision
 if { [template::util::is_nil item_id] } {
     template::request::error invalid_revision \
Index: openacs-4/packages/cms/www/modules/items/status-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/status-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/status-edit.tcl	27 May 2001 04:39:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/status-edit.tcl	14 Jun 2001 00:28:06 -0000	1.6
@@ -44,9 +44,9 @@
 
 # show "Ready" and "Live" if a live revision exists and the item is 
 #   publishable
-if { [string equal $is_live t] && [string equal $is_publishable t] } {
+#if { [string equal $is_live t] && [string equal $is_publishable t] } {
   lappend options [list "Ready" ready] [list "Live (publishes the item)" live]
-}
+#}
 
 template::query check_published is_published onevalue "
   select content_item.is_published( :item_id ) from dual"
Index: openacs-4/packages/cms/www/modules/workflow/case-status.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-status.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/workflow/case-status.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/workflow/case-status.adp	14 Jun 2001 00:28:06 -0000	1.3
@@ -24,14 +24,14 @@
       <td>@transinfo.transition_name@
         <if @is_assigned@ eq "yes">
           <if @transinfo.holding_user@ nil>
-            (<a href="task-finish?task_id=@transinfo.task_id@&return_url=@return_url@">Finish</a>)
+            (<a href="../workflow/task-finish?task_id=@transinfo.task_id@&return_url=@return_url@">Finish</a>)
           </if>
           <else>
             <if @transinfo.holding_user@ eq @user_id@>
-              (<a href="task-finish?task_id=@transinfo.task_id@&return_url=@return_url@">Finish</a>)
+              (<a href="../workflow/task-finish?task_id=@transinfo.task_id@&return_url=@return_url@">Finish</a>)
             </if>
             <else>
-              (<a href="task-start?task_id=@transinfo.task_id@&return_url=@return_url@">Steal</a> from @transinfo.hold_name@)
+              (<a href="../workflow/task-start?task_id=@transinfo.task_id@&return_url=@return_url@">Steal</a> from @transinfo.hold_name@)
             </else>
           </else>
         </if>