cpee-logging-xes-yaml 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a28cb07da1a9501ae42be2daed564edbe2e9c8f19d9b935beae41eb92d9e858
-  data.tar.gz: c0608403c7d0ed382f31bc268c5d6091ab3de1ac27b3be45dab7b7b3474cfbf1
+  metadata.gz: 421ab3070bdb8f28214e0b712f4ecbe8cdc7738427df56692f2be5e010378642
+  data.tar.gz: 3dd19409583da0cd2ba0f022c40505fc16071001017fd01364a9bedd7b993e08
 SHA512:
-  metadata.gz: d8c0ec086213534780c96fd7ca2da9cc9f4621985876db32c47e061566ded16e3c530e6c28156f1ff49f0955136816ca09b24c0c125218c256c1179db42a8a9b
-  data.tar.gz: a14a71277ee317c3214bda9310cded04c9367d5363a75b8669a1ee67417ec539846e5908e570637c493a01e78b5a53c503c83b20a231e111b23cab665c5e5898
+  metadata.gz: 3afaebb9674da2559218a7461a7a639ecbb3055b772768cea5b5e1380f63bb159f57b979dc961e1c751e900f9229dfc0f1fca2f3bb367663fb8780bf0a923c5f
+  data.tar.gz: d06c3392fdb38ebf71dd0730c157741d91630b4c6028e1c9be9c936067e97761e2669f337e0830bbbebbf6f010c0229a0a572408b94aefb52306ccff888b4762

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.4"
+  s.version          = "1.2.0"
   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/logging.rb

@@ -23,6 +23,8 @@ require 'time'
 
 require_relative 'tools'
 
+matze = 'localhostr:9318'
+
 module CPEE
   module Logging
 

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

@@ -2,21 +2,57 @@ require 'weel'
 
 class StreamPoint
   attr_accessor :value, :timestamp, :source, :meta
+  attr_reader :id
 
-  def initialize
+  def initialize(id)
+    @id = id
     @value = nil
     @timestamp = Time.now
     @source = nil
     @meta = nil
   end
 
-  def to_h(id)
-    tp = { 'stream:point' => { } }
-    tp['stream:point']['stream:id'] = id
-    tp['stream:point']['stream:value'] = @value
-    tp['stream:point']['stream:timestamp'] = @timestamp
-    tp['stream:point']['stream:source'] = @source unless @source.nil?
-    tp['stream:point']['stream:meta'] = @meta unless @meta.nil?
+  def to_h
+    tp = { }
+    tp['stream:id'] = @id
+    tp['stream:value'] = @value
+    tp['stream:timestamp'] = @timestamp
+    tp['stream:source'] = @source unless @source.nil?
+    tp['stream:meta'] = @meta unless @meta.nil?
+    tp
+  end
+end
+class Stream
+  attr_accessor :id, :source, :meta
+  attr_reader :name
+
+  def initialize(name)
+    @name = name
+    @id = nil
+    @source = nil
+    @meta = nil
+    @values = []
+  end
+
+  def <<(val)
+    @values << val
+  end
+
+  def to_list
+    tp = []
+    tp << {'stream:name' => @name}
+    tp << {'stream:id' => @id} unless @id.nil?
+    tp << {'stream:source' => @source} unless @source.nil?
+    tp << {'stream:meta' => @meta} unless @meta.nil?
+    @values.each do |e|
+      if e.is_a? Stream
+        e.source = @source if e.source.nil? && !@source.nil?
+        tp << { 'stream:sensorstream' => e.to_list }
+      elsif e.is_a? StreamPoint
+        e.source = @source if e.source.nil? && !@source.nil?
+        tp << { 'stream:point' => e.to_h }
+      end
+    end
     tp
   end
 end
@@ -25,24 +61,20 @@ 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
+      if val.is_a? Stream
+        val.source = tso if val.source.nil?
+        target.push *val.to_list
       else
         tp = nil
         if val.is_a? StreamPoint
           tp = val
           tp.source = tso if tp.source.nil?
         else
-          tp = StreamPoint.new
+          tp = StreamPoint.new(tid)
           tp.source =  tso
           tp.value = val
         end
-        target << tp.to_h(tid)
+        target << { 'stream:point' => e.to_h }
       end
     end
 
@@ -66,9 +98,9 @@ module CPEE
           JSON::parse(res['data'])
         elsif res['mimetype'] == 'application/xml' || res['mimetype'] == 'text/xml'
           XML::Smart::string(res['data']) rescue nil
-        elsif res.mimetype == 'text/yaml'
+        elsif res['mimetype'] == 'text/yaml'
           YAML::load(res['data']) rescue nil
-        elsif result[0].mimetype == 'text/plain'
+        elsif res['mimetype'] == 'text/plain'
           t = res['data']
           if t.start_with?("<?xml version=")
             t = XML::Smart::string(t)
@@ -77,7 +109,7 @@ module CPEE
             t = t.to_i if t == t.to_i.to_s
           end
           t
-        elsif res.mimetype == 'text/html'
+        elsif res['mimetype'] == 'text/html'
           t = res['data']
           t = t.to_f if t == t.to_f.to_s
           t = t.to_i if t == t.to_i.to_s
@@ -89,8 +121,10 @@ module CPEE
       ret.length == 1 ? ret[0] : ret
     end
 
-    def self::extract_sensor(rs,code,result)
-      rs.instance_eval(code)
+    def self::extract_sensor(rs,code,pid,result)
+      rs.instance_eval(code,'probe',1)
+    rescue => e
+      e.backtrace[0].gsub(/(\w+):(\d+):in.*/,'Probe ' + pid + ' Line \2: ') + e.message
     end
 
     def self::persist_values(where,values)
@@ -169,9 +203,10 @@ module CPEE
           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|
+              pid = p.find('string(d:id)')
               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)'))
+              val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),pid,nil) rescue nil
+              CPEE::Logging::val_merge(event['stream:sensorstream'],val,pid,p.find('string(d:source)'))
             end
           end
         end
@@ -189,9 +224,10 @@ module CPEE
             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|
+                pid = p.find('string(d:id)')
                 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)'))
+                val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),pid,rc) rescue nil
+                CPEE::Logging::val_merge(te['stream:sensorstream'],val,pid,p.find('string(d:source)'))
               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.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl