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/example.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'server/xml/macros/example.xml')

diff --git a/server/xml/macros/example.xml b/server/xml/macros/example.xml
index 2e60ae7..d9710ec 100644
--- a/server/xml/macros/example.xml
+++ b/server/xml/macros/example.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<macro name="example" version="1.0" resume="Axis: ${axis}\nCylinder: ${cyl}\nSphere: ${sphere}\n">
+<macro name="example" version="1.0" resume="Axis: $.grader}\nCylinder: ${cyl}\nSphere: $.sfere}\n">
   <queries>
     <query class="lensmeter" ttl="10000" automap="true"/>
   </queries>
   <maps>
-    <map name="axis">
+    <map name=.grader">
       -- LUA program
       return math.pi, 1234567890, 'local'
     </map>
@@ -30,9 +30,9 @@
   </maps>
   <scripts>
     <script language="lua" name="theanswer">
-      sphere = tonumber(getValue('sphere'))
-      axis = tonumber(getValue('axis'))
-      if( sphere == axis )
+     .sfere = tonumber(getValue(.sfere'))
+     .grader = tonumber(getValue(.grader'))
+      if(.sfere ==.grader )
       then
         setValue('cyl', name)
         return true
@@ -50,7 +50,7 @@
       <frame name="linse_framea" layout="hbox">
         <icon src="righteye"/>
         <label name="a" width="100" caption="Akse rotation:"/>
-        <lineedit name="axis" regexp="[24]*" map="axis" lua="theanswer" value="244"/>
+        <lineedit name=.grader" regexp="[24]*" map=.grader" lua="theanswer" value="244"/>
       </frame>
       <frame name="linse_frameb" layout="hbox">
         <icon src="lefteye"/>
@@ -62,10 +62,10 @@
       </frame>
     </frame>
     <frame name="linse_frame" caption="FlereLinser:" layout="vbox">
-      <multilist name="multilisttest" value="" layout="vbox" format="Sphere: ${spherecombo}, Cyl: ${multcyl}.">
+      <multilist name="multilisttest" value="" layout="vbox" format="Sphere: $.sferecombo}, Cyl: ${multcyl}.">
         <frame name="linse_frameb" layout="hbox">
           <label name="b" width="100" caption="Sphere:"/>
-	  <combobox name="spherecombo" width="100" value="val_lad" type="search">
+	  <combobox name=.sferecombo" width="100" value="val_lad" type="search">
 	    <item caption="sap" value="val_sap"/>
 	    <item caption="sat" value="val_sat"/>
 	    <item caption="sad" value="val_sad"/>
-- 
cgit v1.2.3