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

diff --git a/server/xml/macros/akselaengde-1.0.xml b/server/xml/macros/akselaengde-1.0.xml
index 3492fbc..af42444 100644
--- a/server/xml/macros/akselaengde-1.0.xml
+++ b/server/xml/macros/akselaengde-1.0.xml
@@ -2,19 +2,19 @@
 <macro name="akselaengde" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('akselaengde.odxt.missing') == '' or getValue('akselaengde.osin.missing') == '' )
+    if ( getValue('akselaengde.mangler.odxt') == '' or getValue('akselaengde.mangler.osin') == '' )
     then
       out = out .. 'Akselængde: ' .. getValue('akselaengde.method') .. '\n'
     end
 
-    if ( getValue('akselaengde.odxt.missing') == '' )
+    if ( getValue('akselaengde.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('akselaengde.odxt.length') .. ' mm\n'
+      out = out .. 'o.dxt: ' .. getValue('akselaengde.laengde.odxt') .. ' mm\n'
     end
 
-    if ( getValue('akselaengde.osin.missing') == '' )
+    if ( getValue('akselaengde.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('akselaengde.osin.length') .. ' mm\n'
+      out = out .. 'o.sin: ' .. getValue('akselaengde.laengde.osin') .. ' mm\n'
     end
 
     return out
@@ -22,42 +22,42 @@
   <queries>
   </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
@@ -105,14 +105,14 @@
       <!-- o.dxt -->
       <frame layout="vbox">
         <checkbox caption="Der er ikke målt på o.dxt"
-		  name="akselaengde.odxt.missing" script="right_eye"
-		  map="missing_eye_right_map"
+		  name="akselaengde.mangler.odxt" script="right_eye"
+		  map="missing_eye_odxt_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  <frame layout="vbox">
 	    <label caption="Akselængde:"/>
 	    <frame layout="hbox">
-	      <lineedit name="akselaengde.odxt.length" script="lt40gt10"
+	      <lineedit name="akselaengde.laengde.odxt" script="lt40gt10"
 			regexp="\d{1,2},\d{2}" value=""/>
 	      <label caption="mm"/>
 	    </frame>
@@ -123,14 +123,14 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="akselaengde.osin.missing" script="left_eye"
-		  map="missing_eye_left_map"
+		  name="akselaengde.mangler.osin" script="left_eye"
+		  map="missing_eye_osin_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  <frame layout="vbox">
 	    <label caption="Akselængde:"/>
 	    <frame layout="hbox">
-	      <lineedit name="akselaengde.osin.length" script="lt40gt10"
+	      <lineedit name="akselaengde.laengde.osin" script="lt40gt10"
 			regexp="\d{1,2},\d{2}" value=""/>
 	      <label caption="mm"/>
 	    </frame>