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

diff --git a/server/xml/macros/ref_90d_linse-1.0.xml b/server/xml/macros/ref_90d_linse-1.0.xml
index a344db3..43576e3 100644
--- a/server/xml/macros/ref_90d_linse-1.0.xml
+++ b/server/xml/macros/ref_90d_linse-1.0.xml
@@ -2,89 +2,89 @@
 <macro name="ref_90d_linse" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('90d_linse.odxt.missing') == '' )
+    if ( getValue('90d_linse.mangler.odxt') == '' )
     then
       out = out .. 'Oftalmoskopi, o.dxt:\n'
-      out = out .. getValue('90d_linse.odxt.indblik') .. ' indblik.\n'
-      out = out .. 'Papil: ' .. getValue('90d_linse.odxt.papil') .. '\n'
-      out = out .. 'Makula: ' .. getValue('90d_linse.odxt.makula') .. '\n'
-      out = out .. 'Periferi: ' .. getValue('90d_linse.odxt.periferi')
-      if ( getValue('90d_linse.odxt.periferi') == 'Hul eller rift kl' )
+      out = out .. getValue('90d_linse.indblik.odxt') .. ' indblik.\n'
+      out = out .. 'Papil: ' .. getValue('90d_linse.papil.odxt') .. '\n'
+      out = out .. 'Makula: ' .. getValue('90d_linse.makula.odxt') .. '\n'
+      out = out .. 'Periferi: ' .. getValue('90d_linse.periferi.odxt')
+      if ( getValue('90d_linse.periferi.odxt') == 'Hul eller rift kl' )
       then
-        out = out .. ' ' .. getValue('90dlinse.odxt.hul_eller_rift_kl') .. '\n'
+        out = out .. ' ' .. getValue('90dlinse.hul_eller_rift_kl.odxt') .. '\n'
       else
         out = out .. '\n'
       end
-      if ( getValue('90d_linse.odxt.supplerende') ~= '' )
+      if ( getValue('90d_linse.supplerende.odxt') ~= '' )
       then
-        out = out .. getValue('90d_linse.odxt.supplerende') .. '\n'
+        out = out .. getValue('90d_linse.supplerende.odxt') .. '\n'
       end
     end
-    if ( getValue('90d_linse.osin.missing') == '' )
+    if ( getValue('90d_linse.mangler.osin') == '' )
     then
-      if ( getValue('90d_linse.odxt.missing') == '' )
+      if ( getValue('90d_linse.mangler.odxt') == '' )
       then
         out = out .. '\n'
       end
       out = out .. 'Oftalmoskopi, o.sin:\n'
-      out = out .. getValue('90d_linse.osin.indblik') .. ' indblik.\n'
-      out = out .. 'Papil: ' .. getValue('90d_linse.osin.papil') .. '\n'
-      out = out .. 'Makula: ' .. getValue('90d_linse.osin.makula') .. '\n'
-      out = out .. 'Periferi: ' .. getValue('90d_linse.osin.periferi')
-      if ( getValue('90d_linse.osin.periferi') == 'Hul eller rift kl' )
+      out = out .. getValue('90d_linse.indblik.osin') .. ' indblik.\n'
+      out = out .. 'Papil: ' .. getValue('90d_linse.papil.osin') .. '\n'
+      out = out .. 'Makula: ' .. getValue('90d_linse.makula.osin') .. '\n'
+      out = out .. 'Periferi: ' .. getValue('90d_linse.periferi.osin')
+      if ( getValue('90d_linse.periferi.osin') == 'Hul eller rift kl' )
       then
-        out = out .. ' ' .. getValue('90dlinse.osin.hul_eller_rift_kl') .. '\n'
+        out = out .. ' ' .. getValue('90dlinse.hul_eller_rift_kl.osin') .. '\n'
       else
         out = out .. '\n'
       end
-      if ( getValue('90d_linse.osin.supplerende') ~= '' )
+      if ( getValue('90d_linse.supplerende.osin') ~= '' )
       then
-        out = out .. getValue('90d_linse.osin.supplerende') .. '\n'
+        out = out .. getValue('90d_linse.supplerende.osin') .. '\n'
       end
     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
@@ -109,21 +109,21 @@
       end
       return true
     </script>
-    <script language="lua" name="hul_eller_rift_right">
-      if ( getValue('90d_linse.odxt.periferi') == 'Hul eller rift kl' )
+    <script language="lua" name="hul_eller_rift_odxt">
+      if ( getValue('90d_linse.periferi.odxt') == 'Hul eller rift kl' )
       then
