From e4f42229ce033fb5141db31053add96723dcf46b Mon Sep 17 00:00:00 2001
From: Simone Perini <s.perini@saxos.it>
Date: Wed, 7 Feb 2024 15:55:39 +0100
Subject: [PATCH 1/2] Fix "fsl_base.pas" conditional defines: IFOPT D+

---
 library/fsl/fsl_base.pas | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/fsl/fsl_base.pas b/library/fsl/fsl_base.pas
index 1b76042d5..294a59ead 100644
--- a/library/fsl/fsl_base.pas
+++ b/library/fsl/fsl_base.pas
@@ -1151,7 +1151,9 @@ procedure TFslObject.Free;
       clsName := 'n/a';
       nmCls  := 'n/a';
       try
+        {$IFOPT D+}
         nmCls := FNamedClass;
+        {$ENDIF}
       except
         nmCls := '??';
       end;
@@ -1467,7 +1469,9 @@ function TFslObject.debugInfo: String;
 
 procedure TFslObject.updateDebugInfo;
 begin
+  {$IFOPT D+}
   FDebugInfo := debugInfo;
+  {$ENDIF}
 end;
 
 function TFslObject.ObjectCrossesThreads: boolean;
@@ -1510,7 +1514,7 @@ function TFslObject.updatedDebugInfo: String;
     updateDebugInfo;
   except
   end;
-  result := FDebugInfo;
+  result := {$IFOPT D+}FDebugInfo{$ELSE}''{$ENDIF};
 end;
 
 function TFslObject.CheckCondition(bCorrect: Boolean; const sMethod, sMessage: String): Boolean;

From 877fc409a016626966369dd916fbcb2273d3ce82 Mon Sep 17 00:00:00 2001
From: Simone Perini <s.perini@saxos.it>
Date: Tue, 5 Mar 2024 12:23:42 +0100
Subject: [PATCH 2/2] Fix CDAWriter.WriteANY writes double attributes
 xsi:type="CD"

---
 library/cda/cda_writer.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/cda/cda_writer.pas b/library/cda/cda_writer.pas
index 538345641..92b6bfd6c 100644
--- a/library/cda/cda_writer.pas
+++ b/library/cda/cda_writer.pas
@@ -961,7 +961,7 @@ procedure TCDAWriter.WriteCDA(oXml: TXmlBuilder; oDoc: TcdaClinicalDocument);
     if (oDT is Tv3PQ) Then
       WritePQ(sPath, oXml, sName, oDT as Tv3PQ, bOptional)
     Else if (oDT is Tv3CD) Then
-      WriteCD(sPath, oXml, sName, oDT as Tv3CD, bOptional, true)
+      WriteCD(sPath, oXml, sName, oDT as Tv3CD, bOptional)
     Else if (oDT is Tv3BL) Then
       WriteBL(sPath, oXml, sName, oDT as Tv3BL, bOptional)
     Else if (oDT is Tv3CS) Then