diff options
| author | deva <deva> | 2008-05-20 14:03:10 +0000 |
|---|---|---|
| committer | deva <deva> | 2008-05-20 14:03:10 +0000 |
| commit | 556f00e4af55e78836c45f47b0662ab44bbb8b48 (patch) | |
| tree | a5c315b35d400a397a35a86b86fe656d3a829af9 /server/xml | |
| parent | 91d56787bec83a3a7c2ad6afd84d2b82c5d869b9 (diff) | |
Made fixes pointed out by GCC 4.2 and -D_FORTIFY_SOURCES=2
Diffstat (limited to 'server/xml')
| -rw-r--r-- | server/xml/Makefile.am | 2 | ||||
| -rw-r--r-- | server/xml/example2.xml | 26 |
2 files changed, 16 insertions, 12 deletions
diff --git a/server/xml/Makefile.am b/server/xml/Makefile.am index ba48c9b..62905db 100644 --- a/server/xml/Makefile.am +++ b/server/xml/Makefile.am @@ -1,11 +1,9 @@ EXTRA_DIST = \ - example.xml \ patient.xml \ start.xml xmldir = $(datadir)/xml xml_DATA = \ - example.xml \ patient.xml \ start.xml diff --git a/server/xml/example2.xml b/server/xml/example2.xml index 42f4755..d30bfec 100644 --- a/server/xml/example2.xml +++ b/server/xml/example2.xml @@ -1,21 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version='1.0' encoding='UTF-8'?> <template name="testcourse"> <course> <macro name="example2" version="1.0" - resume="${linse1} -${linse2}"> + resume="${linse1}${linse2}"> <queries> - <query class="lensmeter" ttl="10000"/> - <query class="autophoropter" ttl="10000" automap="true"/> + <query device_id="lensmeter" device_type="lensmeter" class="lensmeter" ttl="10000"/> </queries> <maps> <map name="axis"> -- LUA program return right.axis </map> - <map name="dioptri"> + <map name="sphere"> -- LUA program - return right.dioptri + return right.sphere + </map> + <map name="cyl"> + -- LUA program + return right.cyl </map> </maps> <window name="mainwindow" @@ -26,11 +28,15 @@ ${linse2}"> <frame name="linse_frame" caption="Linser:" layout="vbox"> <frame name="linse_framea" layout="hbox"> <label name="a" width="300" caption="Akse rotation:"/> - <lineedit name="linse1" regexp="[0-9]{1,3}D" map="axis" value="90K"/> + <lineedit name="linse1" regexp="[0-9]{1,3}" map="axis" value="90K"/> </frame> <frame name="linse_frameb" layout="hbox"> - <label name="b" width="300" caption="Diotri:"/> - <lineedit name="linse2" regexp="[0-9]{1,3}D" map="dioptri" value="90K"/> + <label name="b" width="300" caption="Sphere:"/> + <lineedit name="linse2" regexp="[0-9]{1,3}" map="sphere" value="90K"/> + </frame> + <frame name="linse_framec" layout="hbox"> + <label name="c" width="300" caption="Sphere:"/> + <lineedit name="linse3" regexp="[0-9]{1,3}" map="cyl" value="90K"/> </frame> </frame> <frame name="buttons" layout="hbox"> |