cpee 1.3.228 → 1.3.230

data/log/log.xml

@@ -2,25 +2,11 @@
   <interface name="events">
     <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml"/>
   </interface>
-  <interface name="cpee" location="http://cpee.org:9298">
-    <xi:include href="http://cpee.org:9298/?riddl-description"/>
-  </interface>
-  <interface name="logoverlay">
-    <xi:include href="logoverlay.xml"/>
-  </interface>
 
   <facade>
-    <tile>
-      <layer name="cpee"/>
-    </tile>
     <tile>
       <layer name="events">
-        <apply-to>/log</apply-to>
-      </layer>
-    </tile>
-    <tile>
-      <layer name="logoverlay">
-        <apply-to>/{}/log</apply-to>
+        <apply-to>/</apply-to>
       </layer>
     </tile>
   </facade>

data/log/template.xes_xml

@@ -0,0 +1,23 @@
+<log xmlns="http://www.xes-standard.org/" xes.version="2.0" xes.features="nested-attributes">
+  <extension name="Time" prefix="time" uri="http://www.xes-standard.org/time.xesext"/>
+  <extension name="Concept" prefix="concept" uri="http://www.xes-standard.org/concept.xesext"/>
+  <extension name="Organizational" prefix="org" uri="http://www.xes-standard.org/org.xesext"/>
+  <extension name="Lifecycle" prefix="lifecycle" uri="http://www.xes-standard.org/lifecycle.xesext"/>
+  <global scope="trace">
+    <string key="concept:name" value="__INVALID__"/>
+  </global>
+  <global scope="event">
+    <string key="concept:name" value="__INVALID__"/>
+    <string key="concept:endpoint" value="__ENDPOINT__"/>
+    <string key="id:id" value="__ID__"/>
+    <string key="lifecycle:transition" value="complete" />
+    <date key="time:timestamp" value="1990-02-17T09:45:00.000+01:00"/>
+  </global>
+  <classifier name="Data" keys="data_send data_received"/>
+  <classifier name="Data_Received" keys="data_received"/>
+  <classifier name="Name" keys="concept:name"/>
+  <classifier name="Endpoint" keys="concept:endpoint"/>
+  <classifier name="ID" keys="id:id"/>
+  <classifier name="Lifecycle" keys="lifecycle:transition"/>
+  <trace/>
+</log>

data/log/template.xes_yaml

@@ -0,0 +1,26 @@
+---
+log:
+  extension:
+    time: http://www.xes-standard.org/time.xesext
+    concept: http://www.xes-standard.org/concept.xesext
+    organisational: http://www.xes-standard.org/org.xesext
+    lifecylce: http://www.xes-standard.org/lifecycle.xesext
+    cpee: http://cpee.org/cpee.xesext
+  global:
+    trace:
+      concept:name: __INVALID__
+      cpee:name: __INVALID__
+    event:
+      concept:name: __INVALID__
+      concept:endpoint: ''
+      id:id: ''
+      lifecycle:transition: complete
+      cpee:lifecycle:transition: activity/call
+      time:timestamp: ''
+  classifier:
+    Data: data_send data_received data_changed data_values
+    Data_Received: data_receiver
+    Data_Send: data_send
+    Data_Changed: data_changer
+    Data_Values: data_values
+  trace: {}

data/log/{server.rb → xes_xml.rb}

@@ -12,33 +12,7 @@ require 'riddl/utils/turtle'
 require 'time'
 
 class Logging < Riddl::Implementation #{{{
