diff options
author | senator <senator> | 2009-11-17 10:43:45 +0000 |
---|---|---|
committer | senator <senator> | 2009-11-17 10:43:45 +0000 |
commit | ce08ba4689b54f8e27a5418f490d9c87fe71cc78 (patch) | |
tree | 36e1933cd6d58f5f98b6dc37328e7258b1f0544f /server/xml/macros/egen_brille-1.0.xml | |
parent | 1a6bd6fdbfffa6fb120b1464854a95b43221719d (diff) |
moved all .osin. instances from any instance containing it to the end of the instance. I have checked to find errors but NOT very thoroughly. The XML files might contain errors, but i will correct these, if any, when i encounter them later on
Diffstat (limited to 'server/xml/macros/egen_brille-1.0.xml')
-rw-r--r-- | server/xml/macros/egen_brille-1.0.xml | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml index 7c0edae..4143e3d 100644 --- a/server/xml/macros/egen_brille-1.0.xml +++ b/server/xml/macros/egen_brille-1.0.xml @@ -2,31 +2,31 @@ <macro name="egen_brille" version="1.0"> <resume language="lua"> out = '' - if ( getValue('lensmeter.odxt.missing') == '' ) + if ( getValue('brillemaaler.mangler.odxt') == '' ) then - out = out .. 'Egen brille, o.dxt: ' .. getValue('lensmeter.odxt.sf') .. ' sf' - if ( getValue('lensmeter.odxt.cyl') ~= '' ) + out = out .. 'Egen brille, o.dxt: ' .. getValue('brillemaaler.sf.odxt') .. ' sf' + if ( getValue('brillemaaler.cyl.odxt') ~= '' ) then - out = out .. ', ' .. getValue('lensmeter.odxt.cyl') .. ' cyl' + out = out .. ', ' .. getValue('brillemaaler.cyl.odxt') .. ' cyl' end - if ( getValue('lensmeter.odxt.grader') ~= '' ) + if ( getValue('brillemaaler.grader.odxt') ~= '' ) then - out = out .. ', ' .. getValue('lensmeter.odxt.grader') .. ' grader\n' + out = out .. ', ' .. getValue('brillemaaler.grader.odxt') .. ' grader\n' else out = out .. '\n' end end - if ( getValue('lensmeter.osin.missing') == '' ) + if ( getValue('brillemaaler.mangler.osin') == '' ) then - out = out .. 'Egen brille, o.sin: ' .. getValue('lensmeter.osin.sf') .. ' sf' - if ( getValue('lensmeter.osin.cyl') ~= '' ) + out = out .. 'Egen brille, o.sin: ' .. getValue('brillemaaler.sf.osin') .. ' sf' + if ( getValue('brillemaaler.cyl.osin') ~= '' ) then - out = out .. ', ' .. getValue('lensmeter.osin.cyl') .. ' cyl' + out = out .. ', ' .. getValue('brillemaaler.cyl.osin') .. ' cyl' end - if ( getValue('lensmeter.osin.grader') ~= '' ) + if ( getValue('brillemaaler.grader.osin') ~= '' ) then - out = out .. ', ' .. getValue('lensmeter.osin.grader') .. ' grader\n' + out = out .. ', ' .. getValue('brillemaaler.grader.osin') .. ' grader\n' else out = out .. '\n' end @@ -36,111 +36,111 @@ </resume> <queries> <query class="lensmeter" ttl="100000"/> - <query service="pracro" class="missing_eye_right" ttl="1000000"/> - <query service="pracro" class="missing_eye_left" ttl="1000000"/> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> - <map name="missing_eye_right_map"> + <map name="missing_eye_odxt_map"> value = 0 timestamp = 0 source = '' - if( missing_eye_right ) + if( missing_eye_odxt ) then - if( missing_eye_right.value and missing_eye_right.value == '' ) + if( missing_eye_odxt.value and missing_eye_odxt.value == '' ) then value = '' - timestamp = missing_eye_right.timestamp - source = missing_eye_right.source + timestamp = missing_eye_odxt.timestamp + source = missing_eye_odxt.source else value = 'mangler' - timestamp = missing_eye_right.timestamp - source = missing_eye_right.source + timestamp = missing_eye_odxt.timestamp + source = missing_eye_odxt.source end end return value, timestamp, source </map> - <map name="missing_eye_left_map"> + <map name="missing_eye_osin_map"> value = 0 timestamp = 0 source = '' - if( missing_eye_left ) + if( missing_eye_osin ) then - if( missing_eye_left.value and missing_eye_left.value == '' ) + if( missing_eye_osin.value and missing_eye_osin.value == '' ) then value = '' - timestamp = missing_eye_left.timestamp - source = missing_eye_left.source + timestamp = missing_eye_osin.timestamp + source = missing_eye_osin.source else value = 'mangler' - timestamp = missing_eye_left.timestamp - source = missing_eye_left.source + timestamp = missing_eye_osin.timestamp + source = missing_eye_osin.source end end return value, timestamp, source </map> - <map name="lensmeter.osin.sf"> + <map name="brillemaaler.sf.osin"> -- Returning 0, 0 invalidates the result value = 0 timestamp = 0 source = 0 - if(lensmeter and lensmeter.osin and lensmeter.osin.sf and lensmeter.osin.sf.value and lensmeter.osin.sf.timestamp) + if(lensmeter and brillemaaler.osin and brillemaaler.sf.osin and brillemaaler.sf.value.osin and brillemaaler.sf.timestamp.osin) then - value = lensmeter.osin.sf.value + value = brillemaaler.sf.value.osin -- convert . to , value = string.gsub(value, '[.]', ',') - timestamp = lensmeter.osin.sf.timestamp - source = lensmeter.osin.sf.source + timestamp = brillemaaler.sf.timestamp.osin + source = brillemaaler.sf.source.osin end return value, timestamp, source </map> - <map name="lensmeter.osin.cyl"> + <map name="brillemaaler.cyl.osin"> -- Returning 0, 0 invalidates the result value = 0 timestamp = 0 source = 0 - if(lensmeter and lensmeter.osin and lensmeter.osin.cyl and lensmeter.osin.cyl.value and lensmeter.osin.cyl.timestamp) + if(lensmeter and brillemaaler.osin and brillemaaler.cyl.osin and brillemaaler.cyl.value.osin and brillemaaler.cyl.timestamp.osin) then - value = lensmeter.osin.cyl.value + value = brillemaaler.cyl.value.osin -- convert . to , value = string.gsub(value, '[.]', ',') - timestamp = lensmeter.osin.cyl.timestamp - source = lensmeter.osin.cyl.source + timestamp = brillemaaler.cyl.timestamp.osin + source = brillemaaler.cyl.source.osin end return value, timestamp, source </map> - <map name="lensmeter.odxt.sf"> + <map name="brillemaaler.sf.odxt"> -- Returning 0, 0 invalidates the result value = 0 timestamp = 0 source = 0 - if(lensmeter and lensmeter.odxt and lensmeter.odxt.sf and lensmeter.odxt.sf.value and lensmeter.odxt.sf.timestamp) + if(lensmeter and brillemaaler.odxt and brillemaaler.sf.odxt and brillemaaler.sf.value.odxt and brillemaaler.sf.timestamp.odxt) then - value = lensmeter.odxt.sf.value + value = brillemaaler.sf.value.odxt -- convert . to , value = string.gsub(value, '[.]', ',') - timestamp = lensmeter.odxt.sf.timestamp - source = lensmeter.odxt.sf.source + timestamp = brillemaaler.sf.timestamp.odxt + source = brillemaaler.sf.source.odxt end return value, timestamp, source </map> - <map name="lensmeter.odxt.cyl"> + <map name="brillemaaler.cyl.odxt"> -- Returning 0, 0 invalidates the result value = 0 timestamp = 0 source = 0 - if(lensmeter and lensmeter.odxt and lensmeter.odxt.cyl and lensmeter.odxt.cyl.value and lensmeter.odxt.cyl.timestamp) + if(lensmeter and brillemaaler.odxt and brillemaaler.cyl.odxt and brillemaaler.cyl.value.odxt and brillemaaler.cyl.timestamp.odxt) then - value = lensmeter.odxt.cyl.value + value = brillemaaler.cyl.value.odxt -- convert . to , value = string.gsub(value, '[.]', ',') - timestamp = lensmeter.odxt.cyl.timestamp - source = lensmeter.odxt.cyl.source + timestamp = brillemaaler.cyl.timestamp.odxt + source = brillemaaler.cyl.source.odxt end return value, timestamp, source </map> @@ -215,24 +215,24 @@ <!-- o.dxt --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.dxt" - name="lensmeter.odxt.missing" script="right_eye" - map="missing_eye_right_map" + name="brillemaaler.mangler.odxt" script="right_eye" + map="missing_eye_odxt_map" truevalue="mangler" falsevalue="" value=""/> <frame name="right_eye_frame" caption="o.dxt" layout="hbox"> <frame layout="vbox"> <label caption="Sf:"/> - <lineedit name="lensmeter.odxt.sf" map="lensmeter.odxt.sf" + <lineedit name="brillemaaler.sf.odxt" map="brillemaaler.sf.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="lensmeter.odxt.cyl" map="lensmeter.odxt.cyl" + <lineedit name="brillemaaler.cyl.odxt" map="brillemaaler.cyl.odxt" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="lensmeter.odxt.grader" map="lensmeter.odxt.grader" + <lineedit name="brillemaaler.grader.odxt" map="brillemaaler.grader.odxt" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> @@ -241,24 +241,24 @@ <!-- o.sin --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.sin" - name="lensmeter.osin.missing" script="left_eye" - map="missing_eye_left_map" + name="brillemaaler.mangler.osin" script="left_eye" + map="missing_eye_osin_map" truevalue="mangler" falsevalue="" value=""/> <frame name="left_eye_frame" caption="o.sin" layout="hbox"> <frame layout="vbox"> <label caption="Sf:"/> - <lineedit name="lensmeter.osin.sf" map="lensmeter.osin.sf" + <lineedit name="brillemaaler.sf.osin" map="brillemaaler.sf.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="lensmeter.osin.cyl" map="lensmeter.osin.cyl" + <lineedit name="brillemaaler.cyl.osin" map="brillemaaler.cyl.osin" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="lensmeter.osin.grader" map="lensmeter.osin.grader" + <lineedit name="brillemaaler.grader.osin" map="brillemaaler.grader.osin" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> |