cpee-logging-xes-yaml 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186da10687e64dcb1463bb2499bb2f7cacee45c687e2f086758ab847193e8fc4
-  data.tar.gz: ff3062ea2289e0d47845c60666d7413ad7253b63d1115ff6a7f410dc3aea75f6
+  metadata.gz: 8a28cb07da1a9501ae42be2daed564edbe2e9c8f19d9b935beae41eb92d9e858
+  data.tar.gz: c0608403c7d0ed382f31bc268c5d6091ab3de1ac27b3be45dab7b7b3474cfbf1
 SHA512:
-  metadata.gz: 35c9e6a02d694d1909f0773321dfff7b61ed6324a8146712c35caa23fc79303ee6403dab6bb3e6182046efece09cffddec420b9acee75864ed606198ba3ba861
-  data.tar.gz: 23c70dba7ff36da95cbb0532f8f9fca8c6f7334e8689665c0cc864a2b16f9a72f815708dd5427dc13c46fb2c2786c57876cbcf3cfbbdc4a441922896f7440597
+  metadata.gz: d8c0ec086213534780c96fd7ca2da9cc9f4621985876db32c47e061566ded16e3c530e6c28156f1ff49f0955136816ca09b24c0c125218c256c1179db42a8a9b
+  data.tar.gz: a14a71277ee317c3214bda9310cded04c9367d5363a75b8669a1ee67417ec539846e5908e570637c493a01e78b5a53c503c83b20a231e111b23cab665c5e5898

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.1.2"
+  s.version          = "1.1.4"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -24,6 +24,28 @@ end
 module CPEE
   module Logging
 
+    def self::val_merge(target,val,tid,tso)
+      if val.is_a? Array
+        val.each do |e|
+          if e.is_a? StreamPoint
+            e.source ||= tso
+            target << e.to_h(tid)
+          end
+        end
+      else
+        tp = nil
+        if val.is_a? StreamPoint
+          tp = val
+          tp.source = tso if tp.source.nil?
+        else
+          tp = StreamPoint.new
+          tp.source =  tso
+          tp.value = val
+        end
+        target << tp.to_h(tid)
+      end
+    end
+
     def self::extract_probes(where,xml)
       XML::Smart::string(xml) do |doc|
         doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
@@ -36,8 +58,8 @@ module CPEE
       end
     end
 
-    def self::extract_sensor(rs,code,result)
-      result.map! do |res|
+    def self::extract_result(result)
+      ret = result.map do |res|
         if res['mimetype'].nil?
           res['value']
         elsif res['mimetype'] == 'application/json'
@@ -64,7 +86,10 @@ module CPEE
           res['data']
         end
       end
-      result = result[0] if result.length == 1
+      ret.length == 1 ? ret[0] : ret
+    end
+
+    def self::extract_sensor(rs,code,result)
       rs.instance_eval(code)
     end
 
@@ -135,6 +160,21 @@ module CPEE
         event["data"] = content['values'].map do |k,v|
           { 'name' => k, 'value' => v }
         end
+
+        fname = File.join(log_dir,instance + '_' + event["id:id"] + '.probe')
+        dname = File.join(log_dir,instance + '.data.json')
+
+        if File.exists?(fname)
+          rs = WEEL::ReadStructure.new(File.exists?(dname) ? JSON::load(File::open(dname)) : {},{},{})
+          XML::Smart::open_unprotected(fname) do |doc|
+            doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+            doc.find('//d:probe[d:extractor_type="intrinsic"]').each do |p|
+              event['stream:sensorstream'] ||= []
+              val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),nil) rescue nil
+              CPEE::Logging::val_merge(event['stream:sensorstream'],val,p.find('string(d:id)'),p.find('string(d:source)'))
+            end
+          end
+        end
       end
       if receiving && !receiving.empty?
         fname = File.join(log_dir,instance + '_' + event["id:id"] + '.probe')
@@ -142,35 +182,24 @@ module CPEE
 
         if File.exists?(fname)
           te = event.dup
-          te['stream:sensorstream'] = []
 
           rs = WEEL::ReadStructure.new(File.exists?(dname) ? JSON::load(File::open(dname)) : {},{},{})
           XML::Smart::open_unprotected(fname) do |doc|
             doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-            doc.find('//d:probe').each do |p|
-              tid = p.find('string(d:id)')
-              tso = p.find('string(d:source)')
-              if p.find('d:extractor_type[.="extrinsic"]')
-                val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),receiving) rescue nil
-                if val.is_a? Array
-                  val.each do |e|
-                    if e.is_a? StreamPoint
-                      e.source ||= tso
-                      te['stream:sensorstream'] << e.to_h(tid)
-                    end
-                  end
-                else
-                  tp = StreamPoint.new
-                  tp.source =  tso
-                  tp.value = val
-                  te['stream:sensorstream'] << tp.to_h(tid)
-                end
+            if doc.find('//d:probe/d:extractor_type[.="extrinsic"]').any?
+              rc = CPEE::Logging::extract_result(receiving)
+              doc.find('//d:probe[d:extractor_type="extrinsic"]').each do |p|
+                te['stream:sensorstream'] ||= []
+                val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),rc) rescue nil
+                CPEE::Logging::val_merge(te['stream:sensorstream'],val,p.find('string(d:id)'),p.find('string(d:source)'))
               end
             end
           end
-          te["cpee:lifecycle:transition"] = "sensor/stream"
-          File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
-            f << {'event' => te}.to_yaml
+          if te['stream:sensorstream']
+            te["cpee:lifecycle:transition"] = "sensor/stream"
+            File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
+              f << {'event' => te}.to_yaml
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Juergen eTM Mangler