[koha-commits] main Koha release repository branch master updated. v3.16.00-878-gb61ebfd

Git repo owner gitmaster at git.koha-community.org
Fri Oct 31 18:50:12 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  b61ebfd0fa3c8081a52c82ddc34d0cd3c0550766 (commit)
       via  46d3e94e6649f74e1f293864ab5158440befbabb (commit)
       via  2d9eb6202fdc97a7d9357a38149faed2f73e5748 (commit)
       via  838412c0680b45065455c0aba30b480762864277 (commit)
       via  38742e07229126fc3c131965c2d9532a36ae287a (commit)
       via  f8d06e1dafc5647a8a9e2ef8a22f60e8bed32c19 (commit)
       via  de8d5f3ae91049252edeabe61e2cbe1d300a999b (commit)
       via  ccf406132424a2213aa5668c9efe3867aebe3e42 (commit)
       via  65e0fba94b8e0f16de20214f6f2c89c2327fb3d0 (commit)
      from  7b7a45269a6d949df84b6760857b83da8bda065c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b61ebfd0fa3c8081a52c82ddc34d0cd3c0550766
Author: simith <simith at inlibro.com>
Date:   Thu Oct 30 12:40:57 2014 -0400

    Bug 11876 [Unit test] Add a diff view to staged MARC Records
    
    Unit test added
    
    http://bugs.koha-community.org/show_bug.cgi?id=11876
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 46d3e94e6649f74e1f293864ab5158440befbabb
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Sep 25 13:59:44 2014 +0200

    Bug 11876: (qa-followup) some minor changes
    
    - GetImportBiblios: prepare the query is useless here
    - use Modern::Perl
    - Remove useless indentation level in pl file and redirect to 404 if
      required params are not given.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 2d9eb6202fdc97a7d9357a38149faed2f73e5748
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 14 14:52:34 2014 -0400

    Bug 11876 [Follow-up] Add a diff view to staged MARC Records
    
    This follow up makes some corrections to the previously added files and
    adds some functionality to the diff: A Javascript diff plugin highlights
    the differences between the records in the two columns.
    
    Corrections made: Converted tab indentation to spaces, corrected GPL
    statement.
    
    File organization: Moved showdiffmarc.pl and .tt to /tools/ to match the
    location of the page with which it functions,
    tools/manage-marc-import.pl. Corrected permissions on showdiffmarc.pl
    accordingly.
    
    Updates to the template: Added standard includes inclucing header menu
    and breadcrumbs; converted custom layout to YUI Grid standard.
    
    To test, follow the test plan previously defined:
    
    - Stage a MARC record batch which contains at least one record match for
      something already in your catalog.
    - Locate the staged MARC record batch in Tools -> Manage staged records
      and click to view the contents.
    - Find the record which matched an existing record and click the "View"
      link in the Diff column.
    - The compare screen should include the header menu and breadcrumbs. The
      differences between your staged file and the existing record should be
      higlighted.
    - You should be able to return to the MARC batch you were previously
      viewing by following the link in the breadcrumbs or the link at the
      bottom of the page.
    - Confirm that the "About" page includes information about the new
      JavaScript plugin on the Licenses tab.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 838412c0680b45065455c0aba30b480762864277
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date:   Thu Aug 7 13:21:58 2014 -0400

    Bug 11876 - Ommited files in last patch
    
    I forgot to include these files in the last patch
    
    	new file:   tools/showdiffmarc.pl
    	new file:   koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 38742e07229126fc3c131965c2d9532a36ae287a
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date:   Thu Aug 7 13:10:26 2014 -0400

    Bug 11876 - Add a diff view for staged MARC records.
    
    New patch should apply correctly.
    
    	modified:   C4/ImportBatch.pm
    	modified:   koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Bug 11876 - Diff column is now displayed.
    
    If a match is found, a 'View' link appears in the Diff column.
    
    Old patch was not implementing datatables, and therefore was not compatible with this version of Koha.
    	modified:   koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
    	modified:   tools/batch_records_ajax.pl
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    These patches have some issues but I'm going to submit a follow-up which
    I think will address them all and offer some improvements as well.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit f8d06e1dafc5647a8a9e2ef8a22f60e8bed32c19
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Sep 1 23:39:12 2014 +0200

    Bug 11517: Braille and combination swapped in XSLT result lists
    
    http://www.loc.gov/marc/bibliographic/bd007f.html
    
    - Catalog a record:
      * 007 - choose 'Tactile material'
      * Pos. 1 - choose b = Braille or C = combination
      * Reindex!
      * Verify the result list shows the format correctly.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Problem exist, fixed with this patch.
    No koha-qa errors
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit de8d5f3ae91049252edeabe61e2cbe1d300a999b
Author: Admin User Koha <koha at localhost>
Date:   Mon Oct 20 15:05:23 2014 +0200

    Bug 12995 - script update_totalissues.pl stops on corrupted record - UT
    
    This patch adds an unit test on C4::Biblio::UpdateTotalIssues method
    call on non existing record
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    I can't comment on the correctness of the test other than to say it ran
    successfully.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Improves CLI script, works as described.
    
    Note: A small improvement would be to output the problematic biblionumber.

