diff options
23 files changed, 98 insertions, 90 deletions
diff --git a/server/xml/macros/90d_linse-1.0.xml b/server/xml/macros/90d_linse-1.0.xml index d18d9be..01d2541 100644 --- a/server/xml/macros/90d_linse-1.0.xml +++ b/server/xml/macros/90d_linse-1.0.xml @@ -118,11 +118,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -138,11 +138,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/akselaengde-1.0.xml b/server/xml/macros/akselaengde-1.0.xml index 087ce80..bb670ea 100644 --- a/server/xml/macros/akselaengde-1.0.xml +++ b/server/xml/macros/akselaengde-1.0.xml @@ -20,6 +20,8 @@ return out </resume> <queries> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> <map name="missing_eye_odxt_map"> @@ -33,11 +35,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -53,11 +55,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml index 756129b..140b42c 100644 --- a/server/xml/macros/autorefraktion-1.0.xml +++ b/server/xml/macros/autorefraktion-1.0.xml @@ -50,11 +50,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -70,11 +70,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/central_corneatykkelse-1.0.xml b/server/xml/macros/central_corneatykkelse-1.0.xml index fd74b71..8b26f04 100644 --- a/server/xml/macros/central_corneatykkelse-1.0.xml +++ b/server/xml/macros/central_corneatykkelse-1.0.xml @@ -20,6 +20,8 @@ return out </resume> <queries> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> <map name="missing_eye_odxt_map"> @@ -33,11 +35,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -53,11 +55,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml index f705d0d..964aaeb 100644 --- a/server/xml/macros/egen_brille-1.0.xml +++ b/server/xml/macros/egen_brille-1.0.xml @@ -51,11 +51,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -71,11 +71,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source @@ -92,7 +92,7 @@ -- convert . to , value = string.gsub(value, '[.]', ',') timestamp = brillemaaler.sf.timestamp.osin - source = brillemaaler.sf.kilde.osin + source = brillemaaler.sf.osin.source end return value, timestamp, source </map> @@ -108,7 +108,7 @@ -- convert . to , value = string.gsub(value, '[.]', ',') timestamp = brillemaaler.cyl.timestamp.osin - source = brillemaaler.cyl.kilde.osin + source = brillemaaler.cyl.osin.source end return value, timestamp, source </map> @@ -124,7 +124,7 @@ -- convert . to , value = string.gsub(value, '[.]', ',') timestamp = brillemaaler.sf.timestamp.odxt - source = brillemaaler.sf.kilde.odxt + source = brillemaaler.sf.odxt.source end return value, timestamp, source </map> @@ -140,7 +140,7 @@ -- convert . to , value = string.gsub(value, '[.]', ',') timestamp = brillemaaler.cyl.timestamp.odxt - source = brillemaaler.cyl.kilde.odxt + source = brillemaaler.cyl.odxt.source end return value, timestamp, source </map> diff --git a/server/xml/macros/header-1.0.xml b/server/xml/macros/header-1.0.xml index 80e0f7e..191f05e 100644 --- a/server/xml/macros/header-1.0.xml +++ b/server/xml/macros/header-1.0.xml @@ -18,11 +18,11 @@ timestamp = 0 source = 'pentominos' - if(cpr and cpr.cpr and cpr.cpr.value and cpr.cpr.timestamp and cpr.cpr.kilde) + if(cpr and cpr.cpr and cpr.cpr.value and cpr.cpr.timestamp and cpr.cpr.source) then value = string.sub(cpr.cpr.value,1,6) .. '-' .. string.sub(cpr.cpr.value,7,11) timestamp = cpr.cpr.timestamp - source = cpr.cpr.kilde + source = cpr.cpr.source end return value, timestamp, source diff --git a/server/xml/macros/oct_konklusion-1.0.xml b/server/xml/macros/oct_konklusion-1.0.xml index 27de1e4..532b677 100644 --- a/server/xml/macros/oct_konklusion-1.0.xml +++ b/server/xml/macros/oct_konklusion-1.0.xml @@ -53,11 +53,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -73,11 +73,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/oct_maaling-1.0.xml b/server/xml/macros/oct_maaling-1.0.xml index 0a961b6..a3dc291 100644 --- a/server/xml/macros/oct_maaling-1.0.xml +++ b/server/xml/macros/oct_maaling-1.0.xml @@ -48,11 +48,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -68,11 +68,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/oejentryk-1.0.xml b/server/xml/macros/oejentryk-1.0.xml index 800da90..fcca504 100644 --- a/server/xml/macros/oejentryk-1.0.xml +++ b/server/xml/macros/oejentryk-1.0.xml @@ -53,11 +53,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -73,11 +73,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/pupilstoerrelse-1.0.xml b/server/xml/macros/pupilstoerrelse-1.0.xml index a5f5134..cee866b 100644 --- a/server/xml/macros/pupilstoerrelse-1.0.xml +++ b/server/xml/macros/pupilstoerrelse-1.0.xml @@ -20,6 +20,8 @@ return out </resume> <queries> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> <map name="missing_eye_odxt_map"> @@ -33,11 +35,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -53,11 +55,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/ref-spaltelampe-1.0.xml b/server/xml/macros/ref-spaltelampe-1.0.xml index 2986033..95866fe 100644 --- a/server/xml/macros/ref-spaltelampe-1.0.xml +++ b/server/xml/macros/ref-spaltelampe-1.0.xml @@ -216,11 +216,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -236,11 +236,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/ref_90d_linse-1.0.xml b/server/xml/macros/ref_90d_linse-1.0.xml index b8b0f5f..059958b 100644 --- a/server/xml/macros/ref_90d_linse-1.0.xml +++ b/server/xml/macros/ref_90d_linse-1.0.xml @@ -60,11 +60,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -80,11 +80,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/spaltelampe-1.0.xml b/server/xml/macros/spaltelampe-1.0.xml index 6b2128b..d5edb31 100644 --- a/server/xml/macros/spaltelampe-1.0.xml +++ b/server/xml/macros/spaltelampe-1.0.xml @@ -55,11 +55,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -75,11 +75,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/spaltelampe-template-1.0.xml b/server/xml/macros/spaltelampe-template-1.0.xml index db22dc5..a983226 100644 --- a/server/xml/macros/spaltelampe-template-1.0.xml +++ b/server/xml/macros/spaltelampe-template-1.0.xml @@ -216,11 +216,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -236,11 +236,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/tidligere_oejensygdomme-1.0.xml b/server/xml/macros/tidligere_oejensygdomme-1.0.xml index 753b35c..133a567 100644 --- a/server/xml/macros/tidligere_oejensygdomme-1.0.xml +++ b/server/xml/macros/tidligere_oejensygdomme-1.0.xml @@ -35,12 +35,12 @@ ${missing_eye_osin}</resume> <frame layout="hbox" caption="Specifikt for det videre forløb"> <frame layout="hbox"> - <checkbox caption="Intet o.dxt." + <checkbox caption="Intet højre øje" name="missing_eye_odxt" - truevalue="Intet o.dxt." falsevalue="" value=""/> - <checkbox caption="Intet o.sin." + truevalue="Intet højre øje" falsevalue="" value=""/> + <checkbox caption="Intet venstre øje" name="missing_eye_osin" - truevalue="Intet o.sin." falsevalue="" value=""/> + truevalue="Intet venstre øje" falsevalue="" value=""/> </frame> </frame> diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml index c2f9fca..10e7bc2 100644 --- a/server/xml/macros/tonometri-1.0.xml +++ b/server/xml/macros/tonometri-1.0.xml @@ -35,11 +35,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -55,11 +55,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml index 1396540..fea95a2 100644 --- a/server/xml/macros/topografi-1.0.xml +++ b/server/xml/macros/topografi-1.0.xml @@ -20,6 +20,8 @@ return out </resume> <queries> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> <map name="missing_eye_odxt_map"> diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml index 71d6b13..9319005 100644 --- a/server/xml/macros/visus-1.0.xml +++ b/server/xml/macros/visus-1.0.xml @@ -70,11 +70,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -90,11 +90,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/visus-autoref-1.0.xml b/server/xml/macros/visus-autoref-1.0.xml index 6d19cc1..b64e476 100644 --- a/server/xml/macros/visus-autoref-1.0.xml +++ b/server/xml/macros/visus-autoref-1.0.xml @@ -102,11 +102,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -122,11 +122,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/visus-egen_korr-1.0.xml b/server/xml/macros/visus-egen_korr-1.0.xml index fef6f3c..4f4d29f 100644 --- a/server/xml/macros/visus-egen_korr-1.0.xml +++ b/server/xml/macros/visus-egen_korr-1.0.xml @@ -162,11 +162,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -182,11 +182,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml index 974b888..35236f6 100644 --- a/server/xml/macros/visus-manifest_refraktion-1.0.xml +++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml @@ -162,11 +162,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -182,11 +182,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml index 7c9c3ca..1e6cb13 100644 --- a/server/xml/macros/visus-template-1.0.xml +++ b/server/xml/macros/visus-template-1.0.xml @@ -182,11 +182,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -202,11 +202,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml index e60e031..05d0d39 100644 --- a/server/xml/macros/visus-uden_korr-1.0.xml +++ b/server/xml/macros/visus-uden_korr-1.0.xml @@ -142,11 +142,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.kilde + source = missing_eye_odxt.source end end return value, timestamp, source @@ -162,11 +162,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.kilde + source = missing_eye_osin.source end end return value, timestamp, source |