cpee 2.1.2 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/config.json +1 -1
  3. data/cockpit/js/instance.js +93 -23
  4. data/cockpit/themes/compact/rngs/call.rng +17 -8
  5. data/cockpit/themes/compact/rngs/callmanipulate.rng +18 -9
  6. data/cockpit/themes/compact/rngs/start.rng +9 -9
  7. data/cockpit/themes/compact/theme.js +1 -1
  8. data/cockpit/themes/control/rngs/call.rng +17 -8
  9. data/cockpit/themes/control/rngs/callmanipulate.rng +18 -9
  10. data/cockpit/themes/control/rngs/start.rng +9 -9
  11. data/cockpit/themes/default/rngs/call.rng +17 -8
  12. data/cockpit/themes/default/rngs/callmanipulate.rng +18 -9
  13. data/cockpit/themes/default/rngs/start.rng +9 -9
  14. data/cockpit/themes/extended/rngs/call.rng +17 -8
  15. data/cockpit/themes/extended/rngs/callmanipulate.rng +18 -9
  16. data/cockpit/themes/extended/rngs/start.rng +9 -9
  17. data/cockpit/themes/extended/theme.js +1 -1
  18. data/cockpit/themes/packed/rngs/call.rng +17 -8
  19. data/cockpit/themes/packed/rngs/callmanipulate.rng +18 -9
  20. data/cockpit/themes/packed/rngs/start.rng +9 -9
  21. data/cockpit/themes/packed/theme.js +1 -1
  22. data/cockpit/themes/preset/rngs/call.rng +17 -8
  23. data/cockpit/themes/preset/rngs/callmanipulate.rng +18 -9
  24. data/cockpit/themes/preset/rngs/start.rng +9 -9
  25. data/cpee.gemspec +2 -2
  26. data/lib/cpee/implementation_notifications.rb +5 -5
  27. data/server/routing/end.pid +1 -0
  28. data/server/routing/forward-events.pid +1 -0
  29. data/server/routing/forward-votes.pid +1 -0
  30. data/server/routing/persist.pid +1 -0
  31. data/tools/cpee +7 -7
  32. metadata +8 -5
  33. data/lib/instantiation.xml +0 -125
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 325b18f98e4911371489cf481eb0e020cb73367127313a6f16d6f9baee7a0854
4
- data.tar.gz: c4ba38576d13cf199b64f92de3c7112710dff8390b459194f605cc38946e3d1b
3
+ metadata.gz: b53cb9f8e98081958903b4e747c373d41e9dcee3bbe5538827840e2f53b99a76
4
+ data.tar.gz: 40d78337aae0539ced2265c1e06aa5fd6835ab65bc911ef3e177ee4fbefa354a
5
5
  SHA512:
6
- metadata.gz: 0dbf0ae5fdd6853c247fd608a5bb35975309453e4542183a7a9dec0438554a67e70060d72718b519e9ff4e34143869f0014589d3dfe5f32924144ac9d0157220
7
- data.tar.gz: b9e39b3aa0dde5051be9313dc4d4a25907f7f6d2299c53f7ddb95110118859e7f17fd78283a5ac1cae9e8a87f5524fcbacfb328d3e43a69ffc521109a4715748
6
+ metadata.gz: e054275ba62f4d1212f0fa4dcb78d498bd3c22dfe827dab1b77bd7425f28afff5148603710252500d39a4205bf2cba051d25d5ae1bdf652ddf09d898125d8db0
7
+ data.tar.gz: 7442466d0aa7a6f71ff5dbfbf52373ef784a2ad3fefa6c34410c447abeac2856630e257e7099ef2217b9497ce2c8164548950aa60b4aacdb859f7c29bb666095
data/cockpit/config.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- "res-url": "https://cpee.org/flow/resources/"
2
+ "res-url": "https://tango.wst.univie.ac.at/flow/resources/"
3
3
  }
