Server now parses XML and handles include.

3 files changed, 44 insertions, 28 deletions

diff --git a/server/xml/Makefile.am b/server/xml/Makefile.am
index 3ad491e..0e86339 100644
--- a/server/xml/Makefile.am
+++ b/server/xml/Makefile.am
@@ -1,7 +1,9 @@
 EXTRA_DIST = \
-	example.xml
+	example.xml \
+	patient.xml
 
 xmldir = $(datadir)/xml
 
 xml_DATA = \
-	example.xml
+	example.xml \
+	patient.xml
diff --git a/server/xml/example.xml b/server/xml/example.xml
index 3e31f56..60068ca 100644
--- a/server/xml/example.xml
+++ b/server/xml/example.xml
@@ -1,27 +1,31 @@
-  <macro name="fundus" version="1.0">
-    <window name="mainwindow"
-            caption="Fundus"
-            width="800"
-            height="600"
-            layout="vbox">
-      <include name="patient"/>
-      <frame name="spl_frame" caption="Spl:" layout="vbox">
-	<textedit name="spl_note" value="På begge sider alderssvarende forhold. Der er let katarakt, som dog ikke er operationskrævende."/>
+<?xml version="1.0" encoding="UTF-8"?>
+<macro name="fundus" version="1.0">
+  <window name="mainwindow"
+          caption="Fundus"
+          width="500"
+          height="500"
+          layout="vbox">
+    <include name="patient"/>
+    <frame name="spl_frame" caption="Spl:" layout="vbox">
+      <textedit name="spl_note" regexp=".*" value="På begge sider alderssvarende forhold. Der er let katarakt, som dog ikke er operationskrævende."/>
+    </frame>
+    <frame name="linse_frame" caption="Linse:" layout="vbox">
+      <lineedit name="linse" regexp="[0-9]{5}" value="90-D linse"/>
+      <textedit name="linse_note" regexp=".*" value="Der findes centrale atrofiske forandringer."/>
+    </frame>
+    <frame name="swelling_frame" layout="hbox">
+      <label name="swelling" caption="Der findes central hævelse med:"/>
+      <frame name="swelling_radios" layout="vbox">
+	<radiobuttons name="radio" layout="vbox">
+          <item caption="Randblødning" value="rand"/>
+	  <item caption="Exsudater" value="exsudater"/>
+	  <item caption="Blahblah" value="blabla"/>
+        </radiobuttons>
       </frame>
-      <frame name="linse_frame" caption="Linse:" layout="vbox">
-	<lineedit name="linse" caption="90-D linse"/>
-	<textedit name="linse_note" value="Der findes centrale atrofiske forandringer."/>
-      </frame>
-      <frame name="swelling_frame" layout="hbox">
-	<label name="swelling" caption="Der findes central hævelse med:"/>
-	<frame name="swelling_radios" layout="vbox"/>
-	  <radiobutton name="radio1" caption="Randblødning"/>
-	  <radiobutton name="radio2" caption="Exsudater"/>
-	</frame>
-      </frame>
-      <frame name="buttons" layout="hbox">
-	<button name="cancel" caption="Annuller"/>
-	<button name="commit" caption="Godkend"/>
-      </frame>
-    </window>
-  </macro>
+    </frame>
+    <frame name="buttons" layout="hbox">
+      <button name="cancel" caption="Annuller" action="cancel"/>
+      <button name="commit" caption="Godkend" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/patient.xml b/server/xml/patient.xml
new file mode 100644
index 0000000..751f8f0
--- /dev/null
+++ b/server/xml/patient.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<macro name="patient" version="1.0">
+  <frame name="cpr_frame" caption="CPR" layout="vbox">
+    <lineedit name="patient_cpr" regexp="\d{6}-{0,1}\d{4}" value=""/>
+  </frame>
+  <frame name="name_frame" caption="Navn:" layout="vbox">
+    <lineedit name="patient_navn" regexp=".+" value=""/>
+    <textedit name="patient_note" regexp=".*" value=""/>
+  </frame>
+</macro>