gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 14217: Add 'condition' attribute for DOM index definition 

This patch introduces an extension to the current syntax for DOM index definition.
Specifically, it extends the 'index_subfields' tag to allow adding a 'condition'
attribute that is used as a condition ofr applying the specified index.

This (exotic) example is self-explanatory:

The previous syntax (which is keeped by this patch) took this snippet from biblio-koha-indexdefs.xml

  <index_subfields tag="100" subfields="acbd">
    <target_index>Encuadernador:w</target_index>
  </index_subfields>

and generated an XSLT snippet in the DOM indexing XSLT that looks like this:

    <xslo:for-each select="marc:subfield">
      <xslo:if test="contains('acbd', @code)">
        <z:index name="Encuadernador:w">
          <xslo:value-of select="."/>
        </z:index>
      </xslo:if>
    </xslo:for-each>

This patch introduces this syntax change (note the 'condition' attribute:

  <index_subfields tag="100" subfields="acbd" condition="@ind2='7'">
    <target_index>Encuadernador:w</target_index>
  </index_subfields>

which yields to this XSLT snippet in the DOM indexing XSLT:

    <xslo:if test="@ind2='7'">
      <xslo:for-each select="marc:subfield">
        <xslo:if test="contains('acbd', @code)">
          <z:index name="Encuadernador:w">
            <xslo:value-of select="."/>
          </z:index>
        </xslo:if>
      </xslo:for-each>
    </xslo:if>

To test:
- Verify that the shipped XSLT files are current regarding the shipped index definitions:
  $ for i in marc21 normarc unimarc; do
        xsltproc etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl \
              etc/zebradb/marc_defs/$i/biblios/biblio-koha-indexdefs.xml \
              > etc/zebradb/marc_defs/$i/biblios/biblio-zebra-indexdefs.xsl
    done
  $ git status
(repeat for authorities, skip normarc which doesn't have authorities)
- Apply the patch
- Re-run the previous commands
=> SUCCESS: no changes
- Add a condition to an index_subfields tag (for example, condition="@ind2='7'" in the Author's index
- Regenerate the specific XSLT
=> SUCCESS: doing a diff shows the only change is the code has been wrapped inside an xslo:if using the condition for the test
- Apply the generated xsl to a MARCXML record that has a field matching the condition like this:
  $ xsltproc .../biblio-zebra-indexdefs.xsl sample_record.xml
=> SUCCESS: There's an index on the result, containing the configured field/subfields, that matches the criteria.
- Sign off and feel really happy :-D

Note: the attached sample record includes a 100 field, with ind2=7 and $a=Tomasito

Edit: This patch was squashed once I figured it got too complex and Jonathan required a followup
to avoid code duplication.

This avoids code duplication, with the same results.

Sponsored-by: Orex Digital
Signed-off-by: Barton Chittenden <barton@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Tomas Cohen Arazi 2015-07-08 12:37:31 -03:00
parent 07bad6b3fa
commit 5d46dbf3e9
1 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
View File

@ -250,7 +250,19 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
<xsl:text>']</xsl:text>
</xsl:attribute>
<xsl:for-each select="key('index_subfields_tag', @tag)">
<xsl:call-template name="handle-one-index-subfields"/>
<xsl:choose>
<xsl:when test="@condition">
<xslo:if>
<xsl:attribute name="test">
<xsl:value-of select="@condition"/>
</xsl:attribute>
<xsl:call-template name="handle-one-index-subfields" />
</xslo:if>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="handle-one-index-subfields" />
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xslo:template>
</xsl:for-each>
@ -262,34 +274,35 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
<xsl:variable name="indexes">
<xsl:call-template name="get-target-indexes"/>
</xsl:variable>
<xslo:for-each select="marc:subfield">
<xslo:if>
<xsl:attribute name="test">
<xsl:text>contains('</xsl:text>
<xsl:value-of select="@subfields"/>
<xsl:text>', @code)</xsl:text>
</xsl:attribute>
<z:index>
<xsl:attribute name="name"><xsl:value-of select="normalize-space($indexes)"/></xsl:attribute>
<xslo:value-of>
<xsl:attribute name="select">
<xsl:choose>
<xsl:when test="@length">
<xsl:text>substring(., </xsl:text>
<xsl:value-of select="$offset + 1" />
<xsl:text>, </xsl:text>
<xsl:value-of select="$length"/>
<xsl:text>)</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>.</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xslo:value-of>
</z:index>
</xslo:if>
</xslo:for-each>
<xslo:for-each select="marc:subfield">
<xslo:if>
<xsl:attribute name="test">
<xsl:text>contains('</xsl:text>
<xsl:value-of select="@subfields"/>
<xsl:text>', @code)</xsl:text>
</xsl:attribute>
<z:index>
<xsl:attribute name="name"><xsl:value-of select="normalize-space($indexes)"/></xsl:attribute>
<xslo:value-of>
<xsl:attribute name="select">
<xsl:choose>
<xsl:when test="@length">
<xsl:text>substring(., </xsl:text>
<xsl:value-of select="$offset + 1" />
<xsl:text>, </xsl:text>
<xsl:value-of select="$length"/>
<xsl:text>)</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>.</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xslo:value-of>
</z:index>
</xslo:if>
</xslo:for-each>
</xsl:template>
<xsl:template name="handle-index-facets">