-  LOGTEMPLATE = <<-END
-    <log xmlns="http://www.xes-standard.org/" xes.version="2.0" xes.features="nested-attributes">
-      <extension name="Time" prefix="time" uri="http://www.xes-standard.org/time.xesext"/>
-      <extension name="Concept" prefix="concept" uri="http://www.xes-standard.org/concept.xesext"/>
-      <extension name="Organizational" prefix="org" uri="http://www.xes-standard.org/org.xesext"/>
-	    <extension name="Lifecycle" prefix="lifecycle" uri="http://www.xes-standard.org/lifecycle.xesext"/>
-      <global scope="trace">                                                                                                                                          
-        <string key="concept:name" value="__INVALID__"/>
-      </global>
-      <global scope="event">
-        <string key="concept:name" value="__INVALID__"/>
-        <string key="concept:endpoint" value="__ENDPOINT__"/>
-        <string key="id:id" value="__ID__"/>
-        <string key="lifecycle:transition" value="complete" />
-        <date key="time:timestamp" value="1990-02-17T09:45:00.000+01:00"/>
-      </global>
-			<classifier name="Data" keys="data_send data_received"/>
-			<classifier name="Data_Received" keys="data_received"/>
-			<classifier name="Name" keys="concept:name"/>
-			<classifier name="Endpoint" keys="concept:endpoint"/>
-			<classifier name="ID" keys="id:id"/>
-			<classifier name="Lifecycle" keys="lifecycle:transition"/>
-      <trace/>
-    </log>
-  END
   def doc(event_name,log_dir,instancenr,notification)
-    start_x = Time.now
     uuid = notification['instance_uuid']
     activity = notification["activity"]
     parameters = notification['parameters']
@@ -75,7 +49,7 @@ class Logging < Riddl::Implementation #{{{
             receiving.each do |e|
               e.each do |k,v|
                 case v['mimetype']
-                  when /\/xml$/ 
+                  when /\/xml$/
           					list = event.add 'list', :key => "data_received"
                     node = list.add 'string', :key => k
                     node.add XML::Smart.string(v['content']).root
@@ -84,13 +58,13 @@ class Logging < Riddl::Implementation #{{{
                   when /\/html$/
           					list = event.add 'list', :key => "data_received"
                     list.add 'string', :key => k, :value => v['content']
-                  else 
+                  else
           					list = event.add 'list', :key => "data_received"
                     list.add 'string', :key => k, :value => v
-                end    
+                end
               end
             end
-          else 
+          else
             pp receiving
           end
         end
@@ -102,11 +76,8 @@ class Logging < Riddl::Implementation #{{{
         puts e.backtrace
       end
     end
-    end_x = Time.now
-    x = end_x - start_x
-    File.open(log_dir+'/'+uuid+'/time.file',"a+"){ |f| f<< x << "\n" }
   end
-  
+
 	def rec_unjson(value,list,key)
 		case value
 			when Array then
@@ -127,7 +98,7 @@ class Logging < Riddl::Implementation #{{{
   def response
     topic = @p[1].value
     event_name = @p[2].value
-    log_dir = ::File.dirname(__FILE__) + "/logs"
+    log_dir = @a[0]
     instancenr = @h['CPEE_INSTANCE'].split('/').last
     notification = JSON.parse(@p[3].value)
     doc(event_name,log_dir,instancenr,notification)
@@ -135,18 +106,16 @@ class Logging < Riddl::Implementation #{{{
 end  #}}}
 
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/log.xml', :host => "coruscant.wst.univie.ac.at", :port => 9299) do #{{{
+Riddl::Server.new(File.join(__dir__,'/log.xml'), :host => 'localhost', :port => 9299) do #{{{
   accessible_description true
   cross_site_xhr true
-  log_path = "/home/demo/Projects/cpee-helpers/log/logs"
+  @riddllog_dir = File.join(__dir__,logs)"
 
-  interface 'events' do 
-	    run Logging if post 'event'
-	    #run CB if post 'vote'
+  interface 'events' do
+	  run Logging if post 'event'
   end
   interface 'logoverlay' do |r|
-    run Riddl::Utils::FileServe, "#{log_path}#{r[:h]["RIDDL_DECLARATION_PATH"]}.xes","text/xml" if get '*'
+    run Riddl::Utils::FileServe, log_dir + r[:h]["RIDDL_DECLARATION_PATH"]+ ".xes","text/xml" if get
   end
 
-
 end.loop! #}}}

data/log/xes_yaml.rb

