From 1a6bd6fdbfffa6fb120b1464854a95b43221719d Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Mon, 16 Nov 2009 11:36:08 +0000
Subject: Several more changes to field names. These are done with sed, so it
 is possible that something is broken. I do check things after changes are
 made so it should be ok

---
 server/xml/macros/autorefraktion-1.0.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'server/xml/macros/autorefraktion-1.0.xml')

diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml
index 0e6e372..f5c1b3f 100644
--- a/server/xml/macros/autorefraktion-1.0.xml
+++ b/server/xml/macros/autorefraktion-1.0.xml
@@ -4,14 +4,14 @@
     out = ''
     if ( getValue('autorefractor.odxt.missing') == '' )
     then
-      out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.odxt.sphere') .. ' sf'
+      out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.odxt.sfere') .. ' sf'
       if ( getValue('autorefractor.odxt.cyl') ~= '' )
       then
         out = out .. ', ' .. getValue('autorefractor.odxt.cyl') .. ' cyl'
       end
-      if ( getValue('autorefractor.odxt.axis') ~= '' )
+      if ( getValue('autorefractor.odxt.grader') ~= '' )
       then
-        out = out .. ', ' .. getValue('autorefractor.odxt.axis') .. ' grader\n'
+        out = out .. ', ' .. getValue('autorefractor.odxt.grader') .. ' grader\n'
       else
         out = out .. '\n'
       end
@@ -19,14 +19,14 @@
 
     if ( getValue('autorefractor.osin.missing') == '' )
     then
-      out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.osin.sphere') .. ' sf'
+      out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.osin.sfere') .. ' sf'
       if ( getValue('autorefractor.osin.cyl') ~= '' )
       then
         out = out .. ', ' .. getValue('autorefractor.osin.cyl') .. ' cyl'
       end
-      if ( getValue('autorefractor.osin.axis') ~= '' )
+      if ( getValue('autorefractor.osin.grader') ~= '' )
       then
-        out = out .. ', ' .. getValue('autorefractor.osin.axis') .. ' grader\n'
+        out = out .. ', ' .. getValue('autorefractor.osin.grader') .. ' grader\n'
       else
         out = out .. '\n'
       end
@@ -157,7 +157,7 @@
 	  
 	  <frame layout="vbox">
 	    <label caption="Sf:"/>
-	    <lineedit name="autorefractor.odxt.sphere"
+	    <lineedit name="autorefractor.odxt.sfere"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
@@ -167,7 +167,7 @@
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
-	    <lineedit name="autorefractor.odxt.axis"
+	    <lineedit name="autorefractor.odxt.grader"
 		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	  
@@ -184,7 +184,7 @@
 	  
 	  <frame layout="vbox">
 	    <label caption="Sf:"/>
-	    <lineedit name="autorefractor.osin.sphere"
+	    <lineedit name="autorefractor.osin.sfere"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
@@ -194,7 +194,7 @@
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
-	    <lineedit name="autorefractor.osin.axis"
+	    <lineedit name="autorefractor.osin.grader"
 		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	</frame>
-- 
cgit v1.2.3