cpee 1.3.105 → 1.3.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ba480fd74596c4633be32e53d49e777ae30ed7
-  data.tar.gz: dcc3ca46692911d3dcf1a0ac331dc70d11c3f620
+  metadata.gz: bd73497ca72f1147bc0d7ac9d87726b032da38ab
+  data.tar.gz: 9c396c83518dd1adb4dbba164563e5e894244ec9
 SHA512:
-  metadata.gz: 16b7da1ceb4bb7310f8a8a431aa869da3864eb29b5b87031b6eaff0f058c15d8e382c41923164f593595e7b6079651a10e19ac7a495cdd6cfb2417036a8faeba
-  data.tar.gz: 0b7b307e475046b58bd8ec9184b09a9402d523788e26543c811d0cbb8bcaf7bd9ba453888434dc299cb8f99c459a4eed352adfb66a6151aa03adf09a93479bc1
+  metadata.gz: f44ab8eb09e0cbcb56eec227fe9eaafda54077855f74236dd89f0b9f2b1f04222467268b748dfec08a8ef2ded0ca3dc810bfb40bbda3fe106f79f22ff180b30b
+  data.tar.gz: 651be957a4d05d14fbf95cbc4e3d54e1d52a27980509e3891e56e8a70c673f4d6cab45999da039fafc3f0377ae4c66d449341cd36cae10d049a06d292c619624

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.105"
+  s.version          = "1.3.106"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require 'pp'
 require ::File.dirname(__FILE__) + '/handler_properties'
 require ::File.dirname(__FILE__) + '/handler_notifications'
 require ::File.dirname(__FILE__) + '/callback'
@@ -49,7 +50,6 @@ module CPEE
     end
   end
 
-
   class Controller
 
     def initialize(id,opts)
@@ -64,6 +64,7 @@ module CPEE
       @positions = []
       @thread = nil
       @mutex = Mutex.new
