cpee 2.1.52 → 2.1.54

data/cockpit/js/wfadaptor.js

@@ -228,24 +228,6 @@ function WfIllustrator(wf_adaptor) { // View  {{{
     return g;
   } // }}}
 
-  var draw_label = this.draw.draw_label = function (tname, id, label, row, col, group) { // {{{
-    var g = $X('<text class="label" transform="translate(' + String(col*self.width-self.width_shift) + ',' + String(row*self.height+20-(self.height-self.height_shift)) + ')" xmlns="http://www.w3.org/2000/svg"></text>');
-    var spli = $(label.split(/\n/));
-    spli.each(function(k,v) {
-      var tspan = $X('<tspan x="0" dy="' + (spli.length > 1 ? '-7' : '0') + '" xmlns="http://www.w3.org/2000/svg"></tspan>');
-      if (k == 0) {
-        tspan.text(v);
-      } else {
-        tspan.text(v);
-        tspan.attr('dy','15');
-        tspan.attr('dx','15');
-      }
-      g.append(tspan);
-    });
-    if(group) { group.find('g.element[element-id=' + id + ']').append(g); }
-    else {self.svg.container.append(g);}
-    return g;
-  } // }}}
   var draw_symbol = this.draw.draw_symbol = function (sname, id, title, row, col, group, addition) { // {{{
     if(self.elements[sname] == undefined || self.elements[sname].svg == undefined) sname = 'unknown';
     if (addition) {
@@ -380,15 +362,6 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     } else {
       adaptor.draw_labels(graph.max,[],{ 'height': illustrator.height, 'height_shift': illustrator.height_shift },false);
     }
-    if (illustrator.compact == false) {
-      if (labels.length > 0) {
-        _.each(labels,function(a,key) {
-          if (a.label && a.label[0] && a.label[0].column == 'Label' && a.label[0].value) {
-            illustrator.draw.draw_label(a.tname, a.element_id, a.label[0].value, a.row, graph.max.col + 1, graph.svg);
-          }
-        });
-      }
-    }
   } //}}}
 
   // Generic Functions {{{

data/cockpit/model.html

@@ -58,6 +58,8 @@
     <script type="text/javascript" src="js/edit.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="css/model.css" type="text/css"/>
+    <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
+    <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
     <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
     <style>
       /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */

data/cockpit/templates/Coopis 2010.xml

@@ -12,10 +12,14 @@
   </dataelements>
   <endpoints>
     <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <user>https-post://cpee.org/services/timeout-user.php</user>
+    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
     <timeout>https://cpee.org/services/timeout.php</timeout>
     <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
     <subprocess>https://cpee.org/flow/start/url/</subprocess>
     <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+    <send>https-post://cpee.org/ing/correlators/message/send/</send>
+    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
   </endpoints>
   <attributes>
     <theme>extended</theme>
@@ -25,10 +29,13 @@
     <modeltype>CPEE</modeltype>
     <design_stage>development</design_stage>
     <guarded>none</guarded>
-    <design_dir>Templates.dir</design_dir>
+    <design_dir>Experiments.dir/Twin Engine.dir</design_dir>
     <guarded_id/>
     <model_uuid>a1cbb855-90e3-4d8c-b44b-d3ba7bff9f4e</model_uuid>
     <model_version/>
+    <replay>https://cpee.org/replay/</replay>
+    <replay_target>https://cpee.org/replay-data/coopis/1274c1de-286e-4d73-9375-30b363d280fa.xes.yaml</replay_target>
+    <replay_instantiate>https://cpee.org/flow/start/url/</replay_instantiate>
   </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">

data/cockpit/templates/Worklist.xml

@@ -3,13 +3,7 @@
   <executionhandler>ruby</executionhandler>
   <dataelements/>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
     <worklist>https-post://cpee.org/worklist/server/</worklist>
-    <send>https-post://cpee.org/ing/correlators/message/send/</send>
-    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
-    <user>https-post://cpee.org/services/timeout-user.php</user>
-    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
   </endpoints>
   <attributes>
     <info>Worklist</info>
