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, 27 insertions, 27 deletions

diff --git a/server/xml/macros/oct_maaling-1.0.xml b/server/xml/macros/oct_maaling-1.0.xml
index 1339787..06871cd 100644
--- a/server/xml/macros/oct_maaling-1.0.xml
+++ b/server/xml/macros/oct_maaling-1.0.xml
@@ -14,18 +14,18 @@
 <macro name="oct_maaling" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('oct.odxt.missing') == '' or getValue('oct.osin.missing') == '' )
+    if ( getValue('oct.mangler.odxt') == '' or getValue('oct.mangler.osin') == '' )
     then
       out = out .. 'Central nethindetykkelse:\n'
 
-      if ( getValue('oct.odxt.missing') == '' )
+      if ( getValue('oct.mangler.odxt') == '' )
       then
-        out = out .. 'OCT o.dxt ' .. getValue('oct.odxt.thickness') .. ' µm\n'
+        out = out .. 'OCT o.dxt ' .. getValue('oct.thickness.odxt') .. ' µm\n'
       end
 
-      if ( getValue('oct.osin.missing') == '' )
+      if ( getValue('oct.mangler.osin') == '' )
       then
-        out = out .. 'OCT o.sin ' .. getValue('oct.osin.thickness') .. ' µm\n'
+        out = out .. 'OCT o.sin ' .. getValue('oct.thickness.osin') .. ' µm\n'
       end
 
     end
@@ -33,46 +33,46 @@
     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
@@ -115,12 +115,12 @@
       <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.dxt"
-		  name="oct.odxt.missing" script="right_eye"
-		  map="missing_eye_right_map"
+		  name="oct.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="Tykkelse:"/>
-	  <lineedit name="oct.odxt.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	  <lineedit name="oct.thickness.odxt" regexp="\d{1,5}" script="lt10000gt0" value=""/>
 	  <label caption="µm"/>
 	</frame>
       </frame>
@@ -128,12 +128,12 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="oct.osin.missing" script="left_eye"
-		  map="missing_eye_left_map"
+		  name="oct.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="Tykkelse:"/>
-	  <lineedit name="oct.osin.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	  <lineedit name="oct.thickness.osin" regexp="\d{1,5}" script="lt10000gt0" value=""/>
 	  <label caption="µm"/>
 	</frame>