fe_subprocess.rb in openwferu-0.9.8

- old
+ new

@@ -40,11 +40,10 @@
 #
 
 #require 'uri'
 
 require 'openwfe/utils'
-require 'openwfe/expressions/fe_utils'
 
 
 #
 # the subprocess expression
 #
@@ -88,11 +87,11 @@
         #
         # apply / reply
 
         def apply (workitem)
 
-            ref = OpenWFE::lookup_ref(self, workitem)
+            ref = lookup_ref(workitem)
 
             raise "'subprocess' expression misses a 'ref', 'field-ref' or 'variable-ref' attribute" unless ref
 
             template_uri = parse_uri(ref)
 
@@ -112,16 +111,18 @@
             requester = @fei
             requester = @fei.workflowInstanceId if forget
 
             params = lookup_attributes(workitem)
 
-            text = OpenWFE::fetch_text_content(self, workitem, false)
+            text = fetch_text_content(workitem, false)
             params["0"] = text if text
 
+            #puts
             #puts " ... params are #{params.keys.join(', ')}"
+            #puts " ... values are #{params.values.join(', ')}"
 
-            get_expression_pool()\
-                .launch_template(requester, 0, template, workitem, params)
+            get_expression_pool.launch_template(
+                requester, get_next_sub_id, template, workitem, params)
         end
 
         #def reply (workitem)
         #end
 