Index: openacs-4/packages/workflow/workflow.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/workflow.info,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/workflow/workflow.info	15 Mar 2004 14:04:25 -0000	1.15
+++ openacs-4/packages/workflow/workflow.info	15 Mar 2004 17:21:04 -0000	1.16
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>workflow</auto-mount>
 
-    <version name="2.0.0b2" url="http://openacs.org/repository/download/apm/workflow-2.0.0b2.apm">
+    <version name="2.0.0b3" url="http://openacs.org/repository/download/apm/workflow-2.0.0b3.apm">
         <owner url="http://pinds.com">Lars Pind</owner>
         <owner url="http://petermarklund.com">Peter Marklund</owner>
         <summary>A Tcl API for creating and managing workflows.</summary>
@@ -23,7 +23,7 @@
 &lt;p&gt;
 For more information, see: &lt;a href=&quot;http://www.collaboraid.biz/developer/workflow-spec&quot;&gt;the workflow specification&lt;/a&gt;.</description>
 
-        <provides url="workflow" version="2.0.0b2"/>
+        <provides url="workflow" version="2.0.0b3"/>
         <requires url="acs-content-repository" version="5.0.0b4"/>
         <requires url="acs-kernel" version="5.0.0b4"/>
         <requires url="acs-tcl" version="5.0.0b4"/>
Index: openacs-4/packages/workflow/tcl/workflow-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/workflow/tcl/workflow-procs.tcl	27 Jan 2004 10:32:34 -0000	1.25
+++ openacs-4/packages/workflow/tcl/workflow-procs.tcl	15 Mar 2004 17:15:18 -0000	1.26
@@ -545,7 +545,6 @@
         roles workflow::role 
         actions workflow::action
     }}
-    {-deep:boolean}
 } {
     Generate a spec for a workflow in array list style.
     Note that calling this directly with the default arguments will bomb, because workflow::action doesn't implement the required API.
@@ -587,8 +586,6 @@
         }
     }
 
-    set child_workflows [list]
-
     foreach { key namespace } $handlers {
         set subspec [list]
         
@@ -598,45 +595,13 @@
                                 -element short_name]
             set elm_spec [${namespace}::generate_spec -one_id $sub_id -handlers $handlers]
             
-            if { $deep_p } {
-                if { [string equal $key "actions"] } {
-                    array unset elm_array 
-                    array set elm_array $elm_spec
-                    if { [exists_and_not_null elm_array(child_workflow)] } {
-                        # Prefix the child workflow with the short_name of the parent workflow
-                        set new_child_workflow ${short_name}_$elm_array(child_workflow)
-                        
-                        # Change the child_workflow to the prefixed version in the spec
-                        set elm_array(child_workflow) $new_child_workflow
-
-                        # Output the modified spec
-                        set elm_spec [list]
-                        foreach name [lsort [array names elm_array]] {
-                            lappend elm_spec $name $elm_array($name)
-                        }
-
-                        # Remember this child workflow, so we generate the spec for it later
-                        set child_workflow_id [${namespace}::get_element -one_id $sub_id -element child_workflow_id]
-                        lappend child_workflows $child_workflow_id $new_child_workflow
-                    }
-                }
-            }
-
             lappend subspec $sub_short_name $elm_spec 
         }
         lappend spec $key $subspec
     }
 
     set spec [list $short_name $spec]
 
-    foreach { child_workflow_id new_short_name } $child_workflows {
-        set child_spec [${workflow_handler}::generate_spec \
-                                    -workflow_id $child_workflow_id \
-                                    -workflow_handler $workflow_handler \
-                                    -handlers $handlers]
-        set spec [concat $spec $new_short_name [list [lindex $child_spec 1]]]
-    }
-
     return $spec
 }
 
@@ -646,7 +611,6 @@
     {-object_id {}}
     {-array {}}
     {-workflow_handler workflow}
-    {-deep:boolean}
 } {
     Clones an existing FSM workflow. The clone must belong to either a package key or an object id.
 
@@ -672,8 +636,7 @@
 
     set spec [${workflow_handler}::generate_spec \
                   -workflow_id $workflow_id \
-                  -workflow_handler $workflow_handler \
-                  -deep=$deep_p]
+                  -workflow_handler $workflow_handler]
     
     set workflow_id [${workflow_handler}::new_from_spec \
                          -package_key $package_key \
@@ -1140,7 +1103,6 @@
         actions workflow::action::fsm
         states workflow::state::fsm
     }}
-    {-deep:boolean}
 } {
     Generate a spec for a workflow in array list style.
     
@@ -1153,8 +1115,7 @@
     set spec [workflow::generate_spec \
                   -workflow_id $workflow_id \
                   -workflow_handler $workflow_handler \
-                  -handlers $handlers \
-                  -deep=$deep_p]
+                  -handlers $handlers]
 
     return $spec
 }