lib/openwfe/expressions/fe_subprocess.rb in ruote-0.9.19 vs lib/openwfe/expressions/fe_subprocess.rb in ruote-0.9.20

@@ -1,43 +1,29 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2006-2009, John Mettraux, [e-mail]
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/utils'
 
 
 module OpenWFE
@@ -111,48 +97,39 @@
 
     def apply (workitem)
 
       conditional = eval_condition(:if, workitem, :unless)
 
-      return reply_to_parent(workitem) \
-        if conditional == false
+      return reply_to_parent(workitem) if conditional == false
 
-      ref = lookup_ref workitem
+      template = if self.respond_to?(:hint)
 
-      raise "'subprocess' expression misses a 'ref', 'field-ref' or 'variable-ref' attribute" unless ref
+        hint
 
-      template_uri = OpenWFE::parse_known_uri ref
+      else
 
-      template = template_uri || lookup_variable(ref)
+        ref = lookup_ref(workitem)
 
-      raise "did not find any subprocess named '#{ref}'" \
-        if not template
+        raise "'subprocess' expression misses a 'ref', 'field-ref' or 'variable-ref' attribute" unless ref
 
-      forget = lookup_boolean_attribute :forget, workitem
+        OpenWFE::parse_known_uri(ref) || lookup_variable(ref)
+      end
 
-      params = lookup_attributes workitem
+      raise "did not find any subprocess named '#{ref}'" unless template
 
-      text = fetch_text_content workitem, false
-      params["0"] = text if text
+      forget = lookup_boolean_attribute(:forget, workitem)
 
-      #puts
-      #puts " ... params are #{params.keys.join(', ')}"
-      #puts " ... values are #{params.values.join(', ')}"
+      params = lookup_attributes(workitem)
 
-      #requester = if forget
-      #  @fei.workflow_instance_id
-      #else
-      #  @fei
-      #end
-      #sub_fei = get_expression_pool.launch_template(
-      #  requester, nil, get_next_sub_id, template, workitem, params)
+      text = fetch_text_content(workitem, false)
+      params['0'] = text if text
 
       sub_fei = get_expression_pool.launch_subprocess(
         self, template, forget, workitem, params)
 
       if forget
-        reply_to_parent workitem.dup
+        reply_to_parent(workitem.dup)
       else
         @subprocess_fei = sub_fei.dup
         store_itself # to keep track of @subprocess_fei
       end
     end
@@ -160,11 +137,13 @@
     #
     # Takes care of cancelling the subprocess as well if any
     #
     def cancel
 
+      trigger_on_cancel # if any
+
       return nil unless @subprocess_fei
-      get_expression_pool.cancel @subprocess_fei
+      get_expression_pool.cancel(@subprocess_fei)
     end
   end
 
 end