+      @opts = opts
 
       @properties = Riddl::Utils::Properties::Backend.new( 
         {
@@ -323,7 +324,7 @@ module CPEE
           Thread.new(ke,ur) do |key,url|
             ev = build_notification(key,what,content,'event')
             if url.class == String
-              client = Riddl::Client.new(url)
+              client = Riddl::Client.new(url,nil,:xmpp => @opts[:xmpp])
               client.post ev.map{|k,v|Riddl::Parameter::Simple.new(k,v)} rescue nil
             elsif url.class == Riddl::Utils::Notifications::Producer::WS
               e = XML::Smart::string("<event/>")
@@ -357,11 +358,10 @@ module CPEE
           Thread.new(key,url,content.dup) do |k,u,c|
             callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
             c['callback'] = callback
-            notf = build_notification(k,what,c,'vote')
+            notf = build_notification(k,what,c,'vote',callback)
             if u.class == String
               client = Riddl::Client.new(u)
               params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
-              params << Riddl::Header.new("CPEE-Callback",callback)
               @mutex.synchronize do
                 status, result, headers = client.post params
                 if headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'
@@ -431,14 +431,14 @@ module CPEE
 
   private
 
-    def build_notification(key,what,content,type)# {{{
+    def build_notification(key,what,content,type,callback=nil)# {{{
       res = []
-      res << ['key'         , key]
-      res << ['topic'       , ::File::dirname(what)]
-      res << [type          , ::File::basename(what)]
-      res << ['notification', ValueHelper::generate(content)]
-      res << ['uid'         , Digest::MD5.hexdigest(Kernel::rand().to_s)]
-      res << ['fp'          , Digest::MD5.hexdigest(res.join(''))]
+      res << ['key'                             , key]
+      res << ['topic'                           , ::File::dirname(what)]
+      res << [type                              , ::File::basename(what)]
+      res << ['notification'                    , ValueHelper::generate(content)]
+      res << ['callback'                        , callback] unless callback.nil?
+      res << ['fingerprint-with-consumer-secret', Digest::MD5.hexdigest(res.join(''))]
       # TODO add secret to fp
     end # }}}
 

data/server/instances/1/notifications/topics.xml

@@ -0,0 +1,39 @@
+<topics xmlns='http://riddl.org/ns/common-patterns/notifications-producer/1.0'>
+  <topic id='running'>
+    <event>activity_calling</event>
+    <event>activity_failed</event>
+    <event>activity_manipulating</event>
+    <event>activity_done</event>
+    <vote>syncing_before</vote>
+    <vote>syncing_after</vote>
+  </topic>
+  <topic id='properties/position'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/description'>
+    <event>change</event>
+    <event>error</event>
+  </topic>
+  <topic id='properties/state'>
+    <event>change</event>
+    <vote>change</vote>
+  </topic>
+  <topic id='properties/status'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/dataelements'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/endpoints'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/handlerwrapper'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/handlers'>
+    <event>change</event>
+    <event>error</event>
+    <event>debug</event>
+    <event>info</event>
+  </topic>
+</topics>

data/server/instances/1/properties.xml

@@ -1,207 +1,22 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <name>Enter name here</name>
-  <state>stopped</state>
+  <name>asd</name>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions>
-    <a9>at</a9>
-    <a5>at</a5>
-    <a2>at</a2>
-    <a1>at</a1>
-  </positions>
-  <dataelements>
-    <test/>
-  </dataelements>
+  <positions/>
+  <dataelements/>
   <endpoints>
-    <gateway>http://localhost/gateways/timeout.php</gateway>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>parallel do
-  parallel_branch do
-    activity :a9, :call, :gateway, :label =&gt; "Produce Headcap Subsystem", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-    activity :a10, :call, :gateway, :label =&gt; "Delivery", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-  end
-  parallel_branch do
-    activity :a5, :call, :gateway, :label =&gt; "Supply Mechanical Parts", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-    activity :a6, :call, :gateway, :label =&gt; "Produce Mechanical Parts (A-Z)", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-    activity :a7, :call, :gateway, :label =&gt; "Perform Surface Treatment", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-    activity :a8, :call, :gateway, :label =&gt; "Mechanical Parts Assembly", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-  end
-  parallel_branch do
-    parallel do
-      parallel_branch do
-        activity :a2, :call, :gateway, :label =&gt; "Supply Electric Parts", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-        activity :a3, :call, :gateway, :label =&gt; "Delivery", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-      end
-      parallel_branch do
-        activity :a1, :call, :gateway, :label =&gt; "Develop Control System", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-      end
-    end
-    activity :a4, :call, :gateway, :label =&gt; "Electric Board Assembly", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-  end
-end
-activity :a11, :call, :gateway, :label =&gt; "Systems Integration", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ]
-activity :a12, :call, :gateway, :label =&gt; "Test", :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ] do |result|
-  data.test = "success"
-end
-</dsl>
+  <dsl/>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <parallel>
-        <parallel_branch>
-          <call id="a9" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Produce Headcap Subsystem</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-          <call id="a10" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Delivery</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-        </parallel_branch>
-        <parallel_branch>
-          <call id="a5" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Supply Mechanical Parts</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-          <call id="a6" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Produce Mechanical Parts (A-Z)</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-          <call id="a7" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Perform Surface Treatment</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-          <call id="a8" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Mechanical Parts Assembly</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-        </parallel_branch>
-        <parallel_branch>
-          <parallel>
-            <parallel_branch>
-              <call id="a2" endpoint="gateway">
-                <parameters>
-                  <!--{{{-->
-                  <label>Supply Electric Parts</label>
-                  <method>post</method>
-                  <parameters>
-                    <timeout>4</timeout>
-                  </parameters>
-                </parameters>
-                <!--}}}-->
-              </call>
-              <call id="a3" endpoint="gateway">
-                <parameters>
-                  <!--{{{-->
-                  <label>Delivery</label>
-                  <method>post</method>
-                  <parameters>
-                    <timeout>4</timeout>
-                  </parameters>
-                </parameters>
-                <!--}}}-->
-              </call>
-            </parallel_branch>
-            <parallel_branch>
-              <call id="a1" endpoint="gateway">
-                <parameters>
-                  <!--{{{-->
-                  <label>Develop Control System</label>
-                  <method>post</method>
-                  <parameters>
-                    <timeout>4</timeout>
-                  </parameters>
-                </parameters>
-                <!--}}}-->
-              </call>
-            </parallel_branch>
-          </parallel>
-          <call id="a4" endpoint="gateway">
-            <parameters>
-              <!--{{{-->
-              <label>Electric Board Assembly</label>
-              <method>post</method>
-              <parameters>
-                <timeout>4</timeout>
-              </parameters>
-            </parameters>
-            <!--}}}-->
-          </call>
-        </parallel_branch>
-      </parallel>
-      <call id="a11" endpoint="gateway">
-        <parameters>
-          <!--{{{-->
-          <label>Systems Integration</label>
-          <method>post</method>
-          <parameters>
-            <timeout>4</timeout>
-          </parameters>
-        </parameters>
-        <!--}}}-->
-      </call>
-      <call id="a12" endpoint="gateway">
-        <parameters>
-          <!--{{{-->
-          <label>Test</label>
-          <method>post</method>
-          <parameters>
-            <timeout>4</timeout>
-          </parameters>
-        </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.test = "success"</manipulate>
-      </call>
-    </description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
   </description>
   <transformation>
     <!--{{{-->
-    <!--}}}-->
     <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://cpee.org/ns/description/1.0" version="1.0">
       <xsl:output method="text"/>
       <xsl:strip-space elements="*"/>
@@ -315,14 +130,6 @@ end
           <xsl:text>end</xsl:text>
           <xsl:call-template name="print-newline"/>
         </xsl:if>
-        <xsl:if test="name()='group'">
-          <xsl:apply-templates>
-            <xsl:with-param name="myspace">
-              <xsl:value-of select="$myspace+$myspacemultiplier"/>
-            </xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
         <xsl:if test="name()='critical'">
           <xsl:text>critical :</xsl:text>
           <xsl:value-of select="@sid"/>
@@ -342,6 +149,14 @@ end
           <xsl:text>end</xsl:text>
           <xsl:call-template name="print-newline"/>
         </xsl:if>
+        <xsl:if test="name()='group'">
+          <xsl:apply-templates>
+            <xsl:with-param name="myspace">
+              <xsl:value-of select="$myspace+$myspacemultiplier"/>
+            </xsl:with-param>
+          </xsl:apply-templates>
+          <xsl:call-template name="print-newline"/>
+        </xsl:if>
       </xsl:template>
       <xsl:template match="d:alternative">
         <xsl:param name="myspace"/>
@@ -518,5 +333,6 @@ end
 </xsl:text>
       </xsl:template>
     </xsl:stylesheet>
+    <!--}}}-->
   </transformation>
 </properties>

