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

diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index 5653b88..697ed47 100644
--- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml
+++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
@@ -2,31 +2,31 @@
 <macro name="cycloplegisk_refraktion" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('cycloplegisk_refraktion.odxt.missing') == '' )
+    if ( getValue('cycloplegisk_refraktion.mangler.odxt') == '' )
     then
-      out = out .. 'Cycloplegisk refraktion, o.dxt: ' .. getValue('cycloplegisk_refraktion.odxt.sf') .. ' sf'
-      if ( getValue('cycloplegisk_refraktion.odxt.cyl') ~= '' )
+      out = out .. 'Cycloplegisk refraktion, o.dxt: ' .. getValue('cycloplegisk_refraktion.sf.odxt') .. ' sf'
+      if ( getValue('cycloplegisk_refraktion.cyl.odxt') ~= '' )
       then
-        out = out .. ', ' .. getValue('cycloplegisk_refraktion.odxt.cyl') .. ' cyl'
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.cyl.odxt') .. ' cyl'
       end
-      if ( getValue('cycloplegisk_refraktion.odxt.grader') ~= '' )
+      if ( getValue('cycloplegisk_refraktion.grader.odxt') ~= '' )
       then
-        out = out .. ', ' .. getValue('cycloplegisk_refraktion.odxt.grader') .. ' grader\n'
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.grader.odxt') .. ' grader\n'
       else
         out = out .. '\n'
       end
     end
 
-    if ( getValue('cycloplegisk_refraktion.osin.missing') == '' )
+    if ( getValue('cycloplegisk_refraktion.mangler.osin') == '' )
     then
-      out = out .. 'Cycloplegisk refraktion, o.sin: ' .. getValue('cycloplegisk_refraktion.osin.sf') .. ' sf'
-      if ( getValue('cycloplegisk_refraktion.osin.cyl') ~= '' )
+      out = out .. 'Cycloplegisk refraktion, o.sin: ' .. getValue('cycloplegisk_refraktion.sf.osin') .. ' sf'
+      if ( getValue('cycloplegisk_refraktion.cyl.osin') ~= '' )
       then
-        out = out .. ', ' .. getValue('cycloplegisk_refraktion.osin.cyl') .. ' cyl'
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.cyl.osin') .. ' cyl'
       end
-      if ( getValue('cycloplegisk_refraktion.osin.grader') ~= '' )
+      if ( getValue('cycloplegisk_refraktion.grader.osin') ~= '' )
       then
-        out = out .. ', ' .. getValue('cycloplegisk_refraktion.osin.grader') .. ' grader\n'
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.grader.osin') .. ' grader\n'
       else
         out = out .. '\n'
       end
@@ -36,42 +36,42 @@
   </resume>
   <queries>
     <query class="cycloplegisk_refraktion" ttl="100000"/>
-    <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 = 'pracro'
 
-      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
+          timestamp = missing_eye_odxt.timestamp
         else
           value = 'mangler'
-          timestamp = missing_eye_right.timestamp
+          timestamp = missing_eye_odxt.timestamp
         end
       end
       return value, timestamp, source
     </map>
-    <map name="missing_eye_left_map">
+    <map name="missing_eye_osin_map">
       value = 0
       timestamp = 0
       source = 'pracro'
       
-      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
+          timestamp = missing_eye_osin.timestamp
         else
           value = 'mangler'
-          timestamp = missing_eye_left.timestamp
+          timestamp = missing_eye_osin.timestamp
         end
       end
       return value, timestamp, source
@@ -147,24 +147,24 @@
       <!-- o.dxt -->
       <frame layout="vbox">
         <checkbox caption="Der er ikke målt på o.dxt"
-		  name="cycloplegisk_refraktion.odxt.missing" script="right_eye"
-		  map="missing_eye_right_map"
+		  name="cycloplegisk_refraktion.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="Sf:"/>
-	    <lineedit name="cycloplegisk_refraktion.odxt.sf" map="cycloplegisk_refraktion.odxt.sfere"
+	    <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sfere.odxt"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Cyl:"/>
-	    <lineedit name="cycloplegisk_refraktion.odxt.cyl" map="cycloplegisk_refraktion.odxt.cyl"
+	    <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="cycloplegisk_refraktion.cyl.odxt"
 		      regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
-	    <lineedit name="cycloplegisk_refraktion.odxt.grader" map="cycloplegisk_refraktion.odxt.grader"
+	    <lineedit name="cycloplegisk_refraktion.grader.odxt" map="cycloplegisk_refraktion.grader.odxt"
 		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	</frame>
@@ -173,24 +173,24 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="cycloplegisk_refraktion.osin.missing" script="left_eye"
-		  map="missing_eye_left_map"
+		  name="cycloplegisk_refraktion.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="Sf:"/>
-	    <lineedit name="cycloplegisk_refraktion.osin.sf" map="cycloplegisk_refraktion.osin.sfere"
+	    <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sfere.osin"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Cyl:"/>
-	    <lineedit name="cycloplegisk_refraktion.osin.cyl" map="cycloplegisk_refraktion.osin.cyl"
+	    <lineedit name="cycloplegisk_refraktion.cyl.osin" map="cycloplegisk_refraktion.cyl.osin"
 		      regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
-	    <lineedit name="cycloplegisk_refraktion.osin.grader" map="cycloplegisk_refraktion.osin.grader"
+	    <lineedit name="cycloplegisk_refraktion.grader.osin" map="cycloplegisk_refraktion.grader.osin"
 		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	</frame>