moved all .osin. instances from any instance containing it to the end of the instance. I have checked to find errors but NOT very thoroughly. The XML files might contain errors, but i will correct these, if any, when i encounter them later on

1 files changed, 29 insertions, 29 deletions

diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml
index 61902a8..7cf9d0e 100644
--- a/server/xml/macros/tonometri-1.0.xml
+++ b/server/xml/macros/tonometri-1.0.xml
@@ -2,64 +2,64 @@
 <macro name="tonometri" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('tonometri.odxt.missing') == '' or getValue('tonometri.osin.missing') == '' )
+    if ( getValue('tonometri.mangler.odxt') == '' or getValue('tonometri.mangler.osin') == '' )
     then
       out = out .. getValue('tonometri.method') .. ':\n'
     end
 
-    if ( getValue('tonometri.odxt.missing') == '' )
+    if ( getValue('tonometri.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('tonometri.odxt.pressure') .. ' mmHg\n'
+      out = out .. 'o.dxt: ' .. getValue('tonometri.pressure.odxt') .. ' mmHg\n'
     end
 
-    if ( getValue('tonometri.osin.missing') == '' )
+    if ( getValue('tonometri.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('tonometri.osin.pressure') .. ' mmHg\n'
+      out = out .. 'o.sin: ' .. getValue('tonometri.pressure.osin') .. ' mmHg\n'
     end
 
     return out
   </resume>
   <queries>
-    <query service="pracro" class="missing_eye_right" ttl="1000000"/>
-    <query service="pracro" class="missing_eye_left" ttl="1000000"/>
+    <query service="pracro" class="missing_eye_odxt" ttl="1000000"/>
+    <query service="pracro" class="missing_eye_osin" ttl="1000000"/>
   </queries>
   <maps>
-    <map name="missing_eye_right_map">
+    <map name="missing_eye_odxt_map">
       value = 0
       timestamp = 0
       source = ''
 
-      if( missing_eye_right )
+      if( missing_eye_odxt )
       then
-        if( missing_eye_right.value and missing_eye_right.value == '' )
+        if( missing_eye_odxt.value and missing_eye_odxt.value == '' )
         then
           value = ''
-          timestamp = missing_eye_right.timestamp
-          source = missing_eye_right.source
+          timestamp = missing_eye_odxt.timestamp
+          source = missing_eye_odxt.source
         else
           value = 'mangler'
-          timestamp = missing_eye_right.timestamp
-          source = missing_eye_right.source
+          timestamp = missing_eye_odxt.timestamp
+          source = missing_eye_odxt.source
         end
       end
       return value, timestamp, source
     </map>
-    <map name="missing_eye_left_map">
+    <map name="missing_eye_osin_map">
       value = 0
       timestamp = 0
       source = ''
       
-      if( missing_eye_left )
+      if( missing_eye_osin )
       then
-        if( missing_eye_left.value and missing_eye_left.value == '' )
+        if( missing_eye_osin.value and missing_eye_osin.value == '' )
         then
           value = ''
-          timestamp = missing_eye_left.timestamp
-          source = missing_eye_left.source
+          timestamp = missing_eye_osin.timestamp
+          source = missing_eye_osin.source
         else
           value = 'mangler'
-          timestamp = missing_eye_left.timestamp
-          source = missing_eye_left.source
+          timestamp = missing_eye_osin.timestamp
+          source = missing_eye_osin.source
         end
       end
       return value, timestamp, source
@@ -88,7 +88,7 @@
         enable('right_eye_frame')
       end
 
-      if( getValue('tonometri.odxt.missing') == 'mangler' and getValue('tonometri.osin.missing') == 'mangler' )
+      if( getValue('tonometri.mangler.odxt') == 'mangler' and getValue('tonometri.mangler.osin') == 'mangler' )
       then
         disable('device_frame')
       else
@@ -105,7 +105,7 @@
         enable('left_eye_frame')
       end
 
-      if( getValue('tonometri.odxt.missing') == 'mangler' and getValue('tonometri.osin.missing') == 'mangler' )
+      if( getValue('tonometri.mangler.odxt') == 'mangler' and getValue('tonometri.mangler.osin') == 'mangler' )
       then
         disable('device_frame')
       else
@@ -123,13 +123,13 @@
       <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.dxt"
-		  name="tonometri.odxt.missing" script="right_eye"
-		  map="missing_eye_right_map"
+		  name="tonometri.mangler.odxt" script="right_eye"
+		  map="missing_eye_odxt_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometri.odxt.pressure" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometri.pressure.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -138,13 +138,13 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="tonometri.osin.missing" script="left_eye"
-		  map="missing_eye_left_map"
+		  name="tonometri.mangler.osin" script="left_eye"
+		  map="missing_eye_osin_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometri.osin.pressure" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometri.pressure.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>