data/server/instances/10/notifications/0ad4ba057d8029cb7baf5080b4defda2/consumer-secret

@@ -0,0 +1 @@
+6d5aae8b2c08d01c4992a5dfc68ce07d

data/server/instances/10/notifications/0ad4ba057d8029cb7baf5080b4defda2/producer-secret

@@ -0,0 +1 @@
+96d7a7dfcbba54da38bf7cc5a4a1b83c

data/server/instances/10/notifications/478f55276b76ae33b22591d350253ca1/consumer-secret

@@ -0,0 +1 @@
+76df76124a1cf9e61e0b87de8a940feb

data/server/instances/10/notifications/478f55276b76ae33b22591d350253ca1/producer-secret

@@ -0,0 +1 @@
+aeab7d77df1107bd98b3f411864ceb08

data/server/instances/10/notifications/topics.xml

@@ -0,0 +1,39 @@
+<topics xmlns='http://riddl.org/ns/common-patterns/notifications-producer/1.0'>
+  <topic id='running'>
+    <event>activity_calling</event>
+    <event>activity_failed</event>
+    <event>activity_manipulating</event>
+    <event>activity_done</event>
+    <vote>syncing_before</vote>
+    <vote>syncing_after</vote>
+  </topic>
+  <topic id='properties/position'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/description'>
+    <event>change</event>
+    <event>error</event>
+  </topic>
+  <topic id='properties/state'>
+    <event>change</event>
+    <vote>change</vote>
+  </topic>
+  <topic id='properties/status'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/dataelements'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/endpoints'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/handlerwrapper'>
+    <event>change</event>
+  </topic>
+  <topic id='properties/handlers'>
+    <event>change</event>
+    <event>error</event>
+    <event>debug</event>
+    <event>info</event>
+  </topic>
+</topics>

