Index: openacs-4/packages/workflow/tcl/state-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/state-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/workflow/tcl/state-procs.tcl	21 Jan 2003 18:06:00 -0000	1.1
+++ openacs-4/packages/workflow/tcl/state-procs.tcl	3 Feb 2003 12:23:01 -0000	1.2
@@ -20,13 +20,19 @@
     {-workflow_id:required}
     {-short_name:required}
     {-pretty_name:required}
+    {-hide_fields {}}
     {-sort_order {}}
 } {
     Creates a new state for a certain FSM (Finite State Machine) workflow.
     
     @param workflow_id The id of the FSM workflow to add the state to
     @param short_name
     @param pretty_name
+    @param hide_fields            A space-separated list of the names of form fields which should be
+                                  hidden when in this state, because they're irrelevant in a certain state.
+    @param sort_order             The number which this state should be in the sort ordering sequence. 
+                                  Leave blank to add state at the end. If you provide a sort_order number
+                                  which already exists, existing states are pushed down one number.
     @return ID of new state.
     
     @author Peter Marklund
@@ -37,6 +43,11 @@
         
         if { [empty_string_p $sort_order] } {
             set sort_order [workflow::default_sort_order -workflow_id $workflow_id -table_name "workflow_fsm_states"]
+        } else {
+            set sort_order_taken_p [db_string select_sort_order_p {}]
+            if { $sort_order_taken_p } {
+                db_dml update_sort_order {}
+            }
         }
         
         db_dml do_insert {}
@@ -59,6 +70,21 @@
     db_1row state_info {} -column_array row
 }
 
+ad_proc -public workflow::state::fsm::get_element {
+    {-state_id:required}
+    {-element:required}
+} {
+    Return a single element from the information about a state.
+
+    @param state_id The ID of the workflow
+    @return The element you asked for
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    get -state_id $state_id -array row
+    return $row($element)
+}
+
 ad_proc -public workflow::state::fsm::get_id {
     {-workflow_id:required}
     {-short_name:required}
@@ -73,6 +99,9 @@
     return [db_string select_id {}]
 }
 
+#####
+# Private procs
+#####
 
 ad_proc -private workflow::state::fsm::parse_spec {
     {-workflow_id:required}
@@ -88,7 +117,9 @@
     @author Lars Pind (lars@collaboraid.biz)
 } {
     # Initialize array with default values
-    array set state {}
+    array set state { 
+        hide_fields {} 
+    }
     
     # Get the info from the spec
     array set state $spec
@@ -97,7 +128,8 @@
     set state_id [workflow::state::fsm::new \
             -workflow_id $workflow_id \
             -short_name $short_name \
-            -pretty_name $state(pretty_name)
+            -pretty_name $state(pretty_name) \
+            -hide_fields $state(hide_fields) \
             ]
 }
 
@@ -113,13 +145,64 @@
 
     @author Lars Pind (lars@collaboraid.biz)
 } {
-    # states(short_name) { ... state-spec ... }
-    array set states $spec
-
-    foreach short_name [array names states] {
+    foreach { short_name spec } $spec {
         workflow::state::fsm::parse_spec \
                 -workflow_id $workflow_id \
                 -short_name $short_name \
-                -spec $states($short_name)
+                -spec $spec
     }
 }
+
+ad_proc -private workflow::state::fsm::generate_spec {
+    {-state_id:required}
+} {
+    Generate the spec for an individual state definition.
+
+    @param state_id The id of the state to generate spec for.
+    @return spec The states spec
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    get -state_id $state_id -array row
+
+    # Get rid of elements that shouldn't go into the spec
+    array unset row short_name 
+    array unset row state_id
+    array unset row workflow_id
+    array unset row sort_order
+
+    # Get rid of empty strings
+    foreach name [array names row] {
+        if { [empty_string_p $row($name)] } {
+            array unset row $name
+        }
+    }
+    
+    set spec {}
+    foreach name [lsort [array names row]] {
+        lappend spec $name $row($name)
+    }
+
+    return $spec
+}
+    
+ad_proc -private workflow::state::fsm::generate_states_spec {
+    {-workflow_id:required}
+} {
+    Generate the spec for the block containing the definition of all
+    states for the workflow.
+
+    @param workflow_id The id of the workflow to delete.
+    @return The states spec
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    # states(short_name) { ... state-spec ... }
+    set states [list]
+
+    foreach state_id [workflow::fsm::get_states -workflow_id $workflow_id] {
+        lappend states [get_element -state_id $state_id -element short_name] [generate_spec -state_id $state_id]
+    }
+    
+    return $states
+}