http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8948 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #2 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 8948: MARC21 field 787 doesn't display Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl M koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl Patch failed at 0001 Bug 8948: MARC21 field 787 doesn't display The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8948 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |In Discussion CC| |mtompset@hotmail.com --- Comment #4 from M. Tompsett <mtompset@hotmail.com> --- What do you think, Jared? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8948 --- Comment #6 from M. Tompsett <mtompset@hotmail.com> --- I was wondering if you think I positioned the </xsl:element> correctly. If so, could you change this to needs sign off? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8948 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Needs Signoff --- Comment #7 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- If this doesn't work, the tester can change the status to "Failed QA." -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8948 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |dcook@prosentient.com.au --- Comment #9 from David Cook <dcook@prosentient.com.au> --- The logic in this patch makes little sense, and is invalid XSL in some cases. In regards to the XSL, there are two <xsl:otherwise> elements in the <xsl:choose> element. There should be only one as it is the default "otherwise" condition. The first "otherwise" condition in these XSLTs is useless, so I'd just delete it all together. The test for "$UseControlNumber = '0'" is counter-productive in that it functions as a de facto "otherwise" which means the test for "marc:subfield[@code='0']" will never be triggered. The final "otherwise" is also useless as it is missing its href attribute. The tests for "marc:subfield[@code='t']" are problematically placed in almost every case well. Rather than salvage this patch, I would suggest starting again with the existing 773 as a model. I added the 787 to our local XSLT a while ago. Perhaps I'll add an alternative patch when I work on porting some other customizations. -- You are receiving this mail because: You are watching all bug changes.