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

diff --git a/server/xml/macros/90d_linse-1.0.xml b/server/xml/macros/90d_linse-1.0.xml
index 4dbfe92..8a632c9 100644
--- a/server/xml/macros/90d_linse-1.0.xml
+++ b/server/xml/macros/90d_linse-1.0.xml
@@ -16,90 +16,90 @@
   <resume language="lua">
     out = '90D linse:'
 
-    if ( getValue('90d_linse.odxt.missing') == '' and getValue('90d_linse.osin.missing') == '' )
+    if ( getValue('90d_linse.mangler.odxt') == '' and getValue('90d_linse.mangler.osin') == '' )
     then
-      out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.odxt.fundus_visibility')
-          .. ' på o.dxt og ' .. getValue('90d_linse.osin.fundus_visibility')..' på venstre.\n'
+      out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.odxt')
+          .. ' på o.dxt og ' .. getValue('90d_linse.fundus_visibility.osin')..' på venstre.\n'
     else
-      if ( getValue('90d_linse.odxt.missing') == '' )
+      if ( getValue('90d_linse.mangler.odxt') == '' )
       then
-        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.odxt.fundus_visibility')
+        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.odxt')
            .. ' på o.dxt.\n'
       end
-      if ( getValue('90d_linse.osin.missing') == '' )
+      if ( getValue('90d_linse.mangler.osin') == '' )
       then
-        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.osin.fundus_visibility')
+        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.osin')
            ..' på o.sin.\n'
       end
     end
 
-    if ( getValue('90d_linse.odxt.missing') == '' )
+    if ( getValue('90d_linse.mangler.odxt') == '' )
     then
-      if ( getValue('90d_linse.odxt.implikation') == 'retinal hævelse' )
+      if ( getValue('90d_linse.implikation.odxt') == 'retinal hævelse' )
       then
         out = out .. 'På o.dxt findes der retinal hævelse'
-        if ( getValue('90d_linse.odxt.randbl') ~= '' and getValue('90d_linse.odxt.exsudater') ~= '')
+        if ( getValue('90d_linse.randbl.odxt') ~= '' and getValue('90d_linse.exsudater.odxt') ~= '')
         then
           out = out .. ' med randblødning og exhudater.\n'
         end
   
-        if ( getValue('90d_linse.odxt.randbl') == '' and getValue('90d_linse.odxt.exsudater') ~= '')
+        if ( getValue('90d_linse.randbl.odxt') == '' and getValue('90d_linse.exsudater.odxt') ~= '')
         then
           out = out .. ' med exhudater.\n'
         end
   
-        if ( getValue('90d_linse.odxt.randbl') ~= '' and getValue('90d_linse.odxt.exsudater') == '')
+        if ( getValue('90d_linse.randbl.odxt') ~= '' and getValue('90d_linse.exsudater.odxt') == '')
         then
           out = out .. ' med randblødning.\n'
         end
   
-        if ( getValue('90d_linse.odxt.randbl') == '' and getValue('90d_linse.odxt.exsudater') == '')
+        if ( getValue('90d_linse.randbl.odxt') == '' and getValue('90d_linse.exsudater.odxt') == '')
         then
           out = out .. '.\n'
         end
       end
 
-      if ( getValue('90d_linse.odxt.implikation') == 'atrofi' )
+      if ( getValue('90d_linse.implikation.odxt') == 'atrofi' )
       then
         out = out .. 'På o.dxt findes der atrofi.\n'
       end
     end
 
-    if ( getValue('90d_linse.osin.missing') == '' )
+    if ( getValue('90d_linse.mangler.osin') == '' )
     then
-      if ( getValue('90d_linse.osin.implikation') == 'retinal hævelse' )
+      if ( getValue('90d_linse.implikation.osin') == 'retinal hævelse' )
       then
         out = out .. 'På o.sin findes der retinal hævelse'
-        if ( getValue('90d_linse.osin.randbl') ~= '' and getValue('90d_linse.osin.exsudater') ~= '')
+        if ( getValue('90d_linse.randbl.osin') ~= '' and getValue('90d_linse.exsudater.osin') ~= '')
         then
           out = out .. ' med randblødning og exhudater.\n'
         end
   
-        if ( getValue('90d_linse.osin.randbl') == '' and getValue('90d_linse.osin.exsudater') ~= '')
+        if ( getValue('90d_linse.randbl.osin') == '' and getValue('90d_linse.exsudater.osin') ~= '')
         then
           out = out .. ' med exhudater.\n'
         end
   
-        if ( getValue('90d_linse.osin.randbl') ~= '' and getValue('90d_linse.osin.exsudater') == '')
+        if ( getValue('90d_linse.randbl.osin') ~= '' and getValue('90d_linse.exsudater.osin') == '')
         then
           out = out .. ' med randblødning.\n'
         end
   
-        if ( getValue('90d_linse.osin.randbl') == '' and getValue('90d_linse.osin.exsudater') == '')
+        if ( getValue('90d_linse.randbl.osin') == '' and getValue('90d_linse.exsudater.osin') == '')
         then
           out = out .. '.\n'
         end
       end
   
