diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/xml/macros/cycloplegisk_refraktion-1.0.xml | 79 | 
1 files changed, 42 insertions, 37 deletions
| diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml index 54fa894..becf626 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="phoroptor" ttl="100000"/> --> +    <query service="pentominos" class="visutron900plus" ttl="100000"/>      <query service="pracro" class="missing_eye_odxt" ttl="1000000"/>      <query service="pracro" class="missing_eye_osin" ttl="1000000"/>    </queries> @@ -76,99 +76,104 @@        end        return value, timestamp, source      </map> -    <map name="phoroptor.osin.sph"> + + + + + +    <map name="visutron900plus.osin.sph_near">        -- 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) +      if(phoroptor and visutron900plus.osin and visutron900plus.osin.sph_near and visutron900plus.osin.sph_near.value and visutron900plus.osin.sph_near.timestamp)        then -        value = phoroptor.osin.sph_n.value +        value = visutron900plus.osin.sph_near.value          -- convert . to ,          value = string.gsub(value, '[.]', ',') -        timestamp = phoroptor.osin.sph_n.timestamp -        source = phoroptor.osin.sph_n.source +        timestamp = visutron900plus.osin.sph_near.timestamp +        source = visutron900plus.osin.sph_near.source        end        return value, timestamp, source      </map> -    <map name="phoroptor.osin.cyl"> +    <map name="visutron900plus.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) +      if(phoroptor and visutron900plus.osin and visutron900plus.osin.cyl and visutron900plus.osin.cyl.value and visutron900plus.osin.cyl.timestamp)        then -        value = phoroptor.osin.cyl.value +        value = visutron900plus.osin.cyl.value          -- convert . to ,          value = string.gsub(value, '[.]', ',') -        timestamp = phoroptor.osin.cyl.timestamp -        source = phoroptor.osin.cyl.source +        timestamp = visutron900plus.osin.cyl.timestamp +        source = visutron900plus.osin.cyl.source        end        return value, timestamp, source      </map> -    <map name="phoroptor.osin.axis"> +    <map name="visutron900plus.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) +      if(phoroptor and visutron900plus.osin and visutron900plus.osin.axis and visutron900plus.osin.axis.value and visutron900plus.osin.axis.timestamp)        then -        value = phoroptor.osin.axis.value +        value = visutron900plus.osin.axis.value          -- convert . to ,          value = string.gsub(value, '[.]', ',') -        timestamp = phoroptor.osin.axis.timestamp -        source = phoroptor.osin.axis.source +        timestamp = visutron900plus.osin.axis.timestamp +        source = visutron900plus.osin.axis.source        end        return value, timestamp, source      </map> -    <map name="phoroptor.odxt.sph"> +    <map name="visutron900plus.odxt.sph_near">        -- 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) +      if(phoroptor and visutron900plus.odxt and visutron900plus.odxt.sphn and visutron900plus.odxt.sph_near.value and visutron900plus.odxt.sph_near.timestamp)        then -        value = phoroptor.odxt.sph_n.value +        value = visutron900plus.odxt.sph_near.value          -- convert . to ,          value = string.gsub(value, '[.]', ',') -        timestamp = phoroptor.odxt.sph_n.timestamp -        source = phoroptor.odxt.sph_n.source +        timestamp = visutron900plus.odxt.sph_near.timestamp +        source = visutron900plus.odxt.sph_near.source        end        return value, timestamp, source      </map> -    <map name="phoroptor.odxt.cyl"> +    <map name="visutron900plus.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) +      if(phoroptor and visutron900plus.odxt and visutron900plus.odxt.cyl and visutron900plus.odxt.cyl.value and visutron900plus.odxt.cyl.timestamp)        then -        value = phoroptor.odxt.cyl.value +        value = visutron900plus.odxt.cyl.value          -- convert . to ,          value = string.gsub(value, '[.]', ',') -        timestamp = phoroptor.odxt.cyl.timestamp -        source = phoroptor.odxt.cyl.source +        timestamp = visutron900plus.odxt.cyl.timestamp +        source = visutron900plus.odxt.cyl.source        end        return value, timestamp, source      </map> -    <map name="phoroptor.odxt.axis"> +    <map name="visutron900plus.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) +      if(phoroptor and visutron900plus.odxt and visutron900plus.odxt.axis and visutron900plus.odxt.axis.value and visutron900plus.odxt.axis.timestamp)        then -        value = phoroptor.odxt.axis.value +        value = visutron900plus.odxt.axis.value          -- convert . to ,          value = string.gsub(value, '[.]', ',') -        timestamp = phoroptor.odxt.axis.timestamp -        source = phoroptor.odxt.axis.source +        timestamp = visutron900plus.odxt.axis.timestamp +        source = visutron900plus.odxt.axis.source        end        return value, timestamp, source      </map> @@ -250,17 +255,17 @@  	  <frame layout="vbox">  	    <label caption="Sf:"/> -	    <lineedit name="cycloplegisk_refraktion.sf.odxt" map="phoroptor.odxt.sph" +	    <lineedit name="cycloplegisk_refraktion.sf.odxt" map="visutron900plus.odxt.sph_near"  		      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="phoroptor.odxt.cyl" +	    <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="visutron900plus.odxt.cyl"  		      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="phoroptor.odxt.axis" +	    <lineedit name="cycloplegisk_refraktion.grader.odxt" map="visutron900plus.odxt.axis"  		      regexp="|[\d]+" script="lt359gt0" value=""/>  	  </frame>  	</frame> @@ -276,17 +281,17 @@  	  <frame layout="vbox">  	    <label caption="Sf:"/> -	    <lineedit name="cycloplegisk_refraktion.sf.osin" map="phoroptor.osin.sph" +	    <lineedit name="cycloplegisk_refraktion.sf.osin" map="visutron900plus.osin.sph_near"  		      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="phoroptor.osin.cyl" +	    <lineedit name="cycloplegisk_refraktion.cyl.osin" map="visutron900plus.osin.cyl"  		      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="phoroptor.osin.axis" +	    <lineedit name="cycloplegisk_refraktion.grader.osin" map="visutron900plus.osin.axis"  		      regexp="|[\d]+" script="lt359gt0" value=""/>  	  </frame>  	</frame> | 