-        enable('hul_eller_rift.odxt.frame')
+        enable('hul_eller_rift.frame.odxt')
       else
-        disable('hul_eller_rift.odxt.frame')
+        disable('hul_eller_rift.frame.odxt')
       end
       return true
     </script>
-    <script language="lua" name="hul_eller_rift_left">
-      if ( getValue('90d_linse.osin.periferi') == 'Hul eller rift kl' )
+    <script language="lua" name="hul_eller_rift_osin">
+      if ( getValue('90d_linse.periferi.osin') == 'Hul eller rift kl' )
       then
-        enable('hul_eller_rift.osin.frame')
+        enable('hul_eller_rift.frame.osin')
       else
-        disable('hul_eller_rift.osin.frame')
+        disable('hul_eller_rift.frame.osin')
       end
       return true
     </script>
@@ -136,8 +136,8 @@
       <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.dxt"
-		  name="90d_linse.odxt.missing" script="right_eye"
-		  map="missing_eye_right_map"
+		  name="90d_linse.mangler.odxt" script="right_eye"
+		  map="missing_eye_odxt_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
 
@@ -147,13 +147,13 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.odxt.indblik" layout="vbox" value="Klart">
+	      <altcombobox name="90d_linse.indblik.odxt" layout="vbox" value="Klart">
 		<item caption="Klart" value="Klart"/>
 		<item caption="Let sløret" value="Let sløret"/>
 		<item caption="Meget sløret" value="Meget sløret"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.indblik.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.indblik.andet.odxt">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.odxt.indblik.andet"/>
+		  <lineedit name="90d_linse.indblik.andet.odxt"/>
 		</altitem>
  	      </altcombobox>
 	    </frame>
@@ -165,15 +165,15 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.odxt.papil" layout="vbox" value="Normal, ikke ekskaveret">
+	      <altcombobox name="90d_linse.papil.odxt" layout="vbox" value="Normal, ikke ekskaveret">
 		<item caption="Myop" value="Myop"/>
 		<item caption="Normal, ikke ekskaveret" value="Normal, ikke ekskaveret"/>
 		<item caption="Koncentrisk ekskavation" value="Koncentrisk ekskavation"/>
 		<item caption="Glaukomsuspekt" value="Glaukomsuspekt"/>
 		<item caption="Glaukomatøs ekskavation" value="Glaukomatøs ekskavation"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.papil.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.papil.andet.odxt">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.odxt.papil.andet"/>
+		  <lineedit name="90d_linse.papil.andet.odxt"/>
 		</altitem>
  	      </altcombobox>
 	    </frame>
@@ -184,14 +184,14 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.odxt.makula" layout="vbox" value="Normal">
+	      <altcombobox name="90d_linse.makula.odxt" layout="vbox" value="Normal">
 		<item caption="Normal" value="Normal"/>
 		<item caption="Atrofiske forandringer" value="Atrofiske forandringer"/>
 		<item caption="Diabetiske non-proliferative forandringer" value="Diabetiske non-proliferative forandringer"/>
 		<item caption="Diabetiske proliferative forandringer" value="Diabetiske proliferative forandringer"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.makula.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.makula.andet.odxt">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.odxt.makula.andet"/>
+		  <lineedit name="90d_linse.makula.andet.odxt"/>
 		</altitem>
  	      </altcombobox>
 	    </frame>
@@ -203,19 +203,19 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.odxt.periferi" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_right">
+	      <altcombobox name="90d_linse.periferi.odxt" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_odxt">
 		<item caption="Ingen degenerative forandringer" value="Ingen degenerative forandringer"/>
 		<item caption="Perifere degenerationer" value="Perifere degenerationer"/>
 		<item caption="Lattice" value="Lattice"/>
 		<item caption="Hul eller rift kl (anfør herunder)" value="Hul eller rift kl"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.periferi.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.periferi.andet.odxt">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.odxt.periferi.andet"/>
+		  <lineedit name="90d_linse.periferi.andet.odxt"/>
 		</altitem>
  	      </altcombobox>
-	      <frame name="hul_eller_rift.odxt.frame" layout="hbox">
+	      <frame name="hul_eller_rift.frame.odxt" layout="hbox">
 		<label caption="Hul eller rift kl.:"/>
