summaryrefslogtreecommitdiff
path: root/server/xml/macros/cycloplegisk_refraktion-1.0.xml
diff options
context:
space:
mode:
authordeva <deva>2010-06-01 12:58:32 +0000
committerdeva <deva>2010-06-01 12:58:32 +0000
commit74a28aa7125be6a603128ad600c98c4882f3b5c2 (patch)
tree1a9e4ab74f29d5ff10f2701e4e112f4525c0dcec /server/xml/macros/cycloplegisk_refraktion-1.0.xml
parent9b9c1e2dd3e5807ff7714b378b03b9ba31f42df7 (diff)
From new_protocol branch.
Diffstat (limited to 'server/xml/macros/cycloplegisk_refraktion-1.0.xml')
-rw-r--r--server/xml/macros/cycloplegisk_refraktion-1.0.xml110
1 files changed, 7 insertions, 103 deletions
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index 7c66cf3..cdef363 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 service="pentominos" class="visutron900plus" ttl="100000"/>
+ <query class="cycloplegisk_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="visutron900plus.osin.sph_near">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.osin and visutron900plus.osin.sph_near and visutron900plus.osin.sph_near.value and visutron900plus.osin.sph_near.timestamp)
- then
- value = visutron900plus.osin.sph_near.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.osin.sph_near.timestamp
- source = visutron900plus.osin.sph_near.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.osin.cyl">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.osin and visutron900plus.osin.cyl and visutron900plus.osin.cyl.value and visutron900plus.osin.cyl.timestamp)
- then
- value = visutron900plus.osin.cyl.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.osin.cyl.timestamp
- source = visutron900plus.osin.cyl.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.osin.axis">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.osin and visutron900plus.osin.axis and visutron900plus.osin.axis.value and visutron900plus.osin.axis.timestamp)
- then
- value = visutron900plus.osin.axis.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.osin.axis.timestamp
- source = visutron900plus.osin.axis.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.odxt.sph_near">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.sph_near and visutron900plus.odxt.sph_near.value and visutron900plus.odxt.sph_near.timestamp)
- then
- value = visutron900plus.odxt.sph_near.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.odxt.sph_near.timestamp
- source = visutron900plus.odxt.sph_near.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.odxt.cyl">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.cyl and visutron900plus.odxt.cyl.value and visutron900plus.odxt.cyl.timestamp)
- then
- value = visutron900plus.odxt.cyl.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.odxt.cyl.timestamp
- source = visutron900plus.odxt.cyl.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.odxt.axis">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.axis and visutron900plus.odxt.axis.value and visutron900plus.odxt.axis.timestamp)
- then
- value = visutron900plus.odxt.axis.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.odxt.axis.timestamp
- source = visutron900plus.odxt.axis.source
- end
- return value, timestamp, source
- </map>
</maps>
<scripts>
<script language="lua" name="lt20gt-25">
@@ -250,17 +154,17 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="cycloplegisk_refraktion.sf.odxt" map="visutron900plus.odxt.sph_near"
+ <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sf.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="visutron900plus.odxt.cyl"
+ <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="cycloplegisk_refraktion.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="visutron900plus.odxt.axis"
+ <lineedit name="cycloplegisk_refraktion.grader.odxt" map="cycloplegisk_refraktion.grader.odxt"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -276,17 +180,17 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="cycloplegisk_refraktion.sf.osin" map="visutron900plus.osin.sph_near"
+ <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sf.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="visutron900plus.osin.cyl"
+ <lineedit name="cycloplegisk_refraktion.cyl.osin" map="cycloplegisk_refraktion.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="visutron900plus.osin.axis"
+ <lineedit name="cycloplegisk_refraktion.grader.osin" map="cycloplegisk_refraktion.grader.osin"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>