Index: openacs-4/packages/workflow/tcl/action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/action-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/workflow/tcl/action-procs.tcl	20 Jan 2003 15:45:00 -0000	1.3
+++ openacs-4/packages/workflow/tcl/action-procs.tcl	21 Jan 2003 18:06:00 -0000	1.4
@@ -10,14 +10,16 @@
 namespace eval workflow::action {}
 namespace eval workflow:::action::fsm {}
 
+
+
+
 #####
 #
 #  workflow::action namespace
 #
 #####
 
 ad_proc -public workflow::action::new {
-    -initial_action:boolean
     {-workflow_id:required}
     {-sort_order {}}
     {-short_name:required}
@@ -26,7 +28,9 @@
     {-assigned_role {}}
     {-allowed_roles {}}
     {-privileges {}}
+    {-callbacks {}}
     {-always_enabled_p f}
+    {-initial_action:boolean}
 } {
     This procedure is normally not invoked from application code. Instead
     a procedure for a certain workflow implementation, such as for example
@@ -47,6 +51,8 @@
                                   treated by the workflow (i.e. a bug in the 
                                   Bug Tracker) will be allowed to take this 
                                   action.
+    @param callbacks           List of names of service contract implementations of callbacks for the action in 
+                                  impl_owner_name.impl_name format.
     @param initial_action         Use this switch to indicate that this is the initial
                                   action that will fire whenever a case of the workflow
                                   is created. The initial action is used to determine
@@ -62,15 +68,22 @@
     db_transaction {
         # Insert basic action info
         if { [empty_string_p $sort_order] } {
-            set sort_order [workflow::default_sort_order -workflow_id $workflow_id workflow_actions]
+            set sort_order [workflow::default_sort_order \
+                    -workflow_id $workflow_id \
+                    -table_name "workflow_actions"]
         }
+
         set action_id [db_nextval "workflow_actions_seq"]
+
         if { [empty_string_p $assigned_role] } {
             set assigned_role_id [db_null]
         } else {
-            set assigned_role_id [workflow::role::get_id -workflow_id $workflow_id \
-                                                     -short_name $assigned_role]
+            set assigned_role_id [workflow::role::get_id \
+                    -workflow_id $workflow_id \
+                    -short_name $assigned_role]
         }
+
+        # Insert the action
         db_dml insert_action {}
 
         # Record which roles are allowed to take action
@@ -87,6 +100,14 @@
         if { $initial_action_p } {
             db_dml insert_initial_action {}
         }
+
+        # Callbacks
+        foreach callback_name $callbacks {
+            workflow::action::callback_insert \
+                    -action_id $action_id \
+                    -name $callback_name
+        }
+
     }
 
     return $action_id
@@ -137,6 +158,7 @@
 
 ad_proc -public workflow::action::get {
     {-action_id:required}
+    {-array:required}
 } {
     Return information about an action with a given id.
 
@@ -146,36 +168,71 @@
             pretty_past_tense, assigned_role, and always_enabled_p column 
             values for an action.
 } {
-    db_1row action_info {} -column_array action_info
+    # Select the info into the upvar'ed Tcl Array
+    upvar $array row
 
-    return [array get action_info]
+    db_1row action_info {} -column_array row
 }
 
+ad_proc -public workflow::action::callback_insert {
+    {-action_id:required}
+    {-name:required}
+    {-sort_order {}}
+} {
+    Add a side-effect to an action.
+    
+    @param action_id The ID of the action.
+    @param name Name of service contract implementation, in the form (impl_owner_name).(impl_name), 
+    for example, bug-tracker.CaptureResolutionCode
+    @param sort_order The sort_order for the rule. Leave blank to add to the end of the list
+    
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    # TODO:
+    # Insert for real when the service contracts have been defined
+    
+    ns_log Error "LARS: workflow::action::callback_insert -- would have inserted the callback $name to action $action_id"
+    return
 
+    db_transaction {
+
+        # Get the impl_id
+        set acs_sc_impl_id [workflow::service_contract::get_impl_id -name $name]
+
+        # Get the sort order
+        if { ![exists_and_not_null sort_order] } {
+            set sort_order [db_string select_sort_order {}]
+        }
+
+        # Insert the callback
+        db_dml insert_callback {}
+    }
+    return $acs_sc_impl_id
+}
+
+
+
+
+
 #####
 #
 # workflow::action::fsm
 #
 #####
 
-#####
-#
-#  workflow::fsm::action namespace
-#
-#####
-
 ad_proc -public workflow::action::fsm::new {
-    -initial_action:boolean
     {-workflow_id:required}
     {-short_name:required}
     {-pretty_name:required}
     {-pretty_past_tense {}}
     {-allowed_roles {}}
     {-assigned_role {}}
     {-privileges {}}
-    {-always_enabled_p f}
     {-enabled_states {}}
     {-new_state {}}
+    {-callbacks {}}
+    {-always_enabled_p f}
+    {-initial_action:boolean}
 } {
     Add an action to a certain FSM (Finite State Machine) workflow. This procedure
     invokes the generic workflow::action::new procedures and does additional inserts
@@ -194,31 +251,35 @@
 
     db_transaction {
         # Generic workflow data:
-        set action_id [workflow::action::new -initial_action=$initial_action_p \
-                                             -workflow_id $workflow_id \
-                                             -short_name $short_name \
-                                             -pretty_name $pretty_name \
-                                             -pretty_past_tense $pretty_past_tense \
-                                             -allowed_roles $allowed_roles \
-                                             -assigned_role $assigned_role \
-                                             -privileges $privileges \
-                                             -always_enabled_p $always_enabled_p]
+        set action_id [workflow::action::new \
+                -initial_action=$initial_action_p \
+                -workflow_id $workflow_id \
+                -short_name $short_name \
+                -pretty_name $pretty_name \
+                -pretty_past_tense $pretty_past_tense \
+                -allowed_roles $allowed_roles \
+                -assigned_role $assigned_role \
+                -privileges $privileges \
+                -callbacks $callbacks \
+                -always_enabled_p $always_enabled_p]
 
         # FSM specific data:
 
         # Record whether the action changes state
         if { ![empty_string_p $new_state] } {
-            set new_state_id [workflow::state::fsm::get_id -workflow_id $workflow_id \
-                                                           -short_name $new_state]
+            set new_state_id [workflow::state::fsm::get_id \
+                    -workflow_id $workflow_id \
+                    -short_name $new_state]
         } else {
             set new_state_id [db_null]
         }
         db_dml insert_fsm_action {}
 
         # Record in which states the action is enabled
         foreach state_short_name $enabled_states {
-            set enabled_state_id [workflow::state::fsm::get_id -workflow_id $workflow_id \
-                                                               -short_name $state_short_name]
+            set enabled_state_id [workflow::state::fsm::get_id \
+                    -workflow_id $workflow_id \
+                    -short_name $state_short_name]
             db_dml insert_enabled_state {}
         }
     }   
@@ -233,3 +294,73 @@
 } {
     return [db_string select_new_state {} -default {}]
 }
+
+
+ad_proc -private workflow::action::fsm::parse_spec {
+    {-workflow_id:required}
+    {-short_name:required}
+    {-spec:required}
+} {
+    Parse the spec for an individual action definition.
+
+    @param workflow_id The id of the workflow to delete.
+    @param short_name The short_name of the action
+    @param spec The action spec
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    # Initialize array with default values
+    array set action { 
+        pretty_past_tense {} 
+        allowed_roles {} 
+        assigned_role {} 
+        privileges {} 
+        always_enabled_p f 
+        enabled_states {} 
+        new_state {} 
+        initial_action_p 0
+    }
+    
+    # Get the info from the spec
+    array set action $spec
+
+    # Create the action
+    set action_id [workflow::action::fsm::new \
+            -workflow_id $workflow_id \
+            -short_name $short_name \
+            -pretty_name $action(pretty_name) \
+            -pretty_past_tense $action(pretty_past_tense) \
+            -allowed_roles $action(allowed_roles) \
+            -assigned_role $action(assigned_role) \
+            -privileges $action(privileges) \
+            -always_enabled_p $action(always_enabled_p) \
+            -enabled_states $action(enabled_states) \
+            -new_state $action(new_state) \
+            -initial_action=$action(initial_action_p) \
+            ]
+}
+
+ad_proc -private workflow::action::fsm::parse_actions_spec {
+    {-workflow_id:required}
+    {-spec:required}
+} {
+    Parse the spec for the block containing the definition of all
+    actions for the workflow.
+
+    @param workflow_id The id of the workflow to delete.
+    @param spec The actions spec
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    # actions(short_name) { ... action-spec ... }
+    array set actions $spec
+
+    foreach short_name [array names actions] {
+        workflow::action::fsm::parse_spec \
+                -workflow_id $workflow_id \
+                -short_name $short_name \
+                -spec $actions($short_name)
+    }
+}
+
+