[Bug 23702] New: New UNIMARC XSLT
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Bug ID: 23702 Summary: New UNIMARC XSLT Change sponsored?: --- Product: Koha Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Cataloging Assignee: koha-bugs@lists.koha-community.org Reporter: stephane.delaye@biblibre.com QA Contact: testopia@bugs.koha-community.org CC: m.de.rooy@rijksmuseum.nl Created attachment 93308 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93308&action=edit xslt unimarc intranet detail In attachments the new xslt files UNIMARC and zebra configuration files. The xslt file call new index about the link fields(4xx). The news: -add fields for the bibliographic transition(181,182,183,214) -add fields 923 and 924 for display better the summaries of collection -display better the punctuation isbd -fields 600 à 608 : search the string with phr and not with number authority ..etc Test plan 1.Install the intranet xslt files into : ~/src/koha-tmpl/intranet-tmpl/prog/en/xslt 2.Install the opac xslt files into : :~/src/koha-tmpl/opac-tmpl/bootstrap/en/xslt 3.Install the file 'biblio-koha-indexdefs.xml' into /home/koha/etc/zebradb/marc_defs/unimarc/biblios/ 4.Install the file 'ccl.properties' into /home/koha/etc/zebradb/ 5.Install the file 'bib1.att' into/home/koha/etc/zebradb/biblios/etc/ 6.Run the indexation cd /home/koha/tools/zebra;update_xsl_config.sh -a -b;./rebuild_full.sh -b -a; -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #1 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93318 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93318&action=edit xslt intranet result -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #2 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93319 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93319&action=edit xslt intranet utils -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #3 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93320 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93320&action=edit xslt opac detail -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #4 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93321 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93321&action=edit xslt opac result -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #5 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93322 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93322&action=edit xslt opac utils -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #6 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93331 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93331&action=edit index file 1 -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #7 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93332 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93332&action=edit index file 2 -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #8 from delaye <stephane.delaye@biblibre.com> --- Created attachment 93333 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93333&action=edit index file 3 -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Andreas Roussos <arouss1980@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |arouss1980@gmail.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Axelle Aix-Marseille Université <axelle.clarisse@univ-amu.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |axelle.clarisse@univ-amu.fr -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |koha@univ-lyon3.fr Summary|New UNIMARC XSLT |New UNIMARC XSLT according | |to last IFLA updates -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93331|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93332|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93333|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |20424 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20424 [Bug 20424] New UNIMARC ZEBRA indexes according to last IFLA updates -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93308|0 |1 is obsolete| | --- Comment #9 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 93866 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93866&action=edit UNIMARCslim2intranetDetail.xsl -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93318|0 |1 is obsolete| | --- Comment #10 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 93867 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93867&action=edit UNIMARCslim2intranetResults.xsl -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93320|0 |1 is obsolete| | --- Comment #11 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 93868 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93868&action=edit UNIMARCslim2OPACDetail.xsl -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93321|0 |1 is obsolete| | --- Comment #12 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 93869 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93869&action=edit UNIMARCslim2OPACResults.xsl -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93322|0 |1 is obsolete| | --- Comment #13 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 93870 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=93870&action=edit OPAC UNIMARCslimUtils.xsl -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #14 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- After discussion with other french librarians, we thought that it could be useful to add to the last attachements the followings fields : for the OPAC : 506, 507, 576, 577, 623, 703, 713 et 723 For the intranet : 181, 182, 183, in addition of the fields above Thanks, Sonia -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|koha-bugs@lists.koha-commun |stephane.delaye@biblibre.co |ity.org |m CC| |claire.hernandez@biblibre.c | |om -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93866|0 |1 is obsolete| | Attachment #93868|0 |1 is obsolete| | --- Comment #15 from delaye <stephane.delaye@biblibre.com> --- Created attachment 94369 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=94369&action=edit Opac detail OPAC detail :add the field 506, 507, 576, 577, 623, 703, 713 et 723 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #16 from delaye <stephane.delaye@biblibre.com> --- Created attachment 94370 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=94370&action=edit intranet detail xslt intranet detail : add the fields 181,182,183, 506, 507, 576, 577, 623, 703, 713 et 723 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #17 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 95581 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95581&action=edit Bug 23702 - New UNIMARC XSLT according to last IFLA updates -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 jmbroust <jean-manuel.broust@univ-lyon2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jean-manuel.broust@univ-lyo | |n2.fr -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #18 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Is this still work in progress? (Status: Assigned) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |julian.maurice@biblibre.com --- Comment #19 from Julian Maurice <julian.maurice@biblibre.com> --- I guess the status should be needs signoff, but there are some problems in the patch: FAIL koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl FAIL xml_valid 266: parser error : Entity 'nbsp' not defined 88: parser error : Entity 'nbsp' not defined 73: parser error : Entity 'nbsp' not defined FAIL koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl FAIL xml_valid 447: parser error : Opening and ending tag mismatch: for-each line 180 and when 224: parser error : Opening and ending tag mismatch: when line 184 and if 497: parser error : Opening and ending tag mismatch: stylesheet line 3 and span 446: parser error : Opening and ending tag mismatch: span line 181 and xsl:if 496: parser error : Opening and ending tag mismatch: template line 179 and choose 225: parser error : Opening and ending tag mismatch: choose line 183 and when 498: parser error : Extra content at the end of the document -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #20 from delaye <stephane.delaye@biblibre.com> --- Created attachment 95949 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=95949&action=edit Intranet xslt result new version change with -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Arthur Suzuki <arthur.suzuki@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |arthur.suzuki@biblibre.com Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m Attachment #95949|1 |0 is patch| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #95581|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93867|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93870|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |ASSIGNED --- Comment #21 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Thanks Stéphane for the new file UNIMARCslim2intranetResults.xsl. But according to Julian's comment (comment 19 https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702#c19), there's also a problem on the file koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl I change the previous one to put it "obsolete". -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #22 from delaye <stephane.delaye@biblibre.com> --- Created attachment 97625 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=97625&action=edit OPAX -xslt utils -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #23 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 97830 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=97830&action=edit Bug 23702 - New UNIMARC XSLT according to last IFLA updates -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #24 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Tried to apply the patch on a sandbox but it seems that there still some issues on the xslt files : - I don't see any bilbio information on the result pages (just place hold, request articles..) - in the detail page on intranet the link to see the biblio in the OPAC doesn't work -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #93319|0 |1 is obsolete| | Attachment #93869|0 |1 is obsolete| | Attachment #94369|0 |1 is obsolete| | Attachment #94370|0 |1 is obsolete| | Attachment #95949|0 |1 is obsolete| | Attachment #97625|0 |1 is obsolete| | --- Comment #25 from delaye <stephane.delaye@biblibre.com> --- Created attachment 101417 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101417&action=edit xslt opac new xslt opac -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #26 from delaye <stephane.delaye@biblibre.com> --- Created attachment 101418 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101418&action=edit xslt intranet new xslt intranet -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #97830|0 |1 is obsolete| | Attachment #97830|1 |0 is patch| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101417|1 |0 is patch| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101418|1 |0 is patch| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #27 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 103375 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=103375&action=edit Bug 23702 - New UNIMARC XSLT according to last IFLA updates -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=26049 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #28 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- You may integrate changes from Bug 26032 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 --- Comment #29 from Koha Team University Lyon 3 <koha@univ-lyon3.fr> --- Hello Frido, I'm not sure to see what we should do with the change in BZ26032 as it's not the same files changed. But, it's surely over my understanding of what BZ26032 is going to change.. Sonia -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #30 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23702 - New UNIMARC XSLT according to last IFLA updates .git/rebase-apply/patch:325: trailing whitespace. </xsl:call-template> .git/rebase-apply/patch:448: trailing whitespace. <xsl:if test="marc:datafield[@tag=531]"> .git/rebase-apply/patch:538: trailing whitespace. .git/rebase-apply/patch:553: trailing whitespace. .git/rebase-apply/patch:601: trailing whitespace. warning: squelched 36 whitespace errors warning: 41 lines add whitespace errors. Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl M koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl .git/rebase-apply/patch:325: trailing whitespace. </xsl:call-template> .git/rebase-apply/patch:448: trailing whitespace. <xsl:if test="marc:datafield[@tag=531]"> .git/rebase-apply/patch:538: trailing whitespace. .git/rebase-apply/patch:553: trailing whitespace. .git/rebase-apply/patch:601: trailing whitespace. warning: squelched 36 whitespace errors warning: 41 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl error: Failed to merge in the changes. Patch failed at 0001 Bug 23702 - New UNIMARC XSLT according to last IFLA updates The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-23702---New-UNIMARC-XSLT-according-to-last-IFL-dGv0oX.patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Koha Team University Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #103375|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23702 Arthur Suzuki <arthur.suzuki@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=30430 -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org