Good morning all, Probably a very naive question; I would like to try the proposed solution (Bug 8665) and can find the "diff", but when I try and navigate "git", the relevant section (if I have navigated successfully which is dubious as I'm new to "git") <https://github.com/Koha-Community/Koha/tree/master/etc/zebradb/marc_defs/marc21/authorities>, the master appears to stop at Bug 7475. Is there anywhere to find "ready edited" files, rather than copy/paste lines from the diff? Many thanks -- Paul
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", but when I try and navigate "git", the relevant section (if I have navigated successfully which is dubious as I'm new to "git") <https://github.com/Koha-Community/Koha/tree/master/etc/zebradb/marc_defs/marc21/authorities>, the master appears to stop at Bug 7475.
That isn't the Koha Git repo, although it does look like whoever is managing it is keeping it reasonably in sync[0]. The real koha git repo is here: http://git.koha-community.org/gitweb/?p=koha.git;a=summary Master doesn't stop at 7475, it's just that that was the last thing that is in master that touched those files.
Is there anywhere to find "ready edited" files, rather than copy/paste lines from the diff?
No, not until 8665 gets signed off and pulled into master. 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. Robin. [0] grumble grumble Free software grumble should be using Gitorious[1] instead of proprietary github grumble. [1] maybe we should consider a gitorious installation alongside the gitweb one, it'd be especially useful for offshoot type projects, like the migration tools one[2]. [2] for anyone interested: https://gitorious.org/koha-toolbox
On 2012-10-13, at 12:56 PM, 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", but when I try and navigate "git", the relevant section (if I have navigated successfully which is dubious as I'm new to "git") <https://github.com/Koha-Community/Koha/tree/master/etc/zebradb/marc_defs/marc21/authorities>, the master appears to stop at Bug 7475.
[0] grumble grumble Free software grumble should be using Gitorious[1]
instead of proprietary github grumble.
[1] maybe we should consider a gitorious installation alongside the gitweb one, it'd be especially useful for offshoot type projects, like the migration tools one[2].
[2] for anyone interested: https://gitorious.org/koha-toolbox
there is now a synced koha repo on gitorious, too http://gitorious.org/koha-community/koha so, either/or or both...
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
participants (3)
-
Mason James -
Paul -
Robin Sheat