Be more lenient in ada id naming for building blocks, to allow for strings like 'CONS-MTD'

Author: weteringac

src/MP9-3-0-0-beta/_internalTools/ant-build/build-ada2nts-mp-930.xml

@@ -78,6 +78,7 @@
         </delete>
 
         <!-- Retrieve -->
+        <echo>[convert_ada2nts_pull_meddata_930] Retrieve input.dir = ${xsl.input.mg.abs}, output.dir = ${xsl.output.mg.abs}"</echo>
         <antcall target="convert_ada_2_nts_medicationdata-pull_sub">
             <param name="xsl.out" value="${xsl.output.dummy}"/>
             <param name="transaction.type" value="Retrieve"/>

src/MP9-3-0-0-beta/_internalTools/xslt/ada_2_nts-medicationdata-pull.xsl

@@ -645,10 +645,10 @@
             <xsl:when test="contains($buildingBlockShort, 'MA')">MedicationAgreement</xsl:when>
             <xsl:when test="contains($buildingBlockShort, 'MGB')">MedicationUse</xsl:when>
             <xsl:when test="contains($buildingBlockShort, 'TA')">AdministrationAgreement</xsl:when>
-            <xsl:when test="$buildingBlockShort = 'VV'">DispenseRequest</xsl:when>
-            <xsl:when test="$buildingBlockShort = 'MTD'">MedicationAdministration</xsl:when>
-            <xsl:when test="$buildingBlockShort = 'MVE'">MedicationDispense</xsl:when>
+            <xsl:when test="contains($buildingBlockShort, 'MTD')">MedicationAdministration</xsl:when>
             <xsl:when test="contains($buildingBlockShort, 'WDS')">VariableDosingRegimen</xsl:when>
+            <xsl:when test="contains($buildingBlockShort, 'VV')">DispenseRequest</xsl:when>
+            <xsl:when test="contains($buildingBlockShort, 'MVE')">MedicationDispense</xsl:when>
             <xsl:otherwise>
                 <xsl:call-template name="util:logMessage">
                     <xsl:with-param name="level" select="$logFATAL"/>