From df88d843e13bcd3da067b882d91fc4c02365a1af Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Mon, 2 Mar 2009 07:52:10 +0000
Subject: Macro fix

---
 server/xml/macros/B.2.2.4.2.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'server/xml/macros/B.2.2.4.2.xml')

diff --git a/server/xml/macros/B.2.2.4.2.xml b/server/xml/macros/B.2.2.4.2.xml
index 3980234..d4735c0 100644
--- a/server/xml/macros/B.2.2.4.2.xml
+++ b/server/xml/macros/B.2.2.4.2.xml
@@ -14,17 +14,22 @@
 <macro name="B.2.2.4.2" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('oct.right.missing') == '' )
-    then
-      out = out .. 'Central nethindetykkelse, højre: ' .. getValue('oct.right.thickness')
-            .. ' µm, ' .. getValue('oct.right.description') .. '.\n'
-    end
+    if ( getValue('oct.right.missing') == '' or getValue('oct.left.missing') == '' )
+		then
+		  out = out .. 'Central nethindetykkelse:\n'
 
-    if ( getValue('oct.left.missing') == '' )
-    then
-      out = out .. 'Central nethindetykkelse, venstre: ' .. getValue('oct.left.thickness') 
-          .. ' µm, ' .. getValue('oct.left.description') .. '.\n'
-    end
+      if ( getValue('oct.right.missing') == '' )
+      then
+        out = out .. 'OCT o.dxt ' .. getValue('oct.right.thickness') .. ' µm '
+		        .. getValue('oct.right.description') .. '.\n'
+      end
+
+      if ( getValue('oct.left.missing') == '' )
+      then
+        out = out .. 'OCT o.sin ' .. getValue('oct.left.thickness') .. ' µm '
+            .. getValue('oct.left.description') .. '.\n'
+      end
+		end
 
     if ( getValue('oct.comments') ~= '' )
     then
-- 
cgit v1.2.3