@@ -0,0 +1,111 @@
+#!/usr/bin/ruby
+require 'pp'
+require 'json'
+require 'yaml'
+require 'rubygems'
+require 'riddl/server'
+require 'riddl/utils/fileserve'
+require 'time'
+
+class Logging < Riddl::Implementation #{{{
+  def doc(topic,event_name,log_dir,template,instancenr,notification)
+    uuid = notification['instance_uuid']
+    return unless uuid
+
+    activity = notification["activity"]
+    parameters = notification['parameters']
+    receiving = notification['received']
+
+    log = YAML::load(File.read(template))
+    log["log"]["trace"]["concept:name"] ||= instancenr
+    log["log"]["trace"]["cpee:name"] ||= notification['instance_name'] if notification["instance_name"]
+    log["log"]["trace"]["cpee:uuid"] ||= notification['instance_uuid'] if notification["instance_uuid"]
+    File.open(File.join(log_dir,uuid+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exists? File.join(log_dir,uuid+'.xes.yaml')
+    event = {}
+    event["trace:id"] = instancenr
+    event["concept:name"] = notification["label"] if notification["label"]
+    if notification["endpoint"]
+      event["concept:endpoint"] = notification["endpoint"]
+    else
+      event["concept:name"] = 'Script Task'
+    end
+    event["id:id"] = activity
+    case event_name
+      when 'receiving', 'change'
+        event["lifecycle:transition"] = "unknown"
+      when 'done'
+        event["lifecycle:transition"] = "complete"
+      else
+        event["lifecycle:transition"] = "start"
+    end
+    event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
+    data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
+    event["list"] = {"data_send" => data_send} unless data_send.empty?
+    if notification['changed']&.any?
+      if event.has_key? "list"
+        event["list"]["data_changed"] ||= notification['changed']
+      else
+        event["list"] = {"data_changer" => notification['changed']}
+      end
+    end
+    if notification['values']&.any?
+      if event.has_key? "list"
+        event["list"]["data_values"] ||= notification['values']
+      else
+        event["list"] = {"data_values" => notification['values']}
+      end
+    end
+    if receiving&.any?
+      if event.has_key? "list"
+        event["list"]["data_received"] ||= receiving
+      else
+        event["list"] = {"data_receiver" => receiving}
+      end
+    end
+    event["time:timestamp"]= Time.now.iso8601
+    File.open(File.join(log_dir,uuid+'.xes.yaml'),'a') do |f|
+      f << {'event' => event}.to_yaml
+    end
+  end
+
+	def rec_unjson(value,list,key)
+		case value
+			when Array then
+				li = list.add 'list', :key => key
+				value.each_with_index do |v,k|
+					rec_unjson(v,li,k)
+				end
+			when Hash then
+				li = list.add 'list', :key => key
+				value.each do |k,v|
+					rec_unjson(v,li,k)
+				end
+			else
+				list.add 'string', :key => key, :value => value
+		end
+	end
+
+  def response
+    topic        = @p[1].value
+    event_name   = @p[2].value
+    log_dir      = @a[0]
+    template     = @a[1]
+    instancenr   = @h['CPEE_INSTANCE'].split('/').last
+    notification = JSON.parse(@p[3].value)
+    doc topic, event_name, log_dir, template, instancenr, notification
+  end
+end #}}}
+
+Riddl::Server.new(File.join(__dir__,'/log.xml'), :host => 'localhost', :port => 9299) do
+  accessible_description true
+  cross_site_xhr true
+  @riddl_opts[:log_dir] ||= File.join(__dir__,'logs')
+  @riddl_opts[:template] ||= File.join(__dir__,'template.xes_yaml')
+
+  interface 'events' do
+	  run Logging, @riddl_opts[:log_dir], @riddl_opts[:template] if post 'event'
+  end
+  interface 'logoverlay' do |r|
+    run Riddl::Utils::FileServe, log_dir + r[:h]["RIDDL_DECLARATION_PATH"]+ ".xes","text/plain" if get
+  end
+end.loop!

data/server/handlerwrappers/default.rb

@@ -40,10 +40,12 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @handler_position = position
     @handler_passthrough = nil
     @handler_returnValue = nil
+    @label = ''
   end # }}}
 
   def activity_handle(passthrough, parameters) # {{{
-    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @label = parameters[:label]
+    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
     if passthrough.nil?
       params = []
       callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
@@ -82,6 +84,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       @handler_passthrough = passthrough
     end
   end # }}}
+  def activity_manipulate_handle(parameters) #{{{
+    @label = parameters[:label]
+  end #}}}
 
   def activity_result_status # {{{
     WEEL::Status.new(1, "everything okay")
@@ -105,28 +110,28 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.notify("activity/manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("activity/failed", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1], :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.notify("activity/failed", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1], :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
       @controller.serialize_status!
-      @controller.notify("status/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :id => status.id, :message => status.message)
+      @controller.notify("status/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil?
       @controller.serialize_dataelements!
-      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_dataelements)
+      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
     end
     unless changed_endpoints.nil?
       @controller.serialize_endpoints!
-      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_endpoints)
+      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
     end
   end # }}}
 
@@ -148,8 +153,12 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
           result = XML::Smart::string(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'text/plain'
           result = result[0].value.read
-          result = result.to_f if result == result.to_f.to_s
-          result = result.to_i if result == result.to_i.to_s
+          if result.start_with?("<?xml version=")
+            result = XML::Smart::string(result)
+          else
+            result = result.to_f if result == result.to_f.to_s
+            result = result.to_i if result == result.to_i.to_s
+          end
         elsif result[0].mimetype == 'text/html'
           result = result[0].value.read
           result = result.to_f if result == result.to_f.to_s
@@ -180,7 +189,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :time=>Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
     result = simplify_result(result)
     if options['CPEE_UPDATE']
       @handler_returnValue = result

data/server/resources/properties.schema.active

@@ -18,12 +18,12 @@
   <attributes type="complex" modifiable="false" mutable="false">
     <zeroOrMore>
       <element><anyName/><text/></element>
-    </zeroOrMore>  
-  </attributes>  
+    </zeroOrMore>
+  </attributes>
   <handlerwrapper type="simple" modifiable="false" mutable="false">
     <data type="string">
       <param name="pattern">[A-Z][a-zA-Z]*</param>
-    </data>  
+    </data>
   </handlerwrapper>
   <dsl type="simple" modifiable="false" mutable="false">
     <text/>
@@ -39,7 +39,7 @@
           <value>xslt</value>
           <value>clean</value>
           <value>none</value>
-        </choice>  
+        </choice>
       </attribute>
       <data type="anyURI"/>
     </element>
@@ -50,7 +50,7 @@
           <value>xslt</value>
           <value>clean</value>
           <value>none</value>
-        </choice>  
+        </choice>
       </attribute>
       <data type="anyURI"/>
     </element>
@@ -61,7 +61,7 @@
           <value>xslt</value>
           <value>clean</value>
           <value>none</value>
-        </choice>  
+        </choice>
       </attribute>
       <data type="anyURI"/>
     </element>
@@ -71,9 +71,10 @@
       <running putable="true"/>
       <ready putable="true"/>
       <simulating putable="true"/>
-    </ready>  
+    </ready>
     <running>
       <stopping putable="true"/>
+      <finishing putable="false"/>
       <finished putable="false"/>
     </running>
     <simulating>
@@ -87,9 +88,9 @@
       <stopped putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
-    </stopped>  
+    </stopped>
     <finished/>
-  </state>  
+  </state>
   <status type="complex" modifiable="false" mutable="true">
     <optional>
       <element name='id'>
@@ -98,26 +99,26 @@
       <element name='message'>
         <data type="string"/>
       </element>
-    </optional>  
-  </status>  
+    </optional>
+  </status>
   <positions type="complex" modifiable="false" mutable="true">
     <zeroOrMore>
       <element>
         <anyName/>
         <data type="string">
           <param name="pattern">(at|after)(;[A-Za-z0-9]+)?</param>
-        </data>  
+        </data>
       </element>
-    </zeroOrMore>  
-  </positions>  
+    </zeroOrMore>
+  </positions>
   <dataelements type="complex" modifiable="false" mutable="true">
     <zeroOrMore>
       <element><anyName/><text/></element>
-    </zeroOrMore>  
-  </dataelements>  
+    </zeroOrMore>
+  </dataelements>
   <endpoints type="complex" modifiable="false" mutable="true">
     <zeroOrMore>
       <element><anyName/><text/></element>
-    </zeroOrMore>  
+    </zeroOrMore>
   </endpoints>
 </properties>