commit ccf406132424a2213aa5668c9efe3867aebe3e42
Author: Admin User Koha <koha at localhost>
Date:   Mon Oct 20 15:07:29 2014 +0200

    Bug 12995 - script update_totalissues.pl stops on corrupted record
    
    When running update_totalissues.pl cronjob, it will stop on a corrupted
    record.
    
    This patch changes UpdateTotalIssues so that it return 1 if processing
    record has succeded. Also, if mapping with biblioitems.totalissues does
    not exist, the method has nothing to do so it stops and returns 1.
    
    When processing a corrupted record, script now alerts about the error on
    this biblionumber (if script is verbose) and process next record.
    A total number of records with error will be printed at the end of the
    script.
    
    Test plan :
    - Create a dabase with a few biblios and some issues
    - Modify first biblio record (use direct sql update) : set empty value
      in biblioitems.marcxml
    - Launch script : misc/cronjobs/update_totalissues.pl --use-stats --commit=1000 -v
    
    => Without patch : the script stops at first record
    => With patch : the script prints error for first record and processes
       all records
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    I was able to confirm the problem before the patch and successfully
    follow the test plan.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 65e0fba94b8e0f16de20214f6f2c89c2327fb3d0
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Oct 29 16:24:49 2014 -0300

    Bug 13164: Incorrect ISSN visualization on the normal view if invalid/cancelled ISSN present
    
    Currently, 022$z (and 011$z for UNIMARC) occurences are not shown, but the XSLT
    logic used introduces punctuation characters for those $z occurences.
    
    This patch adds a check for the existence of subfield a, and only loops
    on $a subfields.
    
    To test:
    - Create/have a record with 022$z (or 011$z on UNIMARC) but no 022$a (no 011$a on UNIMARC).
    - Open the detail page for the record (on both OPAC and staff).
    => FAIL: the ISSN label and ';' and '.' characters incorrectly shown.
    - Repeat mixing with 022$a occurences to notice the bug.
    - Apply the patch, reload
    => SUCCES: ISSN label shows only on the presence of a $a, and $z are skipped.
               no matter how many ISSN fields you add.
    - Sign off :-D
    
    Regards
    To+
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
    
    Works as described on an UNIMARC DB. Mimics what's done for ISBN field.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Biblio.pm                                       |   19 ++-
 C4/ImportBatch.pm                                  |   20 +++
 koha-tmpl/intranet-tmpl/lib/jsdiff/jsdiff.js       |  160 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/lib/jsdiff/jsdiff.min.js   |   10 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    3 +
 .../prog/en/modules/tools/manage-marc-import.tt    |   39 ++++-
 .../prog/en/modules/tools/showdiffmarc.tt          |   55 +++++++
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   24 ++-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    4 +-
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |   24 ++-
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |   27 ++--
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   24 ++-
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |    4 +-
 .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl   |   24 ++-
 .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl   |   28 ++--
 misc/cronjobs/update_totalissues.pl                |   11 +-
 t/Biblio.t                                         |    8 +-
 t/db_dependent/ImportBatch.t                       |   72 +++++++++
 tools/batch_records_ajax.pl                        |    1 +
 tools/showdiffmarc.pl                              |  101 ++++++++++++
 20 files changed, 590 insertions(+), 68 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jsdiff/jsdiff.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jsdiff/jsdiff.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
 create mode 100644 t/db_dependent/ImportBatch.t
 create mode 100755 tools/showdiffmarc.pl


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list