data/server/instances/10/properties.xml

@@ -1,25 +1,49 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <name>Enter name here</name>
-  <state>finished</state>
+  <name>RESCUE - Book Movie - Local</name>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
   <dataelements>
-    <x>""a2,a3,</x>
+    <date>""</date>
+    <starting_time>""</starting_time>
+    <selected_cinema/>
+    <title>""</title>
+    <selected_title>""</selected_title>
+    <selected_date/>
+    <hall/>
+    <zip>1100</zip>
+    <city/>
+    <reservation_number/>
   </dataelements>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <select>http://localhost:9293/pgwl</select>
+    <services>http://localhost:9290/groups/Cinemas/</services>
+    <injection_handler>http://localhost:9291/</injection_handler>
   </endpoints>
-  <dsl>activity :a1, :call, :timeout, :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 2 } ] do |result|
-  data.x += "a1,"
+  <dsl>activity :collect_input, :call, :select, :method =&gt; "post", :info =&gt; "true", :templates =&gt; [ { :uri =&gt; 'http://gruppe.wst.univie.ac.at/~ralph/input-forms/cinemas.xsl' }, { :name =&gt; 'Cinemas-Input' }, { :lang =&gt; 'EN' } ] do |result|
+
+        data.title = result.data.value('title')
+        data.date = result.data.value('date')
+        data.city = result.data.value('city')
+      
 end
-critical :section do
-  activity :a2, :call, :timeout, :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ] do |result|
-  data.x += "a2,"
-  end
-end
-activity :a3, :call, :timeout, :method =&gt; "post", :parameters =&gt; [ { :timeout =&gt; 4 } ] do |result|
-  data.x += "a3,"
+activity :use_repo_cinemas, :call, :services, :info =&gt; "true", :service =&gt; [ { :serviceoperation =&gt; "search_and_book" }, { :injection_handler =&gt; endpoints.injection_handler } ], :additional_endpoints =&gt; [ { :selector_service =&gt; "select" } ], :parameters =&gt; [ { :title =&gt; data.title }, { :date =&gt; data.date } ] do |result|
+
+      res = result[0]
+        if res['status'] == 200 
+          # Computing service responses
+          data.reservation_number = res['reservation_id']
+          data.starting_time = res['starting_time']
+          data.selected_title = res['movie_title']
+          data.selected_date = res['selected_date']
+          data.hall = res['hall']
+          # Computing properties of executed services
+          perf_book = properties['call_book']['perform_book']
+          data.selected_cinema = " #{perf_book.values[0]['vendor']['name']}\n#{perf_book.values[0]['address']['street']}\n#{perf_book.values[0]['address']['zip']} #{perf_book.values[0]['address']['city']}"
+        end
+      
 end
+activity :confirm, :call, :select, :method =&gt; "post", :info =&gt; "true", :templates =&gt; [ { :uri =&gt; 'http://gruppe.wst.univie.ac.at/~ralph/input-forms/cinemas.xsl' }, { :name =&gt; 'Cinemas-Output' }, { :lang =&gt; 'EN' } ], :parameters =&gt; [ { :title =&gt; data.selected_title }, { :date =&gt; data.selected_date }, { :time =&gt; data.starting_time }, { :hall =&gt; data.hall }, { :res_nr =&gt; data.reservation_number }, { :cinema =&gt; data.selected_cinema } ]
 </dsl>
   <status>
     <id>0</id>
@@ -27,41 +51,76 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <call id="a1" endpoint="timeout">
+      <call id="collect_input" endpoint="select">
         <parameters>
