cpee 1.3.192 → 1.3.193

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42201bf6ae8150fda07d193dcfa74ff93f8680aa
-  data.tar.gz: 5f5bef0e5a8212a977328a05969e5058555dabb6
+  metadata.gz: 2fc85848924c3bad3d3739c62e182cfea78f5bf6
+  data.tar.gz: 5d2aea61c93c744bd53dfae9b2aed961e10004fa
 SHA512:
-  metadata.gz: a49649ba5a52cc08390bf16fd51576a22f2ca6073d3d97346fb25c69a76ea7bd47b6b27cce4f7a7af88e660d6acf3f4ba0242a171a35bd7619795a393aa7eb38
-  data.tar.gz: d1a10b8278907b7350199008c9604fd5d61f43e188b22836f95d7bddc8f24de478636208b49995f5d17e0fb5344288265ddd9dabb5c1cbd546f361d2e4602eff
+  metadata.gz: b5ee8db3dcb1a5809c67335ca506ce88a2bce9b7bdbfd88d2ebb565573927cd9ca1b87d2a831b144af29a0e7632005b68eab35775677f936f4fc40b144a123e0
+  data.tar.gz: 92dcc8423919577b77429f0471c9fb1ce6a6416a1d5738f098a665681b0a8ba31e8a5f84bbc361ad7a130bd5fdb8b0072cd86eaaa029c189ba1167f476e225be

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.192"
+  s.version          = "1.3.193"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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/log/server.rb

@@ -19,6 +19,7 @@ class Logging < Riddl::Implementation #{{{
       log_dir = ::File.dirname(__FILE__) + "/logs"
       instancenr = @h['CPEE_INSTANCE'].split('/').last
       notification = JSON.parse(@p[3].value)
+      parameters = notification['parameters']
       log_hash = notification['log_hash']
       Dir.mkdir(log_dir+'/'+instancenr) unless Dir.exist?(log_dir+'/'+instancenr)
       unless File.exist?(log_dir+'/'+instancenr+'/log.xes')
@@ -33,11 +34,12 @@ class Logging < Riddl::Implementation #{{{
       XML::Smart.modify(log_dir+'/'+instancenr+'/log.xes') do |xml|
         trace = xml.find("/xmlns:log/xmlns:trace").first
         event = trace.add "event"
-        event.add 'string', :key => "concept:name", :value => log_hash["label"]
+        event.add 'string', :key => "concept:name", :value => parameters["label"]
         event.add 'string', :key => "lifecycle:transition", :value => event=='done'?"complete":"start"
-        if log_hash.has_key?("data_send")
+        data_send = ((parameters[:arguments].nil? ? [] : parameters[:arguments]) rescue [])
+        if data_send.any?
           list = event.add 'list', :key => "data_send"
-          log_hash["data_send"].each do |k,v|
+          data_send.each do |k,v|
             list.add 'string', :key => k , :value => v
           end
         end

data/server/handlerwrappers/default.rb

@@ -163,13 +163,14 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       if r.is_a? Riddl::Parameter::Simple
         { r.name => r.value }
       elsif r.is_a? Riddl::Parameter::Complex
-        {
-          r.name => {
+        tmp = {
+          r.name == '' ? 'result' : r.name => {
             'mimetype' => r.mimetype,
             'content' => r.value.read
           }
         }
         r.value.rewind
+        tmp
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.192
+  version: 1.3.193
 platform: ruby
 authors:
 - Juergen eTM Mangler