auto-replaced all instances of Højre øje and Venstre øje with o.dxt and o.sin. This was done using sed. These changes are not verified 100%, but i assume it went well. A quick check showed no errors.

1 files changed, 35 insertions, 35 deletions

diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 0a7cdf0..14ac759 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -18,38 +18,38 @@
 <macro name="visus" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('snellen.right.missing') == '' or getValue('snellen.left.missing') == '' )
+    if ( getValue('snellen.odxt.missing') == '' or getValue('snellen.osin.missing') == '' )
     then
       out = out .. 'Objektivt:\n'
 
-      if ( getValue('snellen.right.missing') == '' )
+      if ( getValue('snellen.odxt.missing') == '' )
       then
-        out = out .. 'Visus o.dxt. ' .. getValue('snellen.right') .. '\n'
-        out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.right') .. '\n'
-        if ( getValue('snellen.right.corr.basis') ~= 'Ingen' )
+        out = out .. 'Visus o.dxt. ' .. getValue('snellen.odxt') .. '\n'
+        out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.odxt') .. '\n'
+        if ( getValue('snellen.odxt.corr.basis') ~= 'Ingen' )
         then
-          out = out .. 'Korr.: ' .. getValue('snellen.right.corr.basis') .. ' add '
+          out = out .. 'Korr.: ' .. getValue('snellen.odxt.corr.basis') .. ' add '
         else
           out = out .. 'Korr.: add '
         end
-        out = out .. getValue('snellen.right.corr.sph') .. ' sf, '
-                  .. getValue('snellen.right.corr.cyl') .. ' sph '
-                  .. getValue('snellen.right.corr.axis') .. ' grader.\n'
+        out = out .. getValue('snellen.odxt.corr.sph') .. ' sf, '
+                  .. getValue('snellen.odxt.corr.cyl') .. ' sph '
+                  .. getValue('snellen.odxt.corr.axis') .. ' grader.\n'
       end
   
-      if ( getValue('snellen.left.missing') == '' )
+      if ( getValue('snellen.osin.missing') == '' )
       then
-        out = out .. 'Visus o.sin. ' .. getValue('snellen.left') .. '\n'
-        out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.left') .. '\n'
-        if ( getValue('snellen.left.corr.basis') ~= 'Ingen' )
+        out = out .. 'Visus o.sin. ' .. getValue('snellen.osin') .. '\n'
+        out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.osin') .. '\n'
+        if ( getValue('snellen.osin.corr.basis') ~= 'Ingen' )
         then
-          out = out .. 'Korr.: ' .. getValue('snellen.left.corr.basis') .. ' add '
+          out = out .. 'Korr.: ' .. getValue('snellen.osin.corr.basis') .. ' add '
         else
           out = out .. 'Korr.: add '
         end
-        out = out .. getValue('snellen.left.corr.sph') .. ' sf, '
-                  .. getValue('snellen.left.corr.cyl') .. ' sph '
-                  .. getValue('snellen.left.corr.axis') .. ' grader.\n'
+        out = out .. getValue('snellen.osin.corr.sph') .. ' sf, '
+                  .. getValue('snellen.osin.corr.cyl') .. ' sph '
+                  .. getValue('snellen.osin.corr.axis') .. ' grader.\n'
       end
     end
     return out
@@ -174,18 +174,18 @@
 
     <frame layout="hbox">
       
-      <!-- Højre øje -->
+      <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på højre øje"
-		  name="snellen.right.missing" script="right_eye"
+		  name="snellen.odxt.missing" script="right_eye"
 		  map="missing_eye_right_map"
 		  truevalue="mangler" falsevalue="" value=""/>
-	<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
+	<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
 	<frame layout="hbox">
 	  
 	  <frame layout="vbox">
 	    <label caption="Snellen:"/>
-	    <altcombobox name="snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
+	    <altcombobox name="snellen.odxt" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
 	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
 	      <item caption="2,0" value="2,0"/>
 	      <item caption="1,6" value="1,6"/>
@@ -223,7 +223,7 @@
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="ETDRS:"/>
-	    <combobox name="etdrs.right" value="Ikke udfyldt" type="search" script="not0">
+	    <combobox name="etdrs.odxt" value="Ikke udfyldt" type="search" script="not0">
 	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
 	      <item caption="0" value="0"/>
 	      <item caption="1" value="1"/>
@@ -337,7 +337,7 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Basis:"/>
-	      <combobox name="snellen.right.corr.basis" value="">
+	      <combobox name="snellen.odxt.corr.basis" value="">
 		<item caption="Autoref." value="Autoref"/>
 		<item caption="Egen brille" value="Brille"/>
 		<item caption="Ingen" value="Ingen"/>
@@ -349,32 +349,32 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="snellen.right.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	      <lineedit name="snellen.odxt.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Cyl:"/>
-	      <lineedit name="snellen.right.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	      <lineedit name="snellen.odxt.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Grader:"/>
-	      <lineedit name="snellen.right.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
+	      <lineedit name="snellen.odxt.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
 	    </frame>
 	  </frame>
 	</frame>
       </frame>
 
-      <!-- Venstre øje -->
+      <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på venstre øje"
-		  name="snellen.left.missing" script="left_eye"
+		  name="snellen.osin.missing" script="left_eye"
 		  map="missing_eye_left_map"
 		  truevalue="mangler" falsevalue="" value=""/>
-	<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
+	<frame name="left_eye_frame" caption="o.sin" layout="vbox">
 	<frame layout="hbox">
 	  
 	  <frame layout="vbox">
 	    <label caption="Snellen:"/>
-	    <altcombobox name="snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
+	    <altcombobox name="snellen.osin" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
 	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
 	      <item caption="2,0" value="2,0"/>
 	      <item caption="1,6" value="1,6"/>
@@ -412,7 +412,7 @@
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="ETDRS:"/>
-	    <combobox name="etdrs.left" value="Ikke udfyldt" type="search" script="not0">
+	    <combobox name="etdrs.osin" value="Ikke udfyldt" type="search" script="not0">
 	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
 	      <item caption="0" value="0"/>
 	      <item caption="1" value="1"/>
@@ -526,7 +526,7 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Basis:"/>
-	      <combobox name="snellen.left.corr.basis" value="">
+	      <combobox name="snellen.osin.corr.basis" value="">
 		<item caption="Autoref." value="autoref"/>
 		<item caption="Egen brille" value="brille"/>
 		<item caption="Ingen" value="ingen"/>
@@ -538,15 +538,15 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="snellen.left.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	      <lineedit name="snellen.osin.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Cyl:"/>
-	      <lineedit name="snellen.left.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	      <lineedit name="snellen.osin.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Grader:"/>
-	      <lineedit name="snellen.left.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
+	      <lineedit name="snellen.osin.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
 	    </frame>
 	  </frame>
 	</frame>