diff options
| -rw-r--r-- | server/xml/macros/cycloplegisk_refraktion-1.0.xml | 110 |
1 files changed, 103 insertions, 7 deletions
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml index cdef363..5474fa2 100644 --- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml +++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml @@ -35,7 +35,7 @@ return out </resume> <queries> - <query class="cycloplegisk_refraktion" ttl="100000"/> + <query service="pentominos" class="phoroptor" ttl="100000"/> <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> @@ -76,6 +76,102 @@ 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_n and phoroptor.osin.sph_n.value and phoroptor.osin.sph_n.timestamp) + then + value = phoroptor.osin.sph_n.value + -- convert . to , + value = string.gsub(value, '[.]', ',') + timestamp = phoroptor.osin.sph_n.timestamp + source = phoroptor.osin.sph_n.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_n and phoroptor.odxt.sph_n.value and phoroptor.odxt.sph_n.timestamp) + then + value = phoroptor.odxt.sph_n.value + -- convert . to , + value = string.gsub(value, '[.]', ',') + timestamp = phoroptor.odxt.sph_n.timestamp + source = phoroptor.odxt.sph_n.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"> @@ -154,17 +250,17 @@ <frame layout="vbox"> <label caption="Sf:"/> - <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sf.odxt" + <lineedit name="cycloplegisk_refraktion.sf.odxt" map="phoroptor.sph.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="cycloplegisk_refraktion.cyl.odxt" + <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="phoroptor.cyl.odxt" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="cycloplegisk_refraktion.grader.odxt" map="cycloplegisk_refraktion.grader.odxt" + <lineedit name="cycloplegisk_refraktion.grader.odxt" map="phoroptor.axis.odxt" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> @@ -180,17 +276,17 @@ <frame layout="vbox"> <label caption="Sf:"/> - <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sf.osin" + <lineedit name="cycloplegisk_refraktion.sf.osin" map="phoroptor.sph.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="cycloplegisk_refraktion.cyl.osin" map="cycloplegisk_refraktion.cyl.osin" + <lineedit name="cycloplegisk_refraktion.cyl.osin" map="phoroptor.cyl.osin" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="cycloplegisk_refraktion.grader.osin" map="cycloplegisk_refraktion.grader.osin" + <lineedit name="cycloplegisk_refraktion.grader.osin" map="phoroptor.axis.osin" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> |