-		<combobox name="90dlinse.odxt.hul_eller_rift_kl">
+		<combobox name="90dlinse.hul_eller_rift_kl.odxt">
 		  <item caption="1" value="1"/>
 		  <item caption="2" value="2"/>
 		  <item caption="3" value="3"/>
@@ -235,7 +235,7 @@
 	  </frame>
 
 	  <label caption="Supplerende:"/>
-	  <lineedit name="90d_linse.odxt.supplerende"/>
+	  <lineedit name="90d_linse.supplerende.odxt"/>
 
 	</frame>
       </frame>
@@ -243,8 +243,8 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="90d_linse.osin.missing" script="left_eye"
-		  map="missing_eye_left_map"
+		  name="90d_linse.mangler.osin" script="left_eye"
+		  map="missing_eye_osin_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.dxt" layout="vbox">
 
@@ -254,13 +254,13 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.osin.indblik" layout="vbox" value="Klart">
+	      <altcombobox name="90d_linse.indblik.osin" layout="vbox" value="Klart">
 		<item caption="Klart" value="Klart"/>
 		<item caption="Let sløret" value="Let sløret"/>
 		<item caption="Meget sløret" value="Meget sløret"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.indblik.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.indblik.andet.osin">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.osin.indblik.andet"/>
+		  <lineedit name="90d_linse.indblik.andet.osin"/>
 		</altitem>
  	      </altcombobox>
 	    </frame>
@@ -272,15 +272,15 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.osin.papil" layout="vbox" value="Normal, ikke ekskaveret">
+	      <altcombobox name="90d_linse.papil.osin" layout="vbox" value="Normal, ikke ekskaveret">
 		<item caption="Myop" value="Myop"/>
 		<item caption="Normal, ikke ekskaveret" value="Normal, ikke ekskaveret"/>
 		<item caption="Koncentrisk ekskavation" value="Koncentrisk ekskavation"/>
 		<item caption="Glaukomsuspekt" value="Glaukomsuspekt"/>
 		<item caption="Glaukomatøs ekskavation" value="Glaukomatøs ekskavation"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.papil.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.papil.andet.osin">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.osin.papil.andet"/>
+		  <lineedit name="90d_linse.papil.andet.osin"/>
 		</altitem>
  	      </altcombobox>
 	    </frame>
@@ -291,14 +291,14 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.osin.makula" layout="vbox" value="Normal">
+	      <altcombobox name="90d_linse.makula.osin" layout="vbox" value="Normal">
 		<item caption="Normal" value="Normal"/>
 		<item caption="Atrofiske forandringer" value="Atrofiske forandringer"/>
 		<item caption="Diabetiske non-proliferative forandringer" value="Diabetiske non-proliferative forandringer"/>
 		<item caption="Diabetiske proliferative forandringer" value="Diabetiske proliferative forandringer"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.makula.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.makula.andet.osin">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.osin.makula.andet"/>
+		  <lineedit name="90d_linse.makula.andet.osin"/>
 		</altitem>
  	      </altcombobox>
 	    </frame>
@@ -310,19 +310,19 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="90d_linse.osin.periferi" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_left">
+	      <altcombobox name="90d_linse.periferi.osin" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_osin">
 		<item caption="Ingen degenerative forandringer" value="Ingen degenerative forandringer"/>
 		<item caption="Perifere degenerationer" value="Perifere degenerationer"/>
 		<item caption="Lattice" value="Lattice"/>
 		<item caption="Hul eller rift kl (anfør herunder)" value="Hul eller rift kl"/>
-		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.periferi.andet">
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.periferi.andet.osin">
 		  <label caption="Andet:"/>
-		  <lineedit name="90d_linse.osin.periferi.andet"/>
+		  <lineedit name="90d_linse.periferi.andet.osin"/>
 		</altitem>
  	      </altcombobox>
-	      <frame name="hul_eller_rift.osin.frame" layout="hbox">
+	      <frame name="hul_eller_rift.frame.osin" layout="hbox">
 		<label caption="Hul eller rift kl.:"/>
-		<combobox name="90dlinse.osin.hul_eller_rift_kl">
+		<combobox name="90dlinse.hul_eller_rift_kl.osin">
 		  <item caption="1" value="1"/>
 		  <item caption="2" value="2"/>
 		  <item caption="3" value="3"/>
@@ -342,7 +342,7 @@
 	  </frame>
 
 	  <label caption="Supplerende:"/>
-	  <lineedit name="90d_linse.osin.supplerende"/>
+	  <lineedit name="90d_linse.supplerende.osin"/>
 
 	</frame>
       </frame>