[Koha-devel] Bug 8665, files, git ...

[Paul]

At 12:56 PM 10/13/2012 +1300, Robin Sheat wrote:
>Op 13-10-12 02:02, Paul schreef:
> > Probably a very naive question; I would like to try the proposed
> > solution (Bug 8665) and can find the "diff",
[snip some very informative comments]
>Typically you will use git to apply the patch from bugzilla.
>Copy/pasting lines is quite likely to cause you errors.
>
>Best is to make a local copy based on the guide here:
>http://wiki.koha-community.org/wiki/Version_Control_Using_Git
>which combined with this:
>http://wiki.koha-community.org/wiki/Git_bz_configuration
>makes it very easy to apply patches from bugzilla.
>
>There will be a significant learning curve, git is a developer tool, and
>applying patches is something of an advanced topic.

Many thanks Robin -- I've gone through your suggested reading at some 
length (and followed Paul P.'s pointer to the French Wiki), but it's 
waaaaaay beyond what I was looking for: a simple test of what looked like a 
"promising" patch in the sandbox to see if it could help our production box.

And while you say (and I agree) that "Copy/pasting lines is quite likely to 
cause you errors" I did have a quick look at it and it's just not 
programmatically possible.  At least one of the diff "from" files is not 
even close to the 3.8.5 "production" file that I'm trying to correct:

diff --git 
a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl 
b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
index 1bafa16..5c80c2c 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl

leads me to:

@@ -1122,7 +1122,7 @@ definition file (probably something like 
{biblio,authority}-koha-indexdefs.xml)
        <xslo:value-of select="normalize-space($raw_heading)"/>
      </z:index>
    </xslo:template>
-  <xslo:template mode="index_heading_conditional" 
match="marc:datafield[@tag='450']">

##############
    <xslo:template mode="index_heading" match="marc:datafield[@tag='450']">

appears at line 622 and 1729 (the only greps for '450')
completely different, not same logic:

     <z:index name="Subject-topical-see-from:w Subject-topical-see-from:p 
Subject-topical-see-from:s See-from:w See-from:p See-from:s">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
##############

For me this was a most educational experience, but the cumulative 
principles behind git prove the naïveté of my opening line: "Probably a 
very naive question; I would like to try the proposed solution (Bug 8665)."

Onwards and [hopefully] upwards.  Many thanks for your taking the time to 
reply.

Best regards,
Paul