@@ -28,9 +22,10 @@
           <label>OK OR NOT OK</label>
           <arguments>
             <orgmodel>https://cpee.org/~demo/orgviz/organisation_informatik.xml</orgmodel>
-            <domain>VirtualBusiness1</domain>
             <form>https://cpee.org/~demo/form/form-f.html</form>
             <role>Assistant</role>
+            <priority>42</priority>
+            <restrictions/>
             <data>
               <schaden>10000</schaden>
               <text>destroyed</text>
@@ -44,11 +39,15 @@
           <rescue output="result"/>
         </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
           <_context_data_analysis>
             <probes/>
             <ips/>

data/cockpit/themes/compact/rngs/call.rng

@@ -98,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/compact/rngs/callmanipulate.rng

@@ -122,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/compact/rngs/parallel.rng

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/compact/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/compact/theme.js

@@ -64,7 +64,6 @@ function WFAdaptorManifestation(adaptor) {
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-        tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
       var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
@@ -75,13 +74,16 @@ function WFAdaptorManifestation(adaptor) {
       if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
-      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       var nn = $X($(node).serializeXML());
           nn.removeAttr('svg-id');
           nn.removeAttr('svg-type');
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
+
+      tab.empty();
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(nn);
+
       format_visual_forms();
     }
   }; //}}}