-          <!--{{{-->
           <method>post</method>
+          <info>true</info>
+          <templates>
+            <uri>'http://gruppe.wst.univie.ac.at/~ralph/input-forms/cinemas.xsl'</uri>
+            <name>'Cinemas-Input'</name>
+            <lang>'EN'</lang>
+          </templates>
+        </parameters>
+        <manipulate output="result">
+        data.title = result.data.value('title')
+        data.date = result.data.value('date')
+        data.city = result.data.value('city')
+      </manipulate>
+      </call>
+      <call id="use_repo_cinemas" endpoint="services">
+        <constraints>
+          <constraint xpath="address/city" comparator="==" variable="city"/>
+        </constraints>
+        <parameters>
+          <!--{{{-->
+          <info>true</info>
+          <service>
+            <serviceoperation>"search_and_book"</serviceoperation>
+            <injection_handler>endpoints.injection_handler</injection_handler>
+          </service>
+          <additional_endpoints>
+            <selector_service>"select"</selector_service>
+          </additional_endpoints>
           <parameters>
-            <timeout>2</timeout>
+            <title>data.title</title>
+            <date>data.date</date>
           </parameters>
         </parameters>
         <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
+        <manipulate output="result">
+      res = result[0]
+        if res['status'] == 200 
+          # Computing service responses
+          data.reservation_number = res['reservation_id']
+          data.starting_time = res['starting_time']
+          data.selected_title = res['movie_title']
+          data.selected_date = res['selected_date']
+          data.hall = res['hall']
+          # Computing properties of executed services
+          perf_book = properties['call_book']['perform_book']
+          data.selected_cinema = " #{perf_book.values[0]['vendor']['name']}\n#{perf_book.values[0]['address']['street']}\n#{perf_book.values[0]['address']['zip']} #{perf_book.values[0]['address']['city']}"
+        end
+      </manipulate>
       </call>
-      <critical sid="section">
-        <call id="a2" endpoint="timeout">
-          <parameters>
-            <!--{{{-->
-            <method>post</method>
-            <parameters>
-              <timeout>4</timeout>
-            </parameters>
-          </parameters>
-          <!--}}}-->
-          <manipulate output="result">  data.x += "a2,"</manipulate>
-        </call>
-      </critical>
-      <call id="a3" endpoint="timeout">
+      <call id="confirm" endpoint="select">
         <parameters>
-          <!--{{{-->
           <method>post</method>
+          <info>true</info>
+          <templates>
+            <uri>'http://gruppe.wst.univie.ac.at/~ralph/input-forms/cinemas.xsl'</uri>
+            <!-- uri>'http://gus.lan/input-forms/cinemas.xsl'</uri -->
+            <name>'Cinemas-Output'</name>
+            <lang>'EN'</lang>
+          </templates>
           <parameters>
-            <timeout>4</timeout>
+            <title>data.selected_title</title>
+            <date>data.selected_date</date>
+            <time>data.starting_time</time>
+            <hall>data.hall</hall>
+            <res_nr>data.reservation_number</res_nr>
+            <cinema>data.selected_cinema</cinema>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a3,"</manipulate>
       </call>
     </description>
   </description>
@@ -98,6 +157,11 @@ end
           <xsl:text>, :call, :</xsl:text>
           <xsl:value-of select="@endpoint"/>
           <xsl:apply-templates select="d:parameters"/>
+          <xsl:if test="@oid">
+            <xsl:text>, :'call-oid' =&gt; '</xsl:text>
+            <xsl:value-of select="@oid"/>
+            <xsl:text>'</xsl:text>
+          </xsl:if>
           <xsl:apply-templates select="d:manipulate" mode="part-of-call">
             <xsl:with-param name="myspace">
               <xsl:value-of select="$myspace"/>
@@ -107,6 +171,12 @@ end
         </xsl:if>
         <xsl:if test="name()='manipulate'">
           <xsl:text>, :manipulate</xsl:text>
+          <!-- RESCUE: manipulate with dataelement as result object -->
+          <xsl:if test="@data">
+            <xsl:text>, nil,</xsl:text>
+            <xsl:value-of select="@data"/>
+          </xsl:if>
+          <!-- RESCUE -->
           <xsl:call-template name="print-content">
             <xsl:with-param name="myspace">
               <xsl:value-of select="$myspace"/>