From a991e6905eb5ccfc23d708613426a0f2ce23d7b1 Mon Sep 17 00:00:00 2001
From: martindholmes <mholmes@uvic.ca>
Date: Tue, 25 Nov 2025 16:07:21 -0800
Subject: [PATCH 1/2] Create backup of config file if overwriting it, per issue
 #363.

---
 build.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.xml b/build.xml
index c54f5996..0dc02659 100644
--- a/build.xml
+++ b/build.xml
@@ -276,6 +276,17 @@ Would you like to overwrite the existing file or &#x0a;
 create a new file? (o=overwrite, n=new)"
            validargs="o,n"
            defaultvalue="n"/>
+    
+    <!-- If overwriting, we'll make sure a backup is created first
+         in case something goes wrong. -->
+    <if>
+      <equals arg1="${outputStrategy}" arg2="o"/>
+      <then>
+        <copy file="${ssBaseDir.converted}/${ssConfig}" tofile="${ssBaseDir.converted}/${ssConfig}.BAK"/>
+        <echo message="A backup of your config file has been created: ${ssBaseDir.converted}/${ssConfig}.BAK"/>
+      </then>
+    </if>
+    
     <!--<echo message="${outputStrategy}"/>-->
     <java classpath="${ssSaxon}" classname="net.sf.saxon.Transform" failonerror="true" fork="true">
       <arg value="-xsl:${ssBaseDir.converted}/xsl/convert_v1_to_v2.xsl"/>

From b0c978946c64f64e226549d6e93b90b3695c24e1 Mon Sep 17 00:00:00 2001
From: martindholmes <mholmes@uvic.ca>
Date: Mon, 1 Dec 2025 13:21:42 -0800
Subject: [PATCH 2/2] Fix for issue #363: bring v1 to v2 conversion up to date
 with schema processing map.

---
 xsl/convert_v1_to_v2.xsl | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/xsl/convert_v1_to_v2.xsl b/xsl/convert_v1_to_v2.xsl
index d6d82aa6..abdbd244 100644
--- a/xsl/convert_v1_to_v2.xsl
+++ b/xsl/convert_v1_to_v2.xsl
@@ -245,12 +245,12 @@
         <xd:desc>Function to create boolean string values from unreliable or absent input.</xd:desc>
         <xd:param name="input" as="item()?">May be an element, attribute, or text node
             which contains the original value if it exists.</xd:param>
-        <xd:param name="default" as="xs:string">The default value to use if the input does 
+        <xd:param name="default" as="xs:boolean">The default value to use if the input does 
             not provide anything usable.</xd:param>
     </xd:doc>
     <xsl:function name="hcmc:getStrBoolean" as="xs:string">
         <xsl:param name="input" as="item()?"/>
-        <xsl:param name="default" as="xs:string"/>
+        <xsl:param name="default" as="xs:boolean"/>
         <xsl:choose>
             <xsl:when test="$input and matches($input, $reBooleanTrue, 'i')">
                 <xsl:sequence select="'true'"/>
@@ -258,8 +258,11 @@
             <xsl:when test="$input and matches($input, $reBooleanFalse, 'i')">
                 <xsl:sequence select="'false'"/>
             </xsl:when>
+            <xsl:when test="$default">
+                <xsl:sequence select="'true'"/>
+            </xsl:when>
             <xsl:otherwise>
-                <xsl:sequence select="$default"/>
+                <xsl:sequence select="'false'"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
@@ -268,14 +271,15 @@
         <xd:desc>Function to create string values from unreliable or absent input.</xd:desc>
         <xd:param name="input" as="item()?">May be an element, attribute, or text node
             which contains the original value if it exists.</xd:param>
-        <xd:param name="default" as="xs:string">The default value to use if the input does 
+        <xd:param name="default" as="xs:string?">The default value to use if the input does 
         not provide anything usable.</xd:param>
     </xd:doc>
     <xsl:function name="hcmc:getString" as="xs:string">
         <xsl:param name="input" as="item()?"/>
-        <xsl:param name="default" as="xs:string"/>
+        <xsl:param name="default" as="xs:string?"/>
+        <xsl:message select="xs:string($input)"/>
         <xsl:choose>
-            <xsl:when test="$input and string-length($input) gt 0">
+            <xsl:when test="xs:string($input) and string-length($input) gt 0">
                 <xsl:sequence select="xs:string($input)"/>
             </xsl:when>
             <xsl:otherwise>