Merge pull request #35 from OP-TED/develop

Final changes for release

CHANGELOG.md

@@ -6,6 +6,7 @@ This is a bugfix release of the TED XML Data Converter. Some cosmetic changes ar
 ## Bug fixes
 
 * Fatal error in "lot-results" template
+* Improved link between LotResult and Lot
 
 ## Mapping changes
 

development-notices/eforms-xml/19-318420-001-EXP.xml

@@ -50,7 +50,7 @@
                      </efac:SettledContract>
                      <!--Result Lot Identifier (BT-13713)-->
                      <efac:TenderLot>
-                        <cbc:ID schemeName="Lot">1</cbc:ID>
+                        <cbc:ID schemeName="Lot">LOT-0000</cbc:ID>
                      </efac:TenderLot>
                   </efac:LotResult>
                   <efac:LotTender><!--Tender Technical Identifier (OPT-321)-->

xslt/functions-and-data.xslt

@@ -145,9 +145,11 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
 		<xsl:for-each select="$ted-form-main-element/*:OBJECT_CONTRACT/*:OBJECT_DESCR">
 			<lot>
 				<xsl:variable name="lot-no"><xsl:value-of select="*:LOT_NO"/></xsl:variable>
+				<xsl:variable name="item-no"><xsl:value-of select="@ITEM"/></xsl:variable>
 				<xsl:variable name="lot-no-is-convertible" select="(($lot-no eq '') or (fn:matches($lot-no, '^[1-9][0-9]{0,3}$')))"/>
 				<path><xsl:value-of select="functx:path-to-node-with-pos(.)"/></path>
 				<lot-no><xsl:value-of select="$lot-no"/></lot-no>
+				<item-no><xsl:value-of select="$item-no"/></item-no>
 				<xsl:if test="$lot-no-is-convertible"><is-convertible/></xsl:if>
 				<lot-id>
 					<xsl:choose>

xslt/notice-result.xslt

@@ -281,10 +281,14 @@ These instructions can be un-commented to show the variables
 			<xsl:variable name="result-lot-identifier">
 				<xsl:variable name="lot-no" select="@lot-number"/>
 				<xsl:variable name="lotid" select="$lot-numbers-map//lot[lot-no = $lot-no][1]/fn:string(lot-id)"/>
+				<xsl:variable name="lotidfromitem" select="$lot-numbers-map//lot[item-no = $lot-no][1]/fn:string(lot-id)"/>
 				<xsl:choose>
 					<xsl:when test="$lotid">
 						<xsl:value-of select="$lotid"/>
 					</xsl:when>
+					<xsl:when test="$lotidfromitem">
+						<xsl:value-of select="$lotidfromitem"/>
+					</xsl:when>
 					<xsl:otherwise>
 						<xsl:value-of select="$lot-no"/>
 					</xsl:otherwise>