| Summary: | Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks | ||
|---|---|---|---|
| Product: | Koha | Reporter: | Frédéric Demians <f.demians> |
| Component: | Z39.50 / SRU / OpenSearch Servers | Assignee: | Frédéric Demians <f.demians> |
| Status: | CLOSED FIXED | QA Contact: | Bugs List <koha-bugs> |
| Severity: | enhancement | ||
| Priority: | PATCH-Sent (DO NOT USE) | CC: | chris, koha.sekjal, paul.poulain |
| Version: | Main | ||
| Hardware: | All | ||
| OS: | All | ||
| Change sponsored?: | --- | Patch complexity: | --- |
| Documentation contact: | Documentation submission: | ||
| Text to go in the release notes: | Version(s) released in: | ||
| Circulation function: | |||
| Attachments: |
Proposed patch
Proposed patch 2 Bug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks Bug 5565 UNIMARC to DC XSL tidy up |
||
|
Description
Frédéric Demians
2010-12-31 06:22:11 UTC
This bug is mentioned in: Bug 5565 UNIMARC to DC XSL tidy up http://lists.koha-community.org/pipermail/koha-patches/2010-December/013486.html the patch pointed by MJ & Frederic does not apply : 17:45 ~/koha.dev/koha-community (BZ5565 $%)$ git am -3 BZ5565.eml Applying: Bug 5565 UNIMARC to DC XSL tidy up fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 5565 UNIMARC to DC XSL tidy up When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Created attachment 5608 [details] [review] Proposed patch Created attachment 5609 [details] [review] Proposed patch 2 > the patch pointed by MJ & Frederic does not apply :
I rebase it to HEAD. It should work better.
Updating Version : This ENH will be for Koha 3.8 Bug versionned for master. entries will be made against rel_3_8 once the patch has been applied (see thread about that on koha-devel yesterday) Frederic, both patches need to be applied? (In reply to comment #9) > Frederic, both patches need to be applied? Both patch still apply on HEAD. The first one fix the superfluous blanks issue and the second tidy up the UNIMARC to DC XSL file (better indentation for readability). To test: 1. On an UNIMARC Koha, activate the OAI server 2. Get the first batch of records from the OAI server: /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=oai_dc 3. Ask your browser to show you the source XML file 4. You will see that there is a new line in the <dc:creator> 5. Apply the patch and repeat 2-3 Created attachment 6862 [details] [review] Bug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed off on the first patch But the second one deletes the leader as well as changing the indentation - <xsl:variable name="leader" select="marc:leader"/> - <xsl:variable name="leader6" select="substring($leader,7,1)"/> - <xsl:variable name="leader7" select="substring($leader,8,1)"/> - <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/> Should this be happening? (In reply to comment #12) > Signed off on the first patch > > But the second one deletes the leader as well as changing the indentation > > - <xsl:variable name="leader" select="marc:leader"/> > - <xsl:variable name="leader6" select="substring($leader,7,1)"/> > - <xsl:variable name="leader7" select="substring($leader,8,1)"/> > - <xsl:variable name="controlField008" > select="marc:controlfield[@tag=008]"/> > > Should this be happening? Yes. Thanks for your watchfulness. 'leader' is used by MARC21 to DC XSL to display document type. It doesn't work this way for UNIMARC. Cool, It all looks good then, signing off Created attachment 6863 [details] [review] Bug 5565 UNIMARC to DC XSL tidy up Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> XSLT and whitespace clean up only. Easy to read, marking Passed QA patch pushed, please test |