data/cockpit/js/instance.js CHANGED
@@ -406,12 +406,12 @@ function monitor_instance_values(val) {// {{{
406
406
  $(res).find(" > endpoints > *").each(function(k,v) {
407
407
  save['endpoints_list'][v.localName] = v.lastChild.nodeValue;
408
408
  $.ajax({
409
- url: rep + encodeURIComponent($(v).text()),
409
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()),
410
410
  success: function() {
411
411
  tmp[v.tagName] = {};
412
412
  var deferreds = [new $.Deferred(), new $.Deferred(), new $.Deferred()];
413
413
  $.ajax({
414
- url: rep + encodeURIComponent($(v).text()) + "/symbol.svg",
414
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/symbol.svg",
415
415
  success: function(res) {
416
416
  tmp[v.tagName]['symbol'] = res;
417
417
  deferreds[0].resolve(true);
@@ -419,7 +419,7 @@ function monitor_instance_values(val) {// {{{
419
419
  error: deferreds[0].resolve
420
420
  })
421
421
  $.ajax({
422
- url: rep + encodeURIComponent($(v).text()) + "/schema.rng",
422
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/schema.rng",
423
423
  success: function(res) {
424
424
  tmp[v.tagName]['schema'] = res;
425
425
  deferreds[1].resolve(true);
@@ -427,7 +427,7 @@ function monitor_instance_values(val) {// {{{
427
427
  error: deferreds[1].resolve
428
428
  })
429
429
  $.ajax({
430
- url: rep + encodeURIComponent($(v).text()) + "/properties.json",
430
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/properties.json",
431
431
  success: function(res) {
432
432
  tmp[v.tagName]['properties'] = res;
433
433
  deferreds[2].resolve(true);
@@ -731,7 +731,6 @@ function monitor_instance_state_change(notification) { //{{{
731
731
  }
732
732
 
733
733
  if (notification != "ready" && notification != "stopped" && notification != "running") {
734
- console.log('rrr');
735
734
  $('#parameters ui-content ui-area > button').attr('disabled','disabled');
736
735
  $('#state_any').hide();
737
736
  } else {
@@ -845,7 +844,36 @@ function get_testset(deferred) {// {{{
845
844
  ele.removeAttribute('xmlns');
846
845
  }
847
846
  });
848
- deferred.resolve(name,testset);
847
+ $.ajax({
848
+ type: "GET",
849
+ url: url + "/notifications/subscriptions/",
850
+ success: async function(res){
851
+ let values = $("subscriptions > subscription[url]",res);
852
+ let subs = $X('<subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0"/>');
853
+ let promises = [];
854
+ let scount = 0;
855
+ values.each(function(){
856
+ let sid = $(this).attr('id');
857
+ if (sid.match(/^_/)) {
858
+ scount += 1;
859
+ promises.push(
860
+ $.ajax({
861
+ type: "GET",
862
+ url: url + "/notifications/subscriptions/" + sid,
863
+ error: report_failure
864
+ }).then(function(a) {
865
+ subs.append($(a.documentElement));
866
+ })
867
+ );
868
+ };
869
+ });
870
+ await Promise.all(promises);
871
+ if (scount > 0) { testset.append(subs); }
872
+ deferred.resolve(name,testset);
873
+ },
874
+ error: function() { deferred.reject(); report_failure(); }
875
+ });
876
+
849
877
  },
850
878
  error: function() { deferred.reject(); report_failure(); }
851
879
  });
@@ -919,11 +947,10 @@ async function set_testset(testset,exec) {// {{{
919
947
  url: url + "/notifications/subscriptions/",
920
948
  error: report_failure
921
949
  }).then(async function(res) {
922
- var rcount = 0;
923
950
  var values = $("subscriptions > subscription[url]",res);
924
- var vals = [];
951
+ var vals = {};
925
952
  values.each(function(){
926
- vals.push($(this).attr('url'));
953
+ vals[$(this).attr('url')] = $(this).attr('id');
927
954
  });
928
955
  await load_testset_handlers(url,testset,vals);
929
956
  })
@@ -1083,24 +1110,67 @@ async function load_des(url,model) { //{{{
1083
1110
  error: report_failure
1084
1111
  });
1085
1112
  } //}}}
1113
+
1114
+ function load_testset_extract_handlers(inp,han,suburl) { //{{{
1115
+ inp.push("url="+encodeURIComponent(suburl).replace(/~/,'%7E'));
1116
+ $(">*",han).each(function(_,top){
1117
+ let events = [];
1118
+ let votes = [];
1119
+ $(">*",top).each(function(_,it){
1120
+ if (it.nodeName == 'event') {
1121
+ events.push($(it).text());
1122
+ }
1123
+ if (it.nodeName == 'vote') {
1124
+ votes.push($(it).text());
1125
+ }
1126
+ });
1127
+ if (events.length > 0) {
1128
+ inp.push("topic=" + $(top).attr('id'));
1129
+ inp.push("events=" + events.join(','));
1130
+ }
1131
+ if (votes.length > 0) {
1132
+ inp.push("topic=" + $(top).attr('id'));
1133
+ inp.push("votes=" + votes.join(','));
1134
+ }
1135
+ });
1136
+ return inp;
1137
+ } //}}}
1138
+
1086
1139
  async function load_testset_handlers(url,testset,vals) {// {{{
1087
1140
  var promises = [];
1088
- $("testset > handlers > *",testset).each(async function(){
1089
- var han = this;
1090
- var suburl = $(han).attr('url');
1091
- if ($.inArray(suburl,vals) == -1) {
1092
- var inp = "url="+encodeURIComponent(suburl).replace(/~/,'%7E');
1093
- $("*",han).each(function(){
1094
- inp += "&topic=" + $(this).attr('topic');
1095
- inp += "&" + this.nodeName + "=" + $(this).text();
1096
- });
1097
- promises.push(
1141
+ $("testset > subscriptions > *",testset).each(async function(){
1142
+ let han = this;
1143
+ let sid = $(han).attr('id');
1144
+ let suburl = $(han).attr('url');
1145
+ if (typeof(vals[suburl]) == 'undefined') {
1146
+ if ($("*",han).length > 0) {
1147
+ let inp = [];
1148
+ if (sid) { inp.push("id="+encodeURIComponent(sid)); }
1149
+ inp = load_testset_extract_handlers(inp,han,suburl);
1150
+ promises.push(
1151
+ $.ajax({
1152
+ type: "POST",
1153
+ url: url + "/notifications/subscriptions/",
1154
+ data: inp.join('&')
1155
+ })
1156
+ )
1157
+ }
1158
+ } else {
1159
+ if ($("*",han).length == 0) {
1098
1160
  $.ajax({
1099
- type: "POST",
1100
- url: url + "/notifications/subscriptions/",
1101
- data: inp
1161
+ type: "DELETE",
1162
+ url: url + "/notifications/subscriptions/" + vals[suburl],
1102
1163
  })
1103
- )
1164
+ } else {
1165
+ let inp = load_testset_extract_handlers([],han,suburl);
1166
+ promises.push(
1167
+ $.ajax({
1168
+ type: "PUT",
1169
+ url: url + "/notifications/subscriptions/" + vals[suburl],
1170
+ data: inp.join('&')
1171
+ })
1172
+ )
1173
+ }
1104
1174
  }
1105
1175
  });
1106
1176
  return Promise.all(promises);
data/cockpit/themes/compact/rngs/call.rng CHANGED
@@ -25,19 +25,28 @@
25
25
  </element>
26
26
  </zeroOrMore>
27
27
  </element>
28
- <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
28
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
29
29
 
30
- <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
31
- <zeroOrMore rngui:label="Add Sensor">
32
- <element name="sensor">
30
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
31
+ <zeroOrMore rngui:label="Add Probe">
32
+ <element name="probe">
33
33
  <element name="name" rngui:label="Label">
34
34
  <data type="string" rngui:label="Label"/>
35
35
  </element>
36
- <element name="extractor_url" rngui:label="Extractor Url">
36
+ <element name="extractor_type" rngui:label="Extractor Type">
37
+ <choice>
38
+ <value id='code'>Code</value>
39
+ <value id='service'>Service</value>
40
+ </choice>
41
+ </element>
42
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
43
+ <text rngui:label="Code"/>
44
+ </element>
45
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
37
46
  <data type="string" rngui:label="Service Url"/>
38
47
  </element>
39
- <element name="extractor_params" rngui:label="Extractor Arguments:">
40
- <zeroOrMore rngui:label="Create Extractor Argument Pairs">
48
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
49
+ <zeroOrMore rngui:label="Create Argument Pairs">
41
50
  <element rngui:label="Name">
42
51
  <anyName/>
43
52
  <data type="string" rngui:label="Value / Json"/>
@@ -48,7 +57,7 @@
48
57
  <data type="string" rngui:label="Service Url"/>
49
58
  </element>
50
59
  <element name="visualizer_params" rngui:label="Visualizer Arguments">
51
- <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
60
+ <zeroOrMore rngui:label="Create Argument Pairs">
52
61
  <element rngui:label="Name">
53
62
  <anyName/>
54
63
  <data type="string" rngui:label="Value / Json"/>
data/cockpit/themes/compact/rngs/callmanipulate.rng CHANGED
@@ -25,19 +25,28 @@
25
25
  </element>
26
26
  </zeroOrMore>
27
27
  </element>
28
- <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
28
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
29
29
 
30
- <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
31
- <zeroOrMore rngui:label="Add Sensor">
32
- <element name="sensor">
30
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
31
+ <zeroOrMore rngui:label="Add Probe">
32
+ <element name="probe">
33
33
  <element name="name" rngui:label="Label">
34
34
  <data type="string" rngui:label="Label"/>
35
35
  </element>
36
- <element name="extractor_url" rngui:label="Extractor Url">
36
+ <element name="extractor_type" rngui:label="Extractor Type">
37
+ <choice>
38
+ <value id='code'>Code</value>
39
+ <value id='service'>Service</value>
40
+ </choice>
41
+ </element>
42
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
43
+ <text rngui:label="Code"/>
44
+ </element>
45
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
37
46
  <data type="string" rngui:label="Service Url"/>
38
47
  </element>
39
- <element name="extractor_params" rngui:label="Extractor Arguments:">
40
- <zeroOrMore rngui:label="Create Extractor Argument Pairs">
48
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
49
+ <zeroOrMore rngui:label="Create Argument Pairs">
41
50
  <element rngui:label="Name">
42
51
  <anyName/>
43
52
  <data type="string" rngui:label="Value / Json"/>
@@ -47,8 +56,8 @@
47
56
  <element name="visualizer_url" rngui:label="Visualizer Url">
48
57
  <data type="string" rngui:label="Service Url"/>
49
58
  </element>
50
- <element name="visualizer_params" rngui:header="Visualizer Arguments">
51
- <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
59
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
60
+ <zeroOrMore rngui:label="Create Argument Pairs">
52
61
  <element rngui:label="Name">
53
62
  <anyName/>
54
63
  <data type="string" rngui:label="Value / Json"/>
data/cockpit/themes/compact/rngs/start.rng CHANGED
@@ -1,7 +1,7 @@
1
1
  <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
2
- <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data elements (internal context) in the process can be used as input for context data probes. All probes can be the basis for impact factors. Please go to individual tasks to define deal with data that is ">
2
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All changes to data elements in the process as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to individual tasks to define more restricted data probes.">
3
3
 
4
- <element name="probes" rngui:header="Context Data Extraction" rngui:fold="closed">
4
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
5
5
  <zeroOrMore rngui:label="Add Probe">
6
6
  <element name="probe">
7
7
  <element name="name" rngui:label="Label">
@@ -9,18 +9,18 @@
9
9
  </element>
10
10
  <element name="extractor_type" rngui:label="Extractor Type">
11
11
  <choice>
12
- <value id='code'>Extractor Code</value>
13
- <value id='service'>Extractor Service</value>
12
+ <value id='code'>Code</value>
13
+ <value id='service'>Service</value>
14
14
  </choice>
15
15
  </element>
16
- <element name="extractor_code" rngui:label="Extractor Code">
17
- <text rngui:label="Service Url"/>
16
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic data'>
17
+ <text rngui:label="Code"/>
18
18
  </element>
19
- <element name="extractor_url" rngui:label="Extractor Service">
19
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For intrinsic &amp; discrete data'>
20
20
  <data type="string" rngui:label="Service Url"/>
21
21
  </element>
22
22
  <element name="extractor_params" rngui:label="Extractor Service Arguments:">
23
- <zeroOrMore rngui:label="Create Extractor Argument Pairs">
23
+ <zeroOrMore rngui:label="Create Argument Pairs">
24
24
  <element rngui:label="Name">
25
25
  <anyName/>
26
26
  <data type="string" rngui:label="Value / Json"/>
@@ -31,7 +31,7 @@
31
31
  <data type="string" rngui:label="Service Url"/>
32
32
  </element>
33
33
  <element name="visualizer_params" rngui:label="Visualizer Arguments">
34
- <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
34
+ <zeroOrMore rngui:label="Create Argument Pairs">
35
35
  <element rngui:label="Name">
36
36
  <anyName/>
37
37
  <data type="string" rngui:label="Value / Json"/>
data/cockpit/themes/compact/theme.js CHANGED
@@ -1154,7 +1154,7 @@ function WFAdaptorManifestation(adaptor) {
1154
1154
  },
1155
1155
  'svg': self.adaptor.theme_dir + 'symbols/start.svg'
1156
1156
  },//}}}
1157
- 'description': null,
1157
+ 'description': self.adaptor.theme_dir + 'rngs/start.rng',
1158
1158
  'permissible_children': function(node,mode) { //{{{
1159
1159
  var func = null;
1160
1160
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
data/cockpit/themes/control/rngs/call.rng CHANGED
@@ -25,19 +25,28 @@
25
25
  </element>
26
26
  </zeroOrMore>
27
27
  </element>
28
- <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
28
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
29
29
 
30
- <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
31
- <zeroOrMore rngui:label="Add Sensor">
32
- <element name="sensor">
30
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
31
+ <zeroOrMore rngui:label="Add Probe">
32
+ <element name="probe">
33
33
  <element name="name" rngui:label="Label">
34
34
  <data type="string" rngui:label="Label"/>
35
35
  </element>
36
- <element name="extractor_url" rngui:label="Extractor Url">
36
+ <element name="extractor_type" rngui:label="Extractor Type">
37
+ <choice>
38
+ <value id='code'>Code</value>
39
+ <value id='service'>Service</value>
40
+ </choice>
41
+ </element>
42
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
43
+ <text rngui:label="Code"/>
44
+ </element>
45
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
37
46
  <data type="string" rngui:label="Service Url"/>
38
47
  </element>
39
- <element name="extractor_params" rngui:label="Extractor Arguments:">
40
- <zeroOrMore rngui:label="Create Extractor Argument Pairs">
48
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
49
+ <zeroOrMore rngui:label="Create Argument Pairs">
41
50
  <element rngui:label="Name">
42
51
  <anyName/>
43
52
  <data type="string" rngui:label="Value / Json"/>
@@ -48,7 +57,7 @@
48
57
  <data type="string" rngui:label="Service Url"/>
49
58
  </element>
50
59
  <element name="visualizer_params" rngui:label="Visualizer Arguments">
51
- <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
60
+ <zeroOrMore rngui:label="Create Argument Pairs">
52
61
  <element rngui:label="Name">
53
62
  <anyName/>
54
63
  <data type="string" rngui:label="Value / Json"/>
data/cockpit/themes/control/rngs/callmanipulate.rng CHANGED
@@ -25,19 +25,28 @@
25
25
  </element>
26
26
  </zeroOrMore>
27
27
  </element>
28
- <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
28
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
29
29
 
30
- <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
31
- <zeroOrMore rngui:label="Add Sensor">
32
- <element name="sensor">
30
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
31
+ <zeroOrMore rngui:label="Add Probe">
32
+ <element name="probe">
33
33
  <element name="name" rngui:label="Label">
34
34
  <data type="string" rngui:label="Label"/>
35
35
  </element>
36
- <element name="extractor_url" rngui:label="Extractor Url">
36
+ <element name="extractor_type" rngui:label="Extractor Type">
37
+ <choice>
38
+ <value id='code'>Code</value>
39
+ <value id='service'>Service</value>
40
+ </choice>
41
+ </element>
42
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
43
+ <text rngui:label="Code"/>
44
+ </element>
45
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
37
46
  <data type="string" rngui:label="Service Url"/>
38
47
  </element>
39
- <element name="extractor_params" rngui:label="Extractor Arguments:">
40
- <zeroOrMore rngui:label="Create Extractor Argument Pairs">
48
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
49
+ <zeroOrMore rngui:label="Create Argument Pairs">
41
50
  <element rngui:label="Name">
42
51
  <anyName/>
43
52
  <data type="string" rngui:label="Value / Json"/>
@@ -47,8 +56,8 @@
47
56
  <element name="visualizer_url" rngui:label="Visualizer Url">
48
57
  <data type="string" rngui:label="Service Url"/>
49
58
  </element>
50
- <element name="visualizer_params" rngui:header="Visualizer Arguments">
51
- <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
59
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
60
+ <zeroOrMore rngui:label="Create Argument Pairs">
52
61
  <element rngui:label="Name">
53
62
  <anyName/>
54
63
  <data type="string" rngui:label="Value / Json"/>
data/cockpit/themes/control/rngs/start.rng CHANGED
@@ -1,7 +1,7 @@
1
1
  <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
2
- <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data elements (internal context) in the process can be used as input for context data probes. All probes can be the basis for impact factors. Please go to individual tasks to define deal with data that is ">
2
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All changes to data elements in the process as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to individual tasks to define more restricted data probes.">
3
3
 
4
- <element name="probes" rngui:header="Context Data Extraction" rngui:fold="closed">
4
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
5
5
  <zeroOrMore rngui:label="Add Probe">
6
6
  <element name="probe">
7
7
  <element name="name" rngui:label="Label">
@@ -9,18 +9,18 @@
9
9
  </element>
10
10
  <element name="extractor_type" rngui:label="Extractor Type">
11
11
  <choice>
12
- <value id='code'>Extractor Code</value>
13
- <value id='service'>Extractor Service</value>
12
+ <value id='code'>Code</value>
13
+ <value id='service'>Service</value>
14
14
  </choice>
15
15
  </element>
16
- <element name="extractor_code" rngui:label="Extractor Code">
17
- <text rngui:label="Service Url"/>
16
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic data'>
17
+ <text rngui:label="Code"/>
18
18
  </element>
19
- <element name="extractor_url" rngui:label="Extractor Service">
19
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For intrinsic &amp; discrete data'>
20
20
  <data type="string" rngui:label="Service Url"/>
21
21
  </element>
22
22
  <element name="extractor_params" rngui:label="Extractor Service Arguments:">
23
- <zeroOrMore rngui:label="Create Extractor Argument Pairs">
23
+ <zeroOrMore rngui:label="Create Argument Pairs">
24
24
  <element rngui:label="Name">
25
25
  <anyName/>
26
26
  <data type="string" rngui:label="Value / Json"/>
@@ -31,7 +31,7 @@
31
31
  <data type="string" rngui:label="Service Url"/>
32
32
  </element>
33
33
  <element name="visualizer_params" rngui:label="Visualizer Arguments">
34
- <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
34
+ <zeroOrMore rngui:label="Create Argument Pairs">
35
35
  <element rngui:label="Name">
36
36
  <anyName/>
37
37
  <data type="string" rngui:label="Value / Json"/>