@@ -201,8 +203,17 @@ function WFAdaptorManifestation(adaptor) {
             $(nodes).each(function(key,str) {
               nodes[key] = $X(str);
             });
+            let svgids = [];
             $(nodes).each(function(key,node){
-              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              svgids.push($(node).attr('svg-id'));
+            });
+            svgids.sort((a,b) => {
+              if (a > b) { return -1; }
+              else if (a < b) { return 1; }
+              else { return 0; }
+            });
+            svgids.forEach(svgid => {
+              var target = self.adaptor.description.get_node_by_svg_id(svgid);
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
               localStorage.removeItem('marked');
@@ -1223,28 +1234,33 @@ function WFAdaptorManifestation(adaptor) {
         return 'vertical';
       },
       'resolve_symbol': function(node) {
+        let alist = []
         let plist = []
-        let dirty = false
-        $('*:not(:has(*))',node).each(function(i,n) {
-          let lines = n.textContent.split(/(\r\n)|\n|;/)
-          for (const l of lines) {
-            if (l != null) {
-              let m0 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*=/)
-              if (m0 != null) {
-                plist.push(m0[1])
-              }
-              let m1 = l.match(/=[^=].*data\.([a-z0-9A-Z_]+)/)
-              let m2 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*$/)
-              if (m1 != null && !plist.includes(m1[1])) {
-                dirty = true
-              }
-              if (m2 != null && !plist.includes(m2[1])) {
-                dirty = true
-              }
-            }
+
+        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        $ ('call > parameters > arguments > *, call > code > *, loop[condition], alternative[condition]',node).each(function(i,n) {
+          let item;
+          if (n.hasAttribute('condition')) {
+            item = n.getAttribute('condition');
+          } else {
+            item = n.textContent;
+          }
+          if (n.parentNode.nodeName == 'arguments' && item.charAt(0) != '!' ) { return }
+
+          let indices = [];
+
+          for (const match of item.matchAll(regassi)) {
+            indices.push(match.index);
+            alist.push(match[1]);
+          }
+          for (const match of item.matchAll(reg_not_assi)) {
+            const arg1 = match[1];
+            if (indices.includes(match.index)) { continue; }
+            if (!alist.includes(arg1)) { plist.push(arg1); }
           }
         })
-        if (dirty) { return 'start_event'; }
+        if (plist.length > 0) { return 'start_event'; }
       },
       'closing_symbol': 'end',
       'col_shift': function(node) {

data/cockpit/themes/control/rngs/call.rng

@@ -98,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/control/rngs/callmanipulate.rng

@@ -122,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/control/rngs/parallel.rng

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/control/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/control/theme.js

@@ -64,7 +64,6 @@ function WFAdaptorManifestation(adaptor) {
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-        tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
       var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
@@ -75,13 +74,16 @@ function WFAdaptorManifestation(adaptor) {
       if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
-      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       var nn = $X($(node).serializeXML());
           nn.removeAttr('svg-id');
           nn.removeAttr('svg-type');
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
+
+      tab.empty();
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(nn);
+
       format_visual_forms();
     }
   }; //}}}
@@ -201,8 +203,17 @@ function WFAdaptorManifestation(adaptor) {
             $(nodes).each(function(key,str) {
               nodes[key] = $X(str);
             });
+            let svgids = [];
             $(nodes).each(function(key,node){
-              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              svgids.push($(node).attr('svg-id'));
+            });
+            svgids.sort((a,b) => {
+              if (a > b) { return -1; }
+              else if (a < b) { return 1; }
+              else { return 0; }
+            });
+            svgids.forEach(svgid => {
+              var target = self.adaptor.description.get_node_by_svg_id(svgid);
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
               localStorage.removeItem('marked');
@@ -375,10 +386,18 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('> code', node).length > 0) {
-          return 'callmanipulate';
+        if ($('> annotations > _context_data_analysis > probes > probe', node).length > 0) {
+          if ($('> code', node).length > 0) {
+            return 'callmanipulate_sensor';
+          } else {
+            return 'call_sensor';
+          }
         } else {
-          return 'call';
+          if ($('> code', node).length > 0) {
+            return 'callmanipulate';
+          } else {
+            return 'call';
+          }
         }
       },
       'svg': self.adaptor.theme_dir + 'symbols/call.svg'
@@ -972,7 +991,7 @@ function WFAdaptorManifestation(adaptor) {
           ret.push({ column: 'Average', value: avg + '%' });
         }
         return ret;
-      },
+      ,
       'svg': self.adaptor.theme_dir + 'symbols/closed_loop.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/closed_loop.rng',
@@ -1576,13 +1595,42 @@ function WFAdaptorManifestation(adaptor) {
       'expansion': function(node) {
         return 'vertical';
       },
+      'resolve_symbol': function(node) {
+        let alist = []
+        let plist = []
+
+        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        $ ('call > parameters > arguments > *, call > code > *, loop[condition], alternative[condition]',node).each(function(i,n) {
+          let item;
+          if (n.hasAttribute('condition')) {
+            item = n.getAttribute('condition');
+          } else {
+            item = n.textContent;
+          }
+          if (n.parentNode.nodeName == 'arguments' && item.charAt(0) != '!' ) { return }
+
+          let indices = [];
+
+          for (const match of item.matchAll(regassi)) {
+            indices.push(match.index);
+            alist.push(match[1]);
+          }
+          for (const match of item.matchAll(reg_not_assi)) {
+            const arg1 = match[1];
+            if (indices.includes(match.index)) { continue; }
+            if (!alist.includes(arg1)) { plist.push(arg1); }
+          }
+        })
+        if (plist.length > 0) { return 'start_event'; }
+      },
       'closing_symbol': 'end',
       'col_shift': function(node) {
         return true;
       },
       'svg': self.adaptor.theme_dir + 'symbols/start.svg'
     },//}}}
-    'description': null,
+    'description': self.adaptor.theme_dir + 'rngs/start.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
@@ -1654,13 +1702,31 @@ function WFAdaptorManifestation(adaptor) {
   // Abstract Elements
   // * they may only have an illustrator (or other parts)
   // * they HAVE TO have a parent
+  this.elements.start_event = { /*{{{*/
+    'parent': 'start',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/start_event.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.call_sensor = { /*{{{*/
+    'parent': 'call',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/call_sensor.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.callmanipulate = { /*{{{*/
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
-      'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
-    },//}}}
+    }//}}}
+  }; /*}}}*/
+  this.elements.callmanipulate_sensor = { /*{{{*/
+    'parent': 'call',
+    'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_sensor.svg'
+    }//}}}
   }; /*}}}*/
   this.elements.loop_head = { /*{{{*/
     'parent': 'loop',

data/cockpit/themes/dataflow/rngs/call.rng

@@ -98,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/dataflow/rngs/callmanipulate.rng

@@ -122,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/dataflow/rngs/parallel.rng

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/dataflow/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>