From new_protocol branch.

1 files changed, 7 insertions, 103 deletions

diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index f057435..46b6f35 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -35,7 +35,7 @@
     return out
   </resume>
   <queries>
-    <query service="pentominos" class="phoroptor" ttl="100000"/>
+    <query class="manifest_refraktion" ttl="100000"/>
     <query service="pracro" class="missing_eye_odxt" ttl="1000000"/>
     <query service="pracro" class="missing_eye_osin" ttl="1000000"/>
   </queries>
@@ -76,102 +76,6 @@
       end
       return value, timestamp, source
     </map>
-    <map name="phoroptor.osin.sph">
-      -- Returning 0, 0 invalidates the result
-      value = 0
-      timestamp = 0
-      source = 0
-
-      if(phoroptor and phoroptor.osin and phoroptor.osin.sph and phoroptor.osin.sph.value and phoroptor.osin.sph.timestamp)
-      then
-        value = phoroptor.osin.sph.value
-        -- convert . to ,
-        value = string.gsub(value, '[.]', ',')
-        timestamp = phoroptor.osin.sph.timestamp
-        source = phoroptor.osin.sph.source
-      end
-      return value, timestamp, source
-    </map>
-    <map name="phoroptor.osin.cyl">
-      -- Returning 0, 0 invalidates the result
-      value = 0
-      timestamp = 0
-      source = 0
-
-      if(phoroptor and phoroptor.osin and phoroptor.osin.cyl and phoroptor.osin.cyl.value and phoroptor.osin.cyl.timestamp)
-      then
-        value = phoroptor.osin.cyl.value
-        -- convert . to ,
-        value = string.gsub(value, '[.]', ',')
-        timestamp = phoroptor.osin.cyl.timestamp
-        source = phoroptor.osin.cyl.source
-      end
-      return value, timestamp, source
-    </map>
-    <map name="phoroptor.osin.axis">
-      -- Returning 0, 0 invalidates the result
-      value = 0
-      timestamp = 0
-      source = 0
-
-      if(phoroptor and phoroptor.osin and phoroptor.osin.axis and phoroptor.osin.axis.value and phoroptor.osin.axis.timestamp)
-      then
-        value = phoroptor.osin.axis.value
-        -- convert . to ,
-        value = string.gsub(value, '[.]', ',')
-        timestamp = phoroptor.osin.axis.timestamp
-        source = phoroptor.osin.axis.source
-      end
-      return value, timestamp, source
-    </map>
-    <map name="phoroptor.odxt.sph">
-      -- Returning 0, 0 invalidates the result
-      value = 0
-      timestamp = 0
-      source = 0
-
-      if(phoroptor and phoroptor.odxt and phoroptor.odxt.sph and phoroptor.odxt.sph.value and phoroptor.odxt.sph.timestamp)
-      then
-        value = phoroptor.odxt.sph.value
-        -- convert . to ,
-        value = string.gsub(value, '[.]', ',')
-        timestamp = phoroptor.odxt.sph.timestamp
-        source = phoroptor.odxt.sph.source
-      end
-      return value, timestamp, source
-    </map>
-    <map name="phoroptor.odxt.cyl">
-      -- Returning 0, 0 invalidates the result
-      value = 0
-      timestamp = 0
-      source = 0
-
-      if(phoroptor and phoroptor.odxt and phoroptor.odxt.cyl and phoroptor.odxt.cyl.value and phoroptor.odxt.cyl.timestamp)
-      then
-        value = phoroptor.odxt.cyl.value
-        -- convert . to ,
-        value = string.gsub(value, '[.]', ',')
-        timestamp = phoroptor.odxt.cyl.timestamp
-        source = phoroptor.odxt.cyl.source
-      end
-      return value, timestamp, source
-    </map>
-    <map name="phoroptor.odxt.axis">
-      -- Returning 0, 0 invalidates the result
-      value = 0
-      timestamp = 0
-      source = 0
-
-      if(phoroptor and phoroptor.odxt and phoroptor.odxt.axis and phoroptor.odxt.axis.value and phoroptor.odxt.axis.timestamp)
-      then
-        value = phoroptor.odxt.axis.value
-        -- convert . to ,
-        value = string.gsub(value, '[.]', ',')
-        timestamp = phoroptor.odxt.axis.timestamp
-        source = phoroptor.odxt.axis.source
-      end
-      return value, timestamp, source
-    </map>
   </maps>
   <scripts>
      <script language="lua" name="lt20gt-25">
@@ -258,17 +162,17 @@
 	  <frame layout="hbox">
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="manifest_refraktion.sf.odxt" map="phoroptor.sph.odxt"
+	      <lineedit name="manifest_refraktion.sf.odxt" map="manifest_refraktion.sf.odxt"
 			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Cyl:"/>
-	      <lineedit name="manifest_refraktion.cyl.odxt" map="phoroptor.cyl.odxt"
+	      <lineedit name="manifest_refraktion.cyl.odxt" map="manifest_refraktion.cyl.odxt"
 			regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Grader:"/>
-	      <lineedit name="manifest_refraktion.grader.odxt" map="phoroptor.axis.odxt"
+	      <lineedit name="manifest_refraktion.grader.odxt" map="manifest_refraktion.grader.odxt"
 			regexp="|[\d]+" script="lt359gt0" value=""/>
 	    </frame>
 	  </frame>
@@ -286,17 +190,17 @@
 	  <frame layout="hbox">
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="manifest_refraktion.sf.osin" map="phoroptor.sph.osin"
+	      <lineedit name="manifest_refraktion.sf.osin" map="manifest_refraktion.sf.osin"
 			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Cyl:"/>
-	      <lineedit name="manifest_refraktion.cyl.osin" map="phoroptor.cyl.osin"
+	      <lineedit name="manifest_refraktion.cyl.osin" map="manifest_refraktion.cyl.osin"
 			regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Grader:"/>
-	      <lineedit name="manifest_refraktion.grader.osin" map="phoroptor.axis.osin"
+	      <lineedit name="manifest_refraktion.grader.osin" map="manifest_refraktion.grader.osin"
 			regexp="|[\d]+" script="lt359gt0" value=""/>
 	    </frame>
 	  </frame>