From e3b89a6ff248301fe26fa0aed661d175e8efd4f8 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Wed, 9 Dec 2009 10:48:51 +0000
Subject: added less than 0,05 to snelle list. a seemingly unrelated problem
 exist in the form of ou not being able to be enabled while both st_hul is
 enabled in odxt and osin of template. i have no idea why

---
 server/xml/macros/visus-manifest_refraktion-1.0.xml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'server/xml/macros/visus-manifest_refraktion-1.0.xml')

diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 35236f6..74b8ea3 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -10,6 +10,10 @@
     fjern tilsvarende GUI felter der ikke skal bruges
   -->
   <resume language="lua">
+    function lttoxml(value)
+      return string.gsub(value, '&lt;', '&amp;lt;')
+    end
+
     out = ''
     if ( getValue('visus.manifest_refraktion.mangler.odxt') == '' or getValue('visus.manifest_refraktion.mangler.osin') == '' or getValue('visus.manifest_refraktion.ou') ~= '' )
     then
@@ -21,7 +25,7 @@
       out = out .. 'o.dxt: '
       if ( getValue('visus.manifest_refraktion.snellen.odxt') ~= '' )
       then
-        out = out .. getValue('visus.manifest_refraktion.snellen.odxt')
+        out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.odxt'))
         if ( getValue('visus.manifest_refraktion.etdrs.odxt') == '' )
         then
 	  out = out .. ', '
@@ -54,7 +58,7 @@
       then
         if ( getValue('visus.manifest_refraktion.st_hul.snellen.odxt') ~= '' )
         then
-          out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.snellen.odxt')
+          out = out .. ', ' .. lttoxml(getValue('visus.manifest_refraktion.st_hul.snellen.odxt'))
         end
         if ( getValue('visus.manifest_refraktion.st_hul.etdrs.odxt') ~= '' )
         then
@@ -74,7 +78,7 @@
       out = out .. 'o.sin: '
       if ( getValue('visus.manifest_refraktion.snellen.osin') ~= '' )
       then
-        out = out .. getValue('visus.manifest_refraktion.snellen.osin')
+        out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.osin'))
         if ( getValue('visus.manifest_refraktion.etdrs.osin') == '' )
         then
 	  out = out .. ', '
@@ -107,13 +111,13 @@
       then
         if ( getValue('visus.manifest_refraktion.st_hul.snellen.osin') ~= '' )
         then
-          out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.snellen.osin')
+          out = out .. ', ' .. lttoxml(getValue('visus.manifest_refraktion.st_hul.snellen.osin'))
         end
         if ( getValue('visus.manifest_refraktion.st_hul.etdrs.osin') ~= '' )
         then
           out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.etdrs.osin') .. ' ETDRS'
         end
-        out = out .. ' st.h.\n'
+        out = out .. ' st.h.'
       end
       out = out .. '\n'
     end
@@ -128,7 +132,7 @@
       out = out .. 'o.u: '
       if ( getValue('visus.manifest_refraktion.snellen.ou') ~= '' )
       then
-        out = out .. getValue('visus.manifest_refraktion.snellen.ou')
+        out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.ou'))
       end
       if ( getValue('visus.manifest_refraktion.etdrs.ou') ~= '' )
       then
@@ -433,6 +437,7 @@
 		<item caption="0,1" value="0,1"/>
 		<item caption="0,08" value="0,08"/>
 		<item caption="0,05" value="0,05"/>
+		<item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		<item caption="6/60" value="6/60"/>
 		<item caption="3/60" value="3/60"/>
 		<item caption="1/18" value="1/18"/>
@@ -599,6 +604,7 @@
 		  <item caption="0,1" value="0,1"/>
 		  <item caption="0,08" value="0,08"/>
 		  <item caption="0,05" value="0,05"/>
+		  <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		  <item caption="6/60" value="6/60"/>
 		  <item caption="3/60" value="3/60"/>
 		  <item caption="1/18" value="1/18"/>
@@ -762,6 +768,7 @@
 		<item caption="0,1" value="0,1"/>
 		<item caption="0,08" value="0,08"/>
 		<item caption="0,05" value="0,05"/>
+		<item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		<item caption="6/60" value="6/60"/>
 		<item caption="3/60" value="3/60"/>
 		<item caption="1/18" value="1/18"/>
@@ -928,6 +935,7 @@
 		  <item caption="0,1" value="0,1"/>
 		  <item caption="0,08" value="0,08"/>
 		  <item caption="0,05" value="0,05"/>
+		  <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		  <item caption="6/60" value="6/60"/>
 		  <item caption="3/60" value="3/60"/>
 		  <item caption="1/18" value="1/18"/>
@@ -1094,6 +1102,7 @@
 		<item caption="0,1" value="0,1"/>
 		<item caption="0,08" value="0,08"/>
 		<item caption="0,05" value="0,05"/>
+		<item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		<item caption="6/60" value="6/60"/>
 		<item caption="3/60" value="3/60"/>
 		<item caption="1/18" value="1/18"/>
-- 
cgit v1.2.3