Commit 39384519 authored by Steinberg, Jan's avatar Steinberg, Jan
Browse files

english subjects only ... and some more logging

parent 49203262

src/main/java/org/gesis/dda/publishing/domain/impl/XsltTransformerOaiPmhBundlesStreamSource.java

+2 −2
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ public class XsltTransformerOaiPmhBundlesStreamSource implements BundlesStreamSo 
                String errorCode = e.getErrorCodeLocalPart();

                if (null != errorCode) {

                    if ("filteraway".equals(errorCode) ) {

                        LOG.debug("1- filtering away oaiPmhIdentifier={}", oaiPmhIdentifier);

                        LOG.debug("Error detail: {}", e.getCause().getLocalizedMessage());

                        LOG.info("1- filtering away oaiPmhIdentifier={}", oaiPmhIdentifier);

                        LOG.info("Error detail: {}", e.getCause().getLocalizedMessage());

                        resultBundle = null;

                        // test if this break is really necessary, taken out. STJ

                        // break;

src/test/resources/xslt/pos-oai_dc-2-xmlbundle.xslt

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
                        or contains($sets, 'ps:Sociology ;')

                        or contains($sets, 'ps:Culture ;')

                        or contains($sets, 'ps:Communication ;'))">

                        <xsl:value-of select="error(QName('','filteraway'), 'is not in defined sets')" />

                        <!--xsl:value-of select="error(QName('','filteraway'), 'is not in defined sets')" /-->

                    </xsl:when>

                    <xsl:otherwise>

                        <xsl:apply-templates select="oai:OAI-PMH/oai:GetRecord/oai:record/oai:metadata/oai_dc:dc" />
@@ -65,7 +65,7 @@ 
        <xsl:apply-templates select="dc:identifier[matches(text(), '^10\..*')]" />

        <!--xsl:apply-templates select="dc:type[@xml:lang='en-US']" /-->

        <xsl:apply-templates select="dc:relation" />

        <xsl:apply-templates select="dc:subject" />

        <xsl:apply-templates select="dc:subject[@xml:lang='en-US']" />

    </xsl:template>

    

    <xsl:template match="dc:relation">
@@ -76,8 +76,8 @@ 
        </xsl:call-template>

    </xsl:template>

    

    <xsl:template match="dc:subject">

        <xsl:if test="not(starts-with(text(), 'Sociology') or starts-with(text(), 'JEL Class'))">

    <xsl:template match="dc:subject[@xml:lang='en-US']">

        <xsl:if test="not(starts-with(text(), 'Sociology') or starts-with(text(), 'JEL Class') or starts-with(text(), 'Social communication'))">

            <xsl:call-template name="new-metadatum">

                <xsl:with-param name="key" select="'dc.subject.other'"/>

                <xsl:with-param name="language" select="''"/>

src/test/resources/xslt/pos-oai_marc-2-xmlbundle.xslt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
            or contains($sets, 'ps:Sociology ;')

            or contains($sets, 'ps:Culture ;')

            or contains($sets, 'ps:Communication ;'))">

            <xsl:value-of select="error(QName('','filteraway'), 'is not in defined sets')" />

            <!--xsl:value-of select="error(QName('','filteraway'), 'is not in defined sets')" /-->

          </xsl:when>

          <xsl:otherwise>