Skip to content

Commit

Permalink
fix: alpha2t language code not accepted by documents service
Browse files Browse the repository at this point in the history
  • Loading branch information
@MLenterman
MLenterman committed Nov 23, 2023
1 parent 6a1132c commit 56c2476
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 34 deletions.
24 changes: 24 additions & 0 deletions src/main/configurations/Translate/Common/xsl/GetISO639Code.xslt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<xsl:stylesheet exclude-result-prefixes="xsl xs" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
<xsl:param name="Alpha2" select="''" as="xs:string" />
<xsl:param name="Alpha3t" select="''" as="xs:string" />

<xsl:key name="alpha2" match="row" use="alpha2"/>
<xsl:key name="alpha3t" match="row" use="alpha3-t"/>

<xsl:template match="/root">
<xsl:choose>
<xsl:when test="$Alpha2">
<xsl:for-each select="key('alpha2', $Alpha2)">
<xsl:value-of select="alpha3-t"/>
</xsl:for-each>
</xsl:when>
<xsl:when test="$Alpha3t">
<xsl:for-each select="key('alpha3t', $Alpha3t)">
<xsl:value-of select="alpha2"/>
</xsl:for-each>
</xsl:when>
<xsl:otherwise />
</xsl:choose>
</xsl:template>
</xsl:stylesheet>
59 changes: 59 additions & 0 deletions src/main/configurations/Translate/Configuration_ConvertISO639Taal.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
<Adapter name="ConvertISO639Taal"
active="${ConvertISO639Taal.Active}"
description="">

<Receiver name="ConvertISO639Taal">
<JavaListener name="ConvertISO639Taal"/>
</Receiver>

<Pipeline>
<Exits>
<Exit name="EXIT" state="SUCCESS"/>
<Exit name="EXCEPTION" state="ERROR"/>
</Exits>

<SenderPipe name="GetISO639CodesFromLocalFSSender">
<IbisLocalSender
name="GetISO639CodesFromLocalFSLocalSender"
javaListener="ImportFromLocalFS">
<Param name="FileName" value="${ISO639_Codes_path}"/>
</IbisLocalSender>
<Forward name="success" path="Alpha2Check"/>
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<XmlSwitchPipe name="Alpha2Check"
xpathExpression="string-length($Alpha2) > 0"
>
<Param name="Alpha2" sessionKey="Alpha2" />
<Forward name="true" path="GetAlpha3tCodeFromAlpha2" />
<Forward name="false" path="Alpha3tCheck" />
</XmlSwitchPipe>

<XmlSwitchPipe name="Alpha3tCheck"
xpathExpression="string-length($Alpha3t) > 0"
>
<Param name="Alpha3t" sessionKey="Alpha3t" />
<Forward name="true" path="GetAlpha2CodeFromAlpha3t" />
<Forward name="false" path="EXCEPTION" />
</XmlSwitchPipe>

<XsltPipe
name="GetAlpha3tCodeFromAlpha2"
styleSheetName="Common/xsl/GetISO639Code.xslt"
>
<Param name="Alpha2" sessionKey="Alpha2" />
<Forward name="success" path="EXIT" />
</XsltPipe>

<XsltPipe
name="GetAlpha2CodeFromAlpha3t"
styleSheetName="Common/xsl/GetISO639Code.xslt"
>
<Param name="Alpha3t" sessionKey="Alpha3t" />
<Forward name="success" path="EXIT" />
</XsltPipe>
</Pipeline>
</Adapter>
</Module>
30 changes: 29 additions & 1 deletion src/main/configurations/bpel/Configuration_Bpel_Documents_UploadAttachment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,38 @@
lineLength="0"
storeResultInSessionKey="ZgwEnkelvoudigInformatieObjectInhoud"
>
<Forward name="success" path="CreateAddDocumentRequestMessage" />
<Forward name="success" path="ConvertISO639TaalSender" />
<Forward name="Exception" path="EXCEPTION" />
</Base64Pipe>

<SenderPipe
name="ConvertISO639TaalSender"
getInputFromFixedValue="&lt;dummy/&gt;"
storeResultInSessionKey="Alpha2"
>
<IbisLocalSender
name="ConvertISO639TaalLocalSender"
javaListener="ConvertISO639Taal"
>
</IbisLocalSender>
<Param name="Alpha3t" sessionKey="ZgwEnkelvoudigInformatieObject" xpathExpression="//taal" />
<Forward name="success" path="EnrichZgwEnkelvoudigInformatieObject" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<XsltPipe
name="EnrichZgwEnkelvoudigInformatieObject"
getInputFromSessionKey="ZgwEnkelvoudigInformatieObject"
styleSheetName="Zgw/Documenten/Model/ZgwEnkelvoudigInformatieObject.xslt"
storeResultInSessionKey="ZgwEnkelvoudigInformatieObject"
>
<Param name="Taal" xpathExpression="concat(concat($Alpha2, '_'), upper-case($Alpha2))">
<Param name="Alpha2" sessionKey="Alpha2" />
</Param>
<Forward name="success" path="CreateAddDocumentRequestMessage"/>
<Forward name="error" path="EXCEPTION"/>
</XsltPipe>

<XsltPipe
name="CreateAddDocumentRequestMessage"
getInputFromFixedValue="&lt;dummy/&gt;"
Expand Down
0 ...el/PostZgwEnkelvoudigInformatieObject.xsd → ...el/PostZgwEnkelvoudigInformatieObject.xsd
View file
File renamed without changes.
0 ...Model/ZgwEnkelvoudigInformatieObject.xslt → ...Model/ZgwEnkelvoudigInformatieObject.xslt
View file
File renamed without changes.
33 changes: 0 additions & 33 deletions ...1.1.0/Zgw/Documenten/ZgwDocumentenApi.xsd → ...urces/Zgw/Documenten/ZgwDocumentenApi.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@
<xs:element name="datum" type="xs:date" minOccurs="1" maxOccurs="1" />
</xs:sequence>
</xs:complexType>
<xs:simpleType name="Vertrouwelijkheidaanduiding">
<xs:restriction base="xs:string">
<xs:enumeration value="openbaar" />
<xs:enumeration value="beperkt_openbaar" />
<xs:enumeration value="intern" />
<xs:enumeration value="zaakvertrouwelijk" />
<xs:enumeration value="vertrouwelijk" />
<xs:enumeration value="confidentieel" />
<xs:enumeration value="geheim" />
<xs:enumeration value="zeer_geheim" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="Algoritme">
<xs:restriction base="xs:string">
<xs:enumeration value="crc_16" />
Expand Down Expand Up @@ -73,25 +61,4 @@
<xs:enumeration value="pki" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="AardRelatie">
<xs:restriction base="xs:string">
<xs:enumeration value="vervolg" />
<xs:enumeration value="onderwerp" />
<xs:enumeration value="bijdrage" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="Archiefnominatie">
<xs:restriction base="xs:string">
<xs:enumeration value="blijvend_bewaren" />
<xs:enumeration value="vernietigen" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="Archiefstatus">
<xs:restriction base="xs:string">
<xs:enumeration value="nog_te_archiveren" />
<xs:enumeration value="gearchiveerd" />
<xs:enumeration value="gearchiveerd_procestermijn_onbekend" />
<xs:enumeration value="overgedragen" />
</xs:restriction>
</xs:simpleType>
</xs:schema>

0 comments on commit 56c2476

Please sign in to comment.