lib/openwfe/expressions/fe_misc.rb in openwferu-0.9.7 vs lib/openwfe/expressions/fe_misc.rb in openwferu-0.9.8

@@ -39,11 +39,10 @@
 # John Mettraux at openwfe.org
 #
 
 require 'openwfe/util/safe'
 require 'openwfe/expressions/flowexpression'
-require 'openwfe/expressions/fe_utils'
 
 
 module OpenWFE
 
     class PrintExpression < FlowExpression
@@ -55,11 +54,11 @@
 
         def apply (workitem)
 
             escape = lookup_boolean_attribute('escape', workitem, false)
 
-            text = OpenWFE::fetch_text_content(self, workitem, escape)
+            text = fetch_text_content(workitem, escape)
             text << "\n"
 
             tracer = @application_context['__tracer']
 
             if tracer
@@ -107,20 +106,20 @@
                 raise "evaluation of ruby code is not allowed"
             end
 
             escape = lookup_boolean_attribute('escape', workitem, false)
 
-            code = OpenWFE::lookup_vf_attribute(self, workitem, 'code')
+            code = lookup_vf_attribute(workitem, 'code')
 
-            code = OpenWFE::fetch_text_content(self, workitem, escape) \
+            code = fetch_text_content(workitem, escape) \
                 unless code
 
             code = code.to_s
 
             #result = eval(code)
             result = OpenWFE::eval_safely(code, SAFETY_LEVEL, binding())
 
-            OpenWFE::set_result(workitem, result) \
+            workitem.set_result(result) \
                 if result != nil  # 'false' is a valid result
 
             reply_to_parent(workitem)
         end
     end