-      if ( getValue('90d_linse.osin.implikation') == 'atrofi' )
+      if ( getValue('90d_linse.implikation.osin') == 'atrofi' )
       then
         out = out .. 'På o.sin findes der atrofi.\n'
       end
     end
   
-    if ( getValue('90d_linse.additional') ~= '' )
+    if ( getValue('90d_linse.yderligere') ~= '' )
     then
-      out = out .. getValue('90d_linse.additional') .. '\n'
+      out = out .. getValue('90d_linse.yderligere') .. '\n'
     end
 
     return out
@@ -107,42 +107,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
@@ -167,21 +167,21 @@
       end
       return true
     </script>
-    <script language="lua" name="retinal_haevelse_right">
+    <script language="lua" name="retinal_haevelse_odxt">
       if ( value == 'retinal hævelse' )
       then
-        enable('retinal_haevelse_right')
+        enable('retinal_haevelse_odxt')
       else
-        disable('retinal_haevelse_right')
+        disable('retinal_haevelse_odxt')
       end
       return true
     </script>
-    <script language="lua" name="retinal_haevelse_left">
+    <script language="lua" name="retinal_haevelse_osin">
       if ( value == 'retinal hævelse' )
       then
-        enable('retinal_haevelse_left')
+        enable('retinal_haevelse_osin')
       else
-        disable('retinal_haevelse_left')
+        disable('retinal_haevelse_osin')
       end
       return true
     </script>
@@ -194,30 +194,30 @@
       <!-- 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">
 	  
 	  <!-- Indblik -->
-	  <combobox name="90d_linse.odxt.fundus_visibility" value="">
+	  <combobox name="90d_linse.fundus_visibility.odxt" value="">
 	    <item caption="Klart" value="klart"/>
 	    <item caption="Let sløret" value="let sløret"/>
 	    <item caption="Meget sløret" value="meget sløret"/>
 	  </combobox>
 
 	  <!-- Observationer -->
-	  <radiobuttons name="90d_linse.odxt.implikation" value=" "
-			script="retinal_haevelse_right">
+	  <radiobuttons name="90d_linse.implikation.odxt" value=" "
+			script="retinal_haevelse_odxt">
 	    <radiobutton caption="Retinal hævelse" value="retinal hævelse"/>
 	    <radiobutton caption="Atrofi" value="atrofi"/>
 	    <radiobutton caption="Andet (se suppl.)" value=""/>
 	  </radiobuttons>
 
-	  <frame name="retinal_haevelse_right" layout="vbox">
-	    <checkbox name="90d_linse.odxt.randbl" caption="Randblødning"
+	  <frame name="retinal_haevelse_odxt" layout="vbox">
+	    <checkbox name="90d_linse.randbl.odxt" caption="Randblødning"
 		      truevalue="randblødning" falsevalue="" value=""/>
-	    <checkbox name="90d_linse.odxt.exsudater" caption="Exsudater"
+	    <checkbox name="90d_linse.exsudater.odxt" caption="Exsudater"
 		      truevalue="exsudater" falsevalue="" value=""/>
 	  </frame>
 
@@ -227,30 +227,30 @@
       <!-- 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.sin" layout="vbox">
 	  
 	  <!-- Indblik -->
-	  <combobox name="90d_linse.osin.fundus_visibility" value="">
+	  <combobox name="90d_linse.fundus_visibility.osin" value="">
 	    <item caption="Klart" value="klart"/>
 	    <item caption="Let sløret" value="let sløret"/>
 	    <item caption="Meget sløret" value="meget sløret"/>
 	  </combobox>
 	  
 	  <!-- Observationer -->
-	  <radiobuttons name="90d_linse.osin.implikation" value=" "
-			script="retinal_haevelse_left">
+	  <radiobuttons name="90d_linse.implikation.osin" value=" "
+			script="retinal_haevelse_osin">
 	    <radiobutton caption="Retinal hævelse" value="retinal hævelse"/>
 	    <radiobutton caption="Atrofi" value="atrofi"/>
 	    <radiobutton caption="Andet (se suppl.)" value=""/>
 	  </radiobuttons>
 
-	  <frame name="retinal_haevelse_left" layout="vbox">
-	    <checkbox name="90d_linse.osin.randbl" caption="Randblødning"
+	  <frame name="retinal_haevelse_osin" layout="vbox">
+	    <checkbox name="90d_linse.randbl.osin" caption="Randblødning"
 		      truevalue="randblødning" falsevalue="" value=""/>
-	    <checkbox name="90d_linse.osin.exsudater" caption="Exsudater"
+	    <checkbox name="90d_linse.exsudater.osin" caption="Exsudater"
 		      truevalue="exsudater" falsevalue="" value=""/>
 	  </frame>
 
@@ -259,7 +259,7 @@
     </frame>
 
     <label caption="Supplerende:"/>
-    <textedit name="90d_linse.additional" value=""/>
+    <textedit name="90d_linse.yderligere" value=""/>
 
     <!-- Knapper -->
     <frame layout="hbox">