]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 7699: Restricted until datepicker broken
Jared Camins-Esakov [Sun, 11 Mar 2012 17:19:00 +0000 (13:19 -0400)]
Bug 7699: Restricted until datepicker broken

To test:
1. Edit a patron, and try to use the datepicker to set the date the patron is
   restricted until.
2. Note that the datepicker does not come up.
3. Apply patch.
4. Repeat step 1.
5. Note that the datepicker does come up.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7609: Improving links to find analytics and volumes when using UseControlnumber...
Katrin Fischer [Sun, 26 Feb 2012 21:25:41 +0000 (22:25 +0100)]
Bug 7609: Improving links to find analytics and volumes when using UseControlnumber (MARC21)

To test:
- switch on UseControlnumber
- add a serial record with 001
  - ldr pos 19 = a or
  - 008 (continuing resource), pos 21 = m
- add 2 analytics with with $w subfields containing the 001 of the serial
  - one with ldr pos 7 = a
  - one with ldr pos 7 = b
- add 1-2 monographical records linked to the serial
  - 8xx $w subfield containing the 001 of the serial
  - 490

The serial should show 2 links (in both OPAC and Intranet):
'Show volumes' should only bring up the monographical records.
'Show analytics' should only find the analytical records.

Without the patch both links would find all linked records, no difference
between both links.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3216: UNIMARC author facets
Frédéric Demians [Fri, 2 Dec 2011 06:56:27 +0000 (07:56 +0100)]
Bug 3216: UNIMARC author facets

Add 700$b to UNIMARC author facets.

Other facets subfields could be added now. For example, other subjects
subfields.

Following patches are required to handle better MARC21 subfields and choose
other subfields to deal with UNIMARC format.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested under both MARC21 and UNIMARC. Does not cause any regressions with
MARC21, and offers the possibility for better faceting there in the future.
Works as advertised with UNIMARC.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7665 - Bibs with no ISBN's show broken images for covers when using Syndetics...
Liz Rea [Wed, 7 Mar 2012 19:29:58 +0000 (13:29 -0600)]
Bug 7665 - Bibs with no ISBN's show broken images for covers when using Syndetics cover images

Patch fixes problem for syndetics + bibs with no ISBN. Also adds "no image found" capability to Syndetics results.

To test (first, contact me and I will let you use my syndetics credentials *for testing this bug only*):
* replicate bug - have a bib with an ISBN, and one without. The one with the ISBN should show a cover, the one without will show a broken image.
* apply patch
* search for the same bib - you should now see "no image available" for the one with no ISBN, and a cover image for your bib with an ISBN.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA Comment:  normalized spacing

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7636 - error when trying to email cart when opacuserlogin set to don't allow
Owen Leonard [Thu, 1 Mar 2012 20:06:25 +0000 (15:06 -0500)]
Bug 7636 - error when trying to email cart when opacuserlogin set to don't allow

This patch hides the "send cart" link if the opacuserlogin
preference is set to disallow. Other similar changes included:

- hide the "send list" link
- hide the "your lists" tab
- hide the "log in to create your own lists" link
- hide the "recent comments" link

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with opacuserlogin set to both "Allow" and "Don't allow." With
opacuserlogin set to "Allow," the links showed up, and with opacuserlogin
set to "Don't allow," the links did not.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7645 - System preferences editor save button obscured by language chooser
Owen Leonard [Mon, 5 Mar 2012 17:38:00 +0000 (12:38 -0500)]
Bug 7645 - System preferences editor save button obscured by language chooser

This patch amends the preferences page's CSS file to add
bottom padding to the page container. This gives the bottom-
most submit button some breathing room.

Markup correction: Adding "row" and "col" attributes to
<textareas> to quiet validation errors. This doesn't
affect output at all (dimensions are specified in CSS).

To test, open the system preferences page to a tab like OPAC
which contains many preferences. At the bottom of the page
the last submit button should have about a line's worth of
white space below it.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7631 - Self checkout renewal fails because of reference to non-existent subroutin...
Owen Leonard [Thu, 1 Mar 2012 15:00:14 +0000 (10:00 -0500)]
Bug 7631 - Self checkout renewal fails because of reference to non-existent subroutine in sco-main.pl

Changing "CanBookBeIssuedCheckout" to "CanBookBeIssued"

To test, try to renew an item which has no renewals left. Before the patch
you'll get an error:

Undefined subroutine &main::CanBookBeIssuedCheckout called at /opac/sco/sco-main.pl line 135.

After the patch you'll get the correct message about having no renewals left.
Other tests: checking out a barcode which doesn't exist, checking out an
item which is on hold for another patron.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6488: Display OPAC search result count conditional to OpacHiddenItems syspref
Srdjan Jankovic [Wed, 7 Mar 2012 03:53:09 +0000 (16:53 +1300)]
Bug 6488: Display OPAC search result count conditional to OpacHiddenItems syspref

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised. Amended this patch for a small spelling issue: supress->suppress. Could not suppress it ;)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7629 - Update sco.css to include CSS Gradients and prevent error upon missing...
Owen Leonard [Thu, 1 Mar 2012 14:40:01 +0000 (09:40 -0500)]
Bug 7629 - Update sco.css to include CSS Gradients and prevent error upon missing background image file

Copying CSS gradients for input buttons and dialogs from opac.css. Also copied missing
CSS for language-picker footer. Markup corrected in a couple of places in order
for the right style to be applied.

To test corrections to dialog CSS, enter an invalid patron barcode.
Multiple languages will have to be enabled in order to see the footer
correction working.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Dialog CSS looks correct, footer also looks correct with multi languages.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7271 - change sort in items.pm to sort by home library instead of holding branch
Liz Rea [Mon, 28 Nov 2011 17:39:33 +0000 (11:39 -0600)]
Bug 7271 - change sort in items.pm to sort by home library instead of holding branch

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7493 follow-up: Update DBRev
Jared Camins-Esakov [Thu, 3 May 2012 22:37:52 +0000 (18:37 -0400)]
Bug 7493 follow-up: Update DBRev

Version 3.06.04.002.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7493 [REVISED] Deleting a record with comments breaks "Recent Comments"
Owen Leonard [Mon, 6 Feb 2012 14:05:18 +0000 (09:05 -0500)]
Bug 7493 [REVISED] Deleting a record with comments breaks "Recent Comments"

Adding foreign key constraint on biblio and borrowers:

- delete reviews when bibliographic records are deleted
- set set reviews.borrowernumber to NULL when patron records are deleted.

Before these constraints are set the database update script will
clean up existing instances of these problems by deleting reviews of
deleted biblios and setting to NULL reviews.borrowernumber for deleted
patrons.

In comments moderation, the list of comments will indicate "(deleted patron")
if the review was submitted by a patron who has since been deleted.

In the OPAC display of comments will omit the patron name altogether
if the patron has since been deleted.

To test:

1. CONFIRM THAT THE DATABASE UPDATE RUNS CORRECTLY

Before applying the patch:

 - delete the record for a title which has a review
 - delete a patron who has submitted a review (on a different title).

Viewing /cgi-bin/koha/opac-showreviews.pl should result in an error.

Apply the patch and make sure the database update runs. Viewing
the recent comments page in the OPAC should no longer result in an
error. The title with the comment from a deleted patron should
show no patron name on these pages:

 - Recent comments (opac-showreviews.pl)
 - Recent comments RSS (opac-showreviews.pl?format=rss)
 - Detail page (opac-detail.pl)

Comments from other patrons should show correctly.

2. CONFIRM THAT NEW DELETIONS PERFORM CORRECTLY

After applying the patch:

 - delete the record for a title which has a review
 - delete a patron who has submitted a review (on a different title).

Viewing /cgi-bin/koha/opac-showreviews.pl should NOT result in an error.
The review of the title which you deleted should no longer appear in the
list of recent comments.

The title with the comment from a deleted patron should
show no patron name on these pages:

 - Recent comments (opac-showreviews.pl)
 - Recent comments RSS (opac-showreviews.pl?format=rss)
 - Detail page (opac-detail.pl)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7284 follow-up: Update DBRev
Jared Camins-Esakov [Thu, 3 May 2012 22:36:55 +0000 (18:36 -0400)]
Bug 7284 follow-up: Update DBRev

Version 3.06.04.001.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agobug 7284: fix package build problem, move BEGIN into new
MJ Ray [Thu, 29 Mar 2012 17:35:04 +0000 (18:35 +0100)]
bug 7284: fix package build problem, move BEGIN into new

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7284: Authority matching improvements
Jared Camins-Esakov [Sat, 31 Dec 2011 17:17:41 +0000 (12:17 -0500)]
Bug 7284: Authority matching improvements

Squashed patch incorporating all previous patches (there is no functional
change compared to the previous version of this patch, this patch merely
squashes the original patch and follow-up, and rebases on latest master).

=== TL;DR VERSION ===
*** Installation ***
1. Run installer/data/mysql/atomicupdate/bug_7284_authority_linking_pt1
and installer/data/mysql/atomicupdate/bug_7284_authority_linking_pt2
2. Make sure you copy the following files from kohaclone to koha-dev:
etc/zeradb/authorities/etc/bib1.att,
etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml,
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl,
etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl, and
etc/zebradb/marc_defs/unimarc/authorities/record.abs
3. Run misc/migration_tools/rebuild_zebra.pl -a -r

*** New sysprefs ***
* AutoCreateAuthorities
* CatalogModuleRelink
* LinkerModule
* LinkerOptions
* LinkerRelink
* LinkerKeepStale

*** Important notes ***
You must have rebuild_zebra processing the zebraqueue for bibs when testing this
patch.

=== DESCRIPTION ===

*** Cataloging module ***
* Added an additional box to the authority finder plugin for "Heading match,"
  which consults not just the main entry but also See-from and See-also-from
  headings.

* With this patch, the automatic authority linking will actually work properly
  in the cataloging module. As Owen pointed out while testing the patch,
  though, longtime users of Koha will not be expecting that. In keeping with
  the principles of least surprise and maximum configurability, a new syspref,
  CatalogModuleRelink makes it possible to disable authority relinking in the
  cataloging module only (i.e. leaving it enabled for future runs of
  link_bibs_to_authorities.pl).  Note that though the default behavior matches
  the current behavior of Koha, it does not match the intended behavior.
  Libraries that want the intended behavior rather than the current behavior
  will need to adjust the CatalogModuleRelink syspref.

*** misc/link_bibs_to_authorities.pl ***
Added the following options to the misc/link_bibs_to_authorities.pl script:
--auth-limit        Only process those headings that match the authorities
                    matching the user-specified WHERE clause.
--bib-limit         Only process those bib records that match the
                    user-specified WHERE clause.
--commit            Commit the results to the database after every N records
                    are processed.
--link-report       Display a report of all the headings that were processed.

Converted misc/link_bibs_to_authorities.pl to use POD.

Added a detailed report of headings that linked, did not link, and linked
in a "fuzzy" fashion (the exact semantics of fuzzy are up to the individual
linker modules) during the run.

*** C4::Linker ***
Implemented new C4::Linker functionality to make it possible to easily add
custom authority linker algorithms. Currently available linker options are:
* Default: retains the current behavior of only creating links when there is
  an exact match to one and only one authority record; if the 'broader_headings'
  option is enabled, it will try to link to headings to authority records for
  broader headings by removing subfields from the end of the heading (NOTE:
  test the results before enabling broader_headings in a production system
  because its usefulness is very much dependent on individual sites' authority
  files)
* First Match: based on Default, creates a link to the *first* authority
  record that matches a given heading, even if there is more than one
  authority record that matches
* Last Match: based on Default, creates a link to the *last* authority
  record that matches a given heading, even if there is more than one record
  that matches

The API for linker modules is very simple. All modules should implement the
following two functions:
<get_link ($field)> - return the authid for the authority that should be
linked to the provided MARC::Field object, and a boolean to indicate whether
the match is "fuzzy" (the semantics of "fuzzy" are up to the individual plugin).
In order to handle authority limits, get_link should always end with:
    return $self->SUPER::_handle_auth_limit($authid), $fuzzy;

<flip_heading ($field)> - return a MARC::Field object with the heading flipped
to the preferred form. At present this routine is not used, and can be a stub.

Made the linking functionality use the SearchAuthorities in C4::AuthoritiesMarc
rather than SimpleSearch in C4::Search. Once C4::Search has been refactored,
SearchAuthorities should be rewritten to simply call into C4::Search. However,
at this time C4::Search cannot handle authority searching. Also fixed numerous
performance issues in SearchAuthorities and the Linker script:
* Correctly destroy ZOOM recordsets in SearchAuthorities when finished. If left
  undestroyed, efficiency appears to approach O(log n^n)
* Add an optional $skipmetadata flag to SearchAuthorities that can be used to
  avoid additional calls into Zebra when all that is wanted are authority
  records and not statistics about their use

*** New sysprefs ***
* AutoCreateAuthorities - When this and BiblioAddsAuthorities are both turned
  on, automatically create authority records for headings that don't have
  any authority link when cataloging. When BiblioAddsAuthorities is on and
  AutoCreateAuthorities is turned off, do not automatically generate authority
  records, but allow the user to enter headings that don't match an existing
  authority. When BiblioAddsAuthorities is off, this has no effect.
* CatalogModuleRelink - when turned on, the automatic linker will relink
  headings when a record is saved in the cataloging module when LinkerRelink
  is turned on, even if the headings were manually linked to a different
  authority by the cataloger. When turned off (the default), the automatic
  linker will not relink any headings that have already been linked when a
  record is saved.
* LinkerModule - Chooses which linker module to use for matching headings
  (current options are as described above in the section on linker options:
  "Default," "FirstMatch," and "LastMatch")
* LinkerOptions - A pipe-separated list of options to set for the authority
  linker (at the moment, the only option available is "broader_headings," which
  is described below)
* LinkerRelink - When turned on, the linker will confirm the links for headings
  that have previously been linked to an authority record when it runs. When
  turned off, any heading with an existing link will be ignored.
* LinkerKeepStale - When turned on, the linker will never *delete* a link to an
  authority record, though, depending on the value of LinkerRelink, it may
  change the link.

*** Other changes ***
* Cleaned up authorities code by removing unused functions and adding
  unimplemented functions and added some unit tests.

* This patch also modifies the authority indexing to remove trailing punctuation
  from Match indexes.

* Replace the old BiblioAddAuthorities subroutines with calls into the new
  C4::Linker routines.

* Add a simple implementation for C4::Heading::UNIMARC. (With thanks to F.
  Demians, 2011.01.09) Correct C4::Heading::UNIMARC class loading. Create
  biblio tag to authority types data structure at initialization rather than
  querying DB.

* Ran perltidy on all changed code.

*** Linker Options ***
Enter "broader_headings" in LinkerOptions. With this option, the linker will
try to match the following heading as follows:
=600  10$aCamins-Esakov, Jared$xCoin collections$vCatalogs$vEarly works to
1800.

First: Camins-Esakov, Jared--Coin collections--Catalogs--Early works to 1800
Next: Camins-Esakov, Jared--Coin collections--Catalogs
Next: Camins-Esakov, Jared--Coin collections
Next: Camins-Esakov, Jared (matches! if a previous attempt had matched, it
would not have tried this)

This is probably relevant only to MARC21 and LCSH, but could potentially be of
great use to libraries that make heavy use of floating subdivisions.

=== TESTING PLAN ===

Note: all of these tests require that you have some authority records,
preferably for headings that actually appear in your bibliographic data. At
least one authority record must contain a "see from" reference (remember which
one contains this, as you'll need it for some of the tests). The number shown
in the "Used in" column in the authority module is populated using Zebra
searches of the bibliographic database, so you *must* have
rebuild_zebra.pl -b -z [-x] running in cron, or manually run it after running
the linker.

*** Testing the Heading match in the cataloging plugin ***
1.  Create a new record, and open the cataloging plugin for an
    authority-controlled field.
2.  Search for an authority by entering the "see from" term in the Heading Match
    box
3.  Confirm that the appropriate heading shows up
4.  Search for an authority by entering the preferred heading into the Main
    entry or Main entry ($a only) box (i.e., repeat the procedure you usually
    use for cataloging, whatever that may be)
5.  Confirm that the appropriate heading shows up

*** Testing the cataloging interface ***
6.  Turn off BiblioAddsAuthorities
7.  Confirm that you cannot enter text directly in an authority-controlled field
8.  Confirm that if you search for a heading using the authority control plugin
    the heading is inserted (note, however, that this patch does not AND IS NOT
    INTENDED TO fix the bugs in the authority plugin with duplicate subfields;
    those are wholly out of scope- this check is for regressions)
9.  Turn on BiblioAddsAuthorities and AutoCreateAuthorities
10. Confirm that you can enter text directly into an authority-controlled field,
    and if you enter a heading that doesn't currently have an authority record,
    an authority record stub is automatically created, and the heading you
    entered linked
11. Confirm that if you enter a heading with only a subfield $a that fully
    *matches* an existing heading (i.e. the existing heading has only
    subfield $a populated), the authid for that heading is inserted into
    subfield $9
12. Confirm that if you enter a heading with multiple subfields that *matches*
    an existing heading, the authid for that heading is inserted into
    subfield $9
13. Turn on BiblioAddsAuthorities and turn off AutoCreateAuthorities
14. Confirm that you can enter text directly into an authority-controlled field,
    and if you enter a heading that doesn't currently have an authority record,
    an authority record stub is *not* created
15. Confirm that if you enter a heading with only a subfield $a that *matches*
    an existing heading, the authid for that heading is inserted into
    subfield $9
16. Confirm that if you enter a heading with multiple subfields that *matches*
    an existing heading, the authid for that heading is inserted into
    subfield $9
17. Create a record and link an authority record to an authorized field using
    the authority plugin.
18. Save the record. Ensure that the heading is linked to the appropriate
    authority.
19. Open the record. Change the heading manually to something else, leaving
    the link. Save the record.
20. Ensure that the heading remains linked to that same authority.
21. Change CatalogModuleRelink to "on."
22. Open the record. Use the authority plugin to link that heading to the
    same authority record you did earlier.
23. Save the record. Ensure that the heading is linked to the appropriate
    authority.
24. Open the record. Change the heading manually to something else, leaving
    the link. Save the record.
25. Ensure that the heading is no longer linked to the old authority record.

*** Testing link_bibs_to_authorities.pl ***
26. Set LinkerModule to "Default," turn on LinkerRelink and
    BiblioAddsAuthorities, and turn AutoCreateAuthorities and
    LinkerKeepStale off
27. Edit one bib record so that an authority controlled field that has already
    been linked (i.e. has data in $9) has a heading that does not match any
    authority record in your database
28. Run misc/link_bibs_to_authorities.pl --link-report --verbose --test (you may
    want to pipe the output into less or a file, as the result is quite a lot of
    information)
29. Look over the report to see if the headings that you have authority records
    for report being matched, that the heading you modified in step 2 is
    reported as "unlinked," and confirm that no changes were actually made to
    the database (to check this, look at the bib record you edited earlier, and
    check that the authid in the field you edited hasn't changed)
30. Run misc/link_bibs_to_authorities.pl --link-report --verbose (you may want
    to pipe the output into less or a file, as the result is quite a lot of
    information)
31. Check that the heading you modified has been unlinked
32. Change the modified heading back to whatever it was, but don't use the
    authority control plugin to populate $9
33. Run misc/link_bibs_to_authorities.pl --link-report --verbose
    --bib-limit="biblionumber=${BIB}" (replacing ${BIB} with the biblionumber
    of the record you've been editing)
34. Confirm that the heading has been linked to the correct authority record
35. Turn LinkerKeepStale on
36. Change that heading to something else
37. Run misc/link_bibs_to_authorities.pl --link-report --verbose
    --bib-limit="biblionumber=${BIB}" (replacing ${BIB} with the biblionumber
    of the record you've been editing)
38. Confirm that the $9 has not changed
39. Turn LinkerKeepStale off
40. Create two authorities with the same heading
41. Run misc/migration_tools/rebuild_zebra.pl -a -z
42. Enter that heading into the bibliographic record you are working with
43. Run misc/link_bibs_to_authorities.pl --link-report --verbose
    --bib-limit="biblionumber=${BIB}" (replacing ${BIB} with the biblionumber
    of the record you've been editing)
44. Confirm that the heading has not been linked
45. Change LinkerModule to "FirstMatch"
46. Run misc/link_bibs_to_authorities.pl --link-report --verbose
    --bib-limit="biblionumber=${BIB}" (replacing ${BIB} with the biblionumber
    of the record you've been editing)
47. Confirm that the heading has been linked to the first authority record it
    matches
48. Change LinkerModule to "LastMatch"
49. Run misc/link_bibs_to_authorities.pl --link-report --verbose
    --bib-limit="biblionumber=${BIB}" (replacing ${BIB} with the biblionumber
    of the record you've been editing)
50. Confirm that the heading has been linked to the second authority record it
    matches
51. Run misc/link_bibs_to_authorities.pl --link-report --verbose
    --auth-limit="authid=${AUTH}" (replacing ${AUTH} with an authid)
52. Confirm that only that heading is displayed in the report, and only those
    bibs with that heading have been changed

If all those things worked, good news! You're ready to sign off on the patch
for bug 7284.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master and squashed follow-up, 16 February 2012
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master, 21 February 2012

Signed-off-by: schuster <dschust1@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Tested with an UNIMARC setup that things work fine. They do

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Cherry-picked onto 3.6.x, 10 March 2012
Note for RMaint: this patch squashes all the bug 7284 patches from Master,
including the updatedatabase changes (but does not set the DB revision).

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoUpdating Version Number to 3.06.04.000 v3.06.04
Chris Nighswonger [Sun, 4 Mar 2012 21:32:13 +0000 (16:32 -0500)]
Updating Version Number to 3.06.04.000

12 years ago3.6.4 Translation Update
Frédéric Demians [Thu, 1 Mar 2012 15:20:09 +0000 (16:20 +0100)]
3.6.4 Translation Update
(cherry picked from commit 0f661c5fdec98d18f384a64205ed014d98704111)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6895 Diacritics in Pootle/po files are broken in source text
Frédéric Demians [Fri, 24 Feb 2012 12:04:05 +0000 (13:04 +0100)]
Bug 6895 Diacritics in Pootle/po files are broken in source text

To test:

  git checkout 3.6.x
  cd misc/translator
  ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/prog/en/ \
    -s ./po/fr-FR-i-opac-t-prog-v-3006000.po -r

  po/fr-FR-i-opac-t-prog-v-3006000.po contains broken diacritics for NORMARC
  strings for example
(cherry picked from commit e5871014de68161bd89a8fdcdb5aa7a4c1b9b038)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFixing up release notes to reflect all reverts
Chris Nighswonger [Wed, 22 Feb 2012 20:24:05 +0000 (15:24 -0500)]
Fixing up release notes to reflect all reverts

12 years agoRelease Notes for 3.06.04.000 22 Feb 2012 20:14:40 Z
Chris Nighswonger [Wed, 22 Feb 2012 20:14:40 +0000 (15:14 -0500)]
Release Notes for 3.06.04.000 22 Feb 2012 20:14:40 Z

12 years agoRevert "Bug 6875 de-nesting C4::Koha.pm"
Chris Nighswonger [Wed, 22 Feb 2012 19:44:29 +0000 (14:44 -0500)]
Revert "Bug 6875 de-nesting C4::Koha.pm"

This reverts commit c29850630d22c75bd85352b8bd169158f23eaa89.
-Unstable code

12 years agoRevert "Bug 6875 cleaning mainpage.pl"
Chris Nighswonger [Wed, 22 Feb 2012 19:44:06 +0000 (14:44 -0500)]
Revert "Bug 6875 cleaning mainpage.pl"

This reverts commit b21eda0d42b3f2d10c77d17f4a5ac4960b4ada4f.
-Unstable code

12 years agoRevert "Bug 6875 cleaning opac-main.pl"
Chris Nighswonger [Wed, 22 Feb 2012 19:43:43 +0000 (14:43 -0500)]
Revert "Bug 6875 cleaning opac-main.pl"

This reverts commit 27c4844a59cb603ad334d286fba7f32ea1eb72e1.
-Unstable code

12 years agoRevert "Bug 6875 de-nesting C4/Serials"
Chris Nighswonger [Wed, 22 Feb 2012 19:43:20 +0000 (14:43 -0500)]
Revert "Bug 6875 de-nesting C4/Serials"

This reverts commit e84d5a7b37ebf4b47e01da3c504bbabe031c37e1.
-Unstable code

12 years agoRevert "Bug 6875 de-nesting C4::Heading"
Chris Nighswonger [Wed, 22 Feb 2012 19:42:56 +0000 (14:42 -0500)]
Revert "Bug 6875 de-nesting C4::Heading"

This reverts commit 0e61cfb3a591aec28521f2fdd1a76fea904721ca.
-Unstable code

12 years agoRevert "Bug 6875 de-nesting C4::VirtualShelves"
Chris Nighswonger [Wed, 22 Feb 2012 19:42:33 +0000 (14:42 -0500)]
Revert "Bug 6875 de-nesting C4::VirtualShelves"

This reverts commit 6eb50992e85146dbc021493d290de7294355c646.
-Unstable code

12 years agoRevert "Bug 6875 de-nesting Auth.pm"
Chris Nighswonger [Wed, 22 Feb 2012 19:42:08 +0000 (14:42 -0500)]
Revert "Bug 6875 de-nesting Auth.pm"

This reverts commit 34d8c9765fa6b68e0c38be65d863c9bdd4b6a168.
-Unstable code

12 years agoRevert "Bug 7546 - cannot view subscription detail"
Chris Nighswonger [Wed, 22 Feb 2012 19:40:41 +0000 (14:40 -0500)]
Revert "Bug 7546 - cannot view subscription detail"

This reverts commit f6c55445ed2ef6fe5eaf99831b9ec180d12707ec.
-This is related to de-nesting work (Bug 6875) which is unstable

12 years agoRevert "Bug 7545: Can't edit items"
Chris Nighswonger [Wed, 22 Feb 2012 19:39:03 +0000 (14:39 -0500)]
Revert "Bug 7545: Can't edit items"

This reverts commit 57f25c57f02f260da08fe527308e1f5a5a01c8c7.
-Tied to de-nesting work (Bug 6875) which is unstable

12 years agoBug 7535: ampersands not showing properly in non-XSLT OPAC
D Ruth Bavousett [Mon, 13 Feb 2012 15:25:40 +0000 (10:25 -0500)]
Bug 7535: ampersands not showing properly in non-XSLT OPAC

Jared's fix for Bug 3326 fixed this in the staff client, but not the OPAC; moving this one line fixes it
both places.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
This can be replicated by indexing with -x
OPACXSLTResults must be set to "normally"
Reproduced original bug with rebuild-zebra.pl -x -b -w -r -v -v
Patch corrects the issue, does not change intranet behavior.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bbfaf8264c815013cd37155c9aac283e3cb3cc4a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFixing release notes to reflect reverted status of several Enh
Chris Nighswonger [Tue, 21 Feb 2012 14:30:21 +0000 (09:30 -0500)]
Fixing release notes to reflect reverted status of several Enh

12 years agoRelease Notes for 3.06.04.000 21 Feb 2012 14:26:00 Z
Chris Nighswonger [Tue, 21 Feb 2012 14:26:00 +0000 (09:26 -0500)]
Release Notes for 3.06.04.000 21 Feb 2012 14:26:00 Z

12 years agoUpdating Version Number to 3.06.03.001
Chris Nighswonger [Tue, 21 Feb 2012 14:20:17 +0000 (09:20 -0500)]
Updating Version Number to 3.06.03.001

12 years agoRevert "Bug 6299 - Provide a list of authorized values for Relator terms"
Chris Nighswonger [Tue, 21 Feb 2012 14:19:15 +0000 (09:19 -0500)]
Revert "Bug 6299 - Provide a list of authorized values for Relator terms"

This reverts commit ed6d4244074e08e28c40ce1fcf48d64492826b9b.
-Reverting Enh 6299

12 years agoRevert "Bug 6299 Add relator codes for fr-FR"
Chris Nighswonger [Tue, 21 Feb 2012 14:18:48 +0000 (09:18 -0500)]
Revert "Bug 6299 Add relator codes for fr-FR"

This reverts commit d5148aac15e6d80a19ad6dfc920ef9993ef7c144.
-Reverting Enh 6299

12 years agoRevert "Bug 6299 - add es-ES"
Chris Nighswonger [Tue, 21 Feb 2012 14:18:14 +0000 (09:18 -0500)]
Revert "Bug 6299 - add es-ES"

This reverts commit fa3a2cbedb24e793bf7ffd1ee8a3deff49010c9e.
-Reverting Enh 6299

12 years agoReverting Enh 6299
Chris Nighswonger [Tue, 21 Feb 2012 14:17:54 +0000 (09:17 -0500)]
Reverting Enh 6299

12 years agoRevert "Updating Version Number to 3.06.03.001"
Chris Nighswonger [Tue, 21 Feb 2012 14:15:14 +0000 (09:15 -0500)]
Revert "Updating Version Number to 3.06.03.001"

This reverts commit 0160ba05ac66e392800aad7caf5734667a223d87.
-Removing enh 6299

12 years agoRevert "Updating Version Number to 3.06.03.002"
Chris Nighswonger [Tue, 21 Feb 2012 14:14:35 +0000 (09:14 -0500)]
Revert "Updating Version Number to 3.06.03.002"

This reverts commit 52d83a16cd636165d1de415ed1398c7f4a414b12.
-Necessary to revert 6299

12 years agoRevert "Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml"
Chris Nighswonger [Tue, 21 Feb 2012 12:51:16 +0000 (07:51 -0500)]
Revert "Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml"

This reverts commit d76424a17cb246107dcfaf45fc41ae327c6b57e1.
-Introduces changes to sip configuration

12 years agoRevert "Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc...
Chris Nighswonger [Tue, 21 Feb 2012 12:51:01 +0000 (07:51 -0500)]
Revert "Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin"

This reverts commit 36cf50e27d39bc60c1a4fc4d76e88e5a088657bc.
-Introduces changes to sip configuration

12 years agoRevert "Bug 7238 - make packages deal with SIP config"
Chris Nighswonger [Tue, 21 Feb 2012 12:50:47 +0000 (07:50 -0500)]
Revert "Bug 7238 - make packages deal with SIP config"

This reverts commit 6b6440ad79c0614a94686ecc3a71d78f541e7efe.
-Introduces changes to sip configuration

12 years agoBug 6488 - followup - fixes issue with bibs with no items and serials being suppressed
Liz Rea [Fri, 17 Feb 2012 20:00:53 +0000 (14:00 -0600)]
Bug 6488 - followup - fixes issue with bibs with no items and serials being suppressed

To test:

* create a bib with no items
* update your index
serial records and your new bib with no items should be displayed.
* add something to the OPACHiddenItems syspref (I like itype: [BK] from the test data)
*** test both ways, with something in there and with the syspref empty.
* add an item to your new bib that would be suppressed
* update your index
* search for the bib
The item should not show
* change the item into a state where it would no longer be suppressed
* update your index
* search for the bib
The item should show in the opac
* just for fun, delete your item
* update your index
* Search for the bib - it should still display.

I tested on MARC21 - please test UNIMARC as well.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2a8fe16752e12505c55c9f8c08afe97afe460f7b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.06.04.000 20 Feb 2012 19:45:25 Z
Chris Nighswonger [Mon, 20 Feb 2012 19:45:25 +0000 (14:45 -0500)]
Release Notes for 3.06.04.000 20 Feb 2012 19:45:25 Z

12 years agoRevert "Bug 6836: Add jQuery dataTables plugin"
Chris Nighswonger [Mon, 20 Feb 2012 19:44:30 +0000 (14:44 -0500)]
Revert "Bug 6836: Add jQuery dataTables plugin"

This reverts commit 5f36947783cbe43a9550b3ffc839a2956d59ae94.

-Part of Enh 6836

12 years agoRevert "Bug 6836: followup CSS work"
Chris Nighswonger [Mon, 20 Feb 2012 19:44:00 +0000 (14:44 -0500)]
Revert "Bug 6836: followup CSS work"

This reverts commit 8edc97a838f8ee49c099e3870a15e43d554e2b63.

-Part of enh 6836

12 years agoRevert "Bug 6836: test case readingrec.pl"
Chris Nighswonger [Mon, 20 Feb 2012 19:43:34 +0000 (14:43 -0500)]
Revert "Bug 6836: test case readingrec.pl"

This reverts commit 0508e6fb86a48c8b99fdc63ccb2ebb1d5133c95a.

-Part of Enh 6836

12 years agoRevert "Bug 6836 follow-up fixing POD"
Chris Nighswonger [Mon, 20 Feb 2012 19:43:01 +0000 (14:43 -0500)]
Revert "Bug 6836 follow-up fixing POD"

This reverts commit 03e1c36dce6dc37f47c0927517b8bf646c214557.

-Part of Enh 6836

12 years agoRevert "Bug 6838: Add pagination and filtering on subscriptions table"
Chris Nighswonger [Mon, 20 Feb 2012 19:39:09 +0000 (14:39 -0500)]
Revert "Bug 6838: Add pagination and filtering on subscriptions table"

This reverts commit e13db856d4ceac1bb9b195dd10391cd239c19296.

-Part of DataTables Enhancement

12 years agoUpdating Version Number to 3.06.03.002
Chris Nighswonger [Mon, 20 Feb 2012 19:27:42 +0000 (14:27 -0500)]
Updating Version Number to 3.06.03.002

12 years agobug_7090: AllowItemsOnHandCheckout syspref
Srdjan Jankovic [Wed, 21 Dec 2011 08:26:30 +0000 (21:26 +1300)]
bug_7090: AllowItemsOnHandCheckout syspref

Observe AllowItemsOnHandCheckout syspref when using SIP self checkout

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
To test:
* place an item on hold for patron A
* attempt to circulate that item to patron B (via SIP/selfcheck)
syspref off: item should not circulate to patron B
Syspref On: item should circulate to patron B

Both conditions passed in our testing.
Also verified that normal staff client behavior regarding this situation was preserved. It was.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
-backported to 3.6.x

12 years agoBug 7357: display serial title instead of '---'
Adrien Saurat [Mon, 9 Jan 2012 10:55:08 +0000 (11:55 +0100)]
Bug 7357: display serial title instead of '---'

The full title of a serial is now displayed even
if several lines have the same title.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit cb1a9466931790bbe3aac19845a3c7b441e43ea2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6137 follow-up, moving new test to db_dependent directory
Paul Poulain [Fri, 17 Feb 2012 17:40:33 +0000 (18:40 +0100)]
Bug 6137 follow-up, moving new test to db_dependent directory
(cherry picked from commit 46a5154df940cf10e6718aa87717fdb87ebca702)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6137: unit tests for C4::Circulation::_GetCircControlBranch
Julian Maurice [Fri, 27 Jan 2012 14:59:36 +0000 (15:59 +0100)]
Bug 6137: unit tests for C4::Circulation::_GetCircControlBranch

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 76be6208eeafbeb555103570f1484a64a7a12394)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6137: fix a Circulation bug. userenv null
biblibre [Tue, 8 Mar 2011 09:28:38 +0000 (10:28 +0100)]
Bug 6137: fix a Circulation bug. userenv null

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f4a5206ae059132f9623e1873c2450fa6152206a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7532 - remove dependency on Date::ICal
Robin Sheat [Sun, 12 Feb 2012 03:36:34 +0000 (16:36 +1300)]
Bug 7532 - remove dependency on Date::ICal

This removes the dependency on Date::ICal (which is largely
unmaintained) and replaces it with DateTime::Format::ICal which can do
the same job. It also updates all the docs and installation scripts to
handle this change.

Note that this causes a minor behaviour change: previously the generated
times were converted to UTC, now they are left "floating" (that is, have
no timezone attached) and so will appear as the local time when imported
into a calendar. I don't anticipate this'll cause any issues however.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 70d95b515e491e5526c7276f0af03d51ff236d40)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7514 Choose OPAC language with URL parameter
Frédéric Demians [Thu, 9 Feb 2012 10:03:34 +0000 (11:03 +0100)]
Bug 7514 Choose OPAC language with URL parameter

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested:
- with and without cookie set
- different language codes

http://.../cgi-bin/koha/opac-changelanguage.pl?language=de-DE
will directly open the German OPAC.

http://.../cgi-bin/koha/opac-changelanguage.pl?language=en
will directly open the English OPAC.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8ec812d97de321d8100f8e80ccad06cc36840e12)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_7458: A call number plugin
Srdjan Jankovic [Wed, 8 Feb 2012 02:12:05 +0000 (15:12 +1300)]
bug_7458: A call number plugin

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
A library using an inhouse callnumbering system wants to be able to generate the next available call number not already in use.  This custom call number plugin returns the next callnumber not already in use once a correct prefix has been entered.  The prefixes are four to six letters, space, then one or two numbers.
(cherry picked from commit ecc1e94f35491ba392aa3bfd17118c55fa14e55b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7409 - add unzip and perl-doc dependencies to package
Robin Sheat [Fri, 10 Feb 2012 03:10:28 +0000 (16:10 +1300)]
Bug 7409 - add unzip and perl-doc dependencies to package

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4e8cd9a9ddd3c76745a5102498d8836457173db5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7312: Adds ISSN to serials/subscription-bib-search.pl results
Matthias Meusburger [Thu, 12 May 2011 09:29:01 +0000 (11:29 +0200)]
Bug 7312: Adds ISSN to serials/subscription-bib-search.pl results

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 91d0475a9b43dc3fbe6b373dc8dacd5db4bca9df)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7289: Add biblioitems.editionstatement to missing sql files
Katrin Fischer [Sun, 12 Feb 2012 18:27:57 +0000 (19:27 +0100)]
Bug 7289: Add biblioitems.editionstatement to missing sql files

Follow-up for 7289 adding the new mapping to translated frameworks.

http://bugs.koha-community.org/show_bug.cgi?id=7280

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 72616e4f3fa85f65741f8bd50f06408428bc60c5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7246 add offset/length and where options to rebuild_zebra
Paul Poulain [Wed, 1 Feb 2012 14:15:02 +0000 (15:15 +0100)]
Bug 7246 add offset/length and where options to rebuild_zebra

This patch reimplement a feature that is on biblibre/master for Koha-community/master

It adds 4 parameters:
* offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database
* length = how many records to export. Say 400 to export only 400 records
* where = add a where clause to rebuild only a given itemtype, or anything you want to filter on

Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh
that will be submitted in another patch.
rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Removed mention of -l option for limiting number of items exported, as requested
by QA manager. This can be re-added in a later patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1fd8c8a4debf750476a2369e4440ac662b19f6b7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7201 follow-up, fixing some indentation mistakes
Paul Poulain [Fri, 17 Feb 2012 09:58:01 +0000 (10:58 +0100)]
Bug 7201 follow-up, fixing some indentation mistakes
(cherry picked from commit 647843c3bba2fcd30b972e95b5b1952f38ff4ca0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_7201: Holds reports: add copynumber and enumchron
Srdjan Jankovic [Thu, 9 Feb 2012 00:24:35 +0000 (13:24 +1300)]
bug_7201: Holds reports: add copynumber and enumchron

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Data is there and correct - very helpful patch, thanks!
passes prove t xt t/db_dependent in line with current master failures.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8b80b315c3689bd58bee4cb5fc3c0d843bd080eb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6985 - remove kw,wrdl from the search results
Liz Rea [Wed, 25 Jan 2012 20:41:03 +0000 (14:41 -0600)]
Bug 6985 - remove kw,wrdl from the search results

To test:

* Apply patch
* Do a search in the OPAC, the result page should now say
  "Your search returned X results" instead of
  "Your search for "kw,wrdl:yyy" returned x results"
* Do a search that will have no results, kw,wrdl should not appear in the text.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Adrien Saurat <adrien.saurat@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4490650e2fc5dd4da6bd2e339434f1366beb610d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5346: Small display changes
Katrin Fischer [Mon, 23 Jan 2012 06:43:11 +0000 (07:43 +0100)]
Bug 5346: Small display changes

Changing display from:
Suggested by Admin, Koha (from suggestion #2)

To:
Suggested by: Admin, Koha (suggestion #2)

Adding some missing parentheses and deleting some additional spaces.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b5f7a1f8771fb0d98db3b39f1ef6315783c30238)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5346: Linking suggestions and orders.
Jonathan Druart [Wed, 18 Jan 2012 13:16:16 +0000 (14:16 +0100)]
Bug 5346: Linking suggestions and orders.

Display suggestion info in acquisition module:
  basket.pl
  neworderempty.pl
  orderreceive.pl
  parcel.pl

To Test:
Create a suggestion and accept it.
Create a new order from this suggestion
Receive this order

For each step, check if suggestion info are visible.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test provides more unit tests, all complete successfully.
perl t/db_dependent/Suggestions.t
Note: test case should be cleaned up after running tests.

Display changes are consistent and information about the suggestion
is shown on every important screen now.

I created an order from a suggestion and one from an existing record.

No problems found.
(cherry picked from commit 0200639b0077398fe2ce2cbe915c5c73b6dd9a01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago7367: Make translation possible of Close this window
Marcel de Rooy [Thu, 16 Feb 2012 12:37:51 +0000 (13:37 +0100)]
7367: Make translation possible of Close this window

Trivial change in two opac templates.
(cherry picked from commit 2ee63f49979bc617d010ec4f22027e1120776713)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7203: Fixes typo - 'Mange' to 'Manage' in several files.
Garry Collum [Wed, 18 Jan 2012 01:28:55 +0000 (20:28 -0500)]
Bug 7203: Fixes typo - 'Mange' to 'Manage' in several files.

Found 3 instances of the typo while looking for the typo reference in Bug 7203.
Fixed labels/label-edit-batch.tt, labels/label-edit-layout.tt, and patroncards/edit-layout.tt.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6a60642a9dbe3103854dc1edfe68a4765e3c03f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7530: Missing <li> tag in circ-menu.inc
Garry Collum [Sat, 11 Feb 2012 17:37:13 +0000 (12:37 -0500)]
Bug 7530: Missing <li> tag in circ-menu.inc

The address information of circ-menu.inc is not contained in <li> tags, this patch fixes it.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
verified new <li> in template. Looks good.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 99f2f62be926cf42812a639c4a5b3f458729aec3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7114: Fixes the Funds' page display after the Filter link is clicked.
Garry Collum [Fri, 20 Jan 2012 16:23:04 +0000 (11:23 -0500)]
Bug 7114: Fixes the Funds' page display after the Filter link is clicked.

On the funds page there is a Fund Filters form and a menu underneath this form.  When the form is hidden the contents of the page shift to the left overlapping the menu.  The menu underneath the fund filters form must have been a later edition.  This patch removes the line of javascript that shifts the contents of the page after the form is hidden.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes the broken Layout when clicking on 'Filters'.

I am a bit confused by the link. I think it should toggle between different descriptions and
perhaps even hide all of the left navigation. This way the funds table would get more
room for display.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2be08f695a1a28c51276e233ac030fc5337484c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7406 Fix saved reports display paging inconsistency
Frédéric Demians [Wed, 8 Feb 2012 18:13:41 +0000 (19:13 +0100)]
Bug 7406 Fix saved reports display paging inconsistency

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3fcdd902f8fcd6d64fba8f434ae811d8e1a04fdd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7489 - Implement DisplayOPACiconsXSLT for NORMARC XSLT
Magnus Enger [Fri, 3 Feb 2012 08:57:32 +0000 (09:57 +0100)]
Bug 7489 - Implement DisplayOPACiconsXSLT for NORMARC XSLT

This patch actually hides the whole line that contains the icon in the result
list, including "literary form" and "audience", but this is how the syspref
works for MARC21 too, so I'm sticking with that.

To test:
- Set marcflavour = NORMARC
- Set OPACXSLTResultsDisplay = on
- Set DisplayOPACiconsXSLT = show
- Check that icons and information about "Type", "Litterær form" and
  "Målgruppe" are displayed in results, "Type" and the icon in detail
- Set DisplayOPACiconsXSLT = don't show
- Check that icons and information is not displayed in result or detail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan worked nicely. Patch works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0bc06f11a6e94b2c01593f29881c661cc6c03c59)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7521: Templates should use receive_serials permission
Katrin Fischer [Fri, 10 Feb 2012 06:17:33 +0000 (07:17 +0100)]
Bug 7521: Templates should use receive_serials permission

Corrects templates to use permission receive_serials.

Before patch:
1) Serial receive page (/cgi-bin/koha/serials/serials-edit.pl...)
can only be accessed with full serials permissions.
When one permission is missing, page can not be accessed.

2) Serial collection/Issue History page (/cgi-bin/koha/serials/serials-collection.pl...)
can only be accessed with full serials permissions.

After applying patch:
1) Serial receive page can only be accessed when user has receive_serials
permission.

2) Edit and serial receive links are hidden, when user doesn't have
serials_receive permission. Page is accessible with at least 1 serials
permission.

I will send a another patch to correct behaviour for the routing permission.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d9d364516b0bd5363c95b134520bb0379836be51)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7551 : Can only renew for the user you are logged in as now
Chris Cormack [Thu, 16 Feb 2012 20:23:53 +0000 (09:23 +1300)]
Bug 7551 : Can only renew for the user you are logged in as now

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 497f49d8b69e0be9e192b48bf40f2f5ab6cc92ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7546 - cannot view subscription detail
Liz Rea [Wed, 15 Feb 2012 20:13:49 +0000 (14:13 -0600)]
Bug 7546 - cannot view subscription detail

This patch adds a C4::Search to subscription-detail.pl to compensate for a removed
one from auth.pm during the denesting effort.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bug 7546 Do not call routine as bareword

Fixes compilation errors due to calling routine without parens
Also nothing was gained (and obfuscation added) by forcing
the return into a hash ref have changed variable to hash
tidied up the if else chain

These routines should be refactored out future

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
bug 7546 follow-up, enabled_staff_search_views problem

* enabled_staff_search_views was not exported by C4::Search, should have been
* serials/serials-edit.pl were also missing it

Comments:
* checked with for file in */*.pl; do perl -wc $file; done that no script was still having this problem

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Final sign off for all 3 patches
Note: I had some problems with tests, but it is probably related to my data and not this patch.
(cherry picked from commit 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3264 UnCloneField() / minus button in MARC editor can clear all subfields (author...
Marcel de Rooy [Thu, 19 Jan 2012 08:50:03 +0000 (09:50 +0100)]
Bug 3264 UnCloneField() / minus button in MARC editor can clear all subfields (authorities AND biblio)

All subfields following the removed subfield were not saved.
Problem is in C4/Biblio routine TransformHtmlToMarc.
If the field is emptied, the param list contains a code param but no subfield
param. The while loop handling the subfields could not handle that. Also added
a FIXME because the whole routine depends on an assumption about the order of
cgi parameters that is not strictly guaranteed.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I was unable to replicate the problem, but can confirm that the patch does
not break anything under any of the following platforms/browsers:
Mac OS X 10.6.8:
Chrome 16.0.912.77
Firefox 9.0.1

Windows 7:
Firefox 3.6.3
Firefox 9.0.1
IE 8.0.7600.16385

Ubuntu 11.10
Firefox 8.0
Chromium 15.0.874.106 (Developer Build 107270 Linux)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 795dc61f7526c3810173139004c741dc8c810382)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6718 No manager_id saved for writeoff fines.
Maxime Pelletier [Tue, 7 Feb 2012 16:10:32 +0000 (11:10 -0500)]
Bug 6718 No manager_id saved for writeoff fines.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Tested per test plan.
Passes prove xt t t/db_dependent

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1d7262838077543af4dc8afde7e43188c0c432c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7018 - need all acq permissions to search
Kyle M Hall [Wed, 8 Feb 2012 15:45:53 +0000 (10:45 -0500)]
Bug 7018 - need all acq permissions to search

Single line fix. Changes permissions required for histsearch.pl
from requiring * for acquisitions to only requiring
group_manage, order_manage, and order_receive

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0d037efd358c5516466c5df99e565d5fd98d5a74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7545: Can't edit items
Nicole C. Engard [Wed, 15 Feb 2012 19:48:33 +0000 (14:48 -0500)]
Bug 7545: Can't edit items

This patch makes it so that you can click 'edit items' and actually
edit items.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Works as advertised.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
(cherry picked from commit c004b88f5a907227af0249bd9516ea7e868a8f76)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7238 - make packages deal with SIP config
Robin Sheat [Thu, 9 Feb 2012 23:55:09 +0000 (12:55 +1300)]
Bug 7238 - make packages deal with SIP config

This moves the SIP config to the templates directory (on package
building) in anticipation of making it configurable with package tools.
Prevents it being installed into /etc.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 831e14e89e7c4af998d5b7d7926b08a8eba22c76)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoPrevious and next functions are not used, since this code was removed from mas_subfie...
Juan Romay Sieira [Tue, 27 Sep 2011 09:16:27 +0000 (11:16 +0200)]
Previous and next functions are not used, since this code was removed from mas_subfields_structure.pl

http://bugs.koha-community.org/show_bug.cgi?id=6924
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2d67771157e9c07f5e907fc6507bbd9fabb3b82c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7080 - Revised - Clean up interface on fine payment screens
Owen Leonard [Fri, 21 Oct 2011 14:19:30 +0000 (10:19 -0400)]
Bug 7080 - Revised - Clean up interface on fine payment screens

- Move some content out of table cells
- Improve table markup with <thead>, <tbody>, and <tfoot>
- Improve breadcrumb specificity on paycollect.pl
- Add clearer messages for different actions (Pay selected fines, pay an
  individual fine, etc.
- Add client-side warning to pay.pl when writing-off all
- Correcting terminology: When a verb, "write off," when a noun: "Writeoff."

Revision: Correcting tab label case according to Bug 2780 guidelines

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked all 4 fine tabs and performed different fine actions.
The layout on all pages looks clean and correct.
I tested the new client-side warning and made sure it's translatable.
Labels have proper capitalization.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0f80707d7c7b609fab357b12913da242b212e63b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting Auth.pm
Paul Poulain [Fri, 16 Sep 2011 16:02:58 +0000 (18:02 +0200)]
Bug 6875 de-nesting Auth.pm

* removed use C4::Koha that is useless
* moved "use C4::Members" to "require C4::Members" just before GetMemberDetails call. This will avoid loading C4::Member everytime a page is called by someone not logged

* still to do = work on C4::VirtualShelves, that can be optimized, definetly !

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master, 28 Jan 2012

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Please WAIT with virtual shelves. Working on that..
Tested and marked as Passed QA.
(cherry picked from commit e780e0669c8b2d2a50a7996ab76e584c4cd4c59d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4::VirtualShelves
Paul Poulain [Fri, 16 Sep 2011 19:58:30 +0000 (21:58 +0200)]
Bug 6875 de-nesting C4::VirtualShelves

* C4::Circulation is unused, removing it
* C4::Members used only in ShelfPossibleAction, switching from use to require
* C4::Auth used only in RefreshShelvesSummary, a sub called only in
opac-addbybiblionumber.pl script, moving the require inside the sub

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4d2cfa610e0adf22a2bd1dce2647aad15683a2b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4::Heading
Paul Poulain [Fri, 16 Sep 2011 17:38:06 +0000 (19:38 +0200)]
Bug 6875 de-nesting C4::Heading

C4::Search is needed only in authorities sub, moving it here and switching to
require

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected call to SimpleSearch in both subs where it is used. Additional
performance improvements are included in bug 7284. 28 Jan 2012
(cherry picked from commit 58c46b27af601a893e1eabdfb5bd7d4d0d887f24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4/Serials
Paul Poulain [Fri, 16 Sep 2011 16:48:15 +0000 (18:48 +0200)]
Bug 6875 de-nesting C4/Serials

* use C4::Branch is loaded only to call GetBranchNAme in PrepareSerialsData
  and set branchname in the hashresult. This sub PrepareSerialsData is used
  in the following scripts :
opac/opac-serial-issues.pl:    my $subscriptioninformation=PrepareSerialsData($subscriptions); => no use of branchname after
serials/serials-collection.pl:   $subscriptions=PrepareSerialsData(\@subscriptioninformation); => no use of branchname after
=> we can remove the ->{branchname} from the result, and remove the C4::Branch dependancy
* moves use C4::Items to require C4::Items, to call AddItemFromMarc, when
  receiving a serial, with Recieving create an item set in the subscription.
* removed use C4::Letters and C4::Search, that are useless

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c52f0b7fdfc8ac3163cefc33c52c861bd7542da9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 cleaning opac-main.pl
Paul Poulain [Fri, 16 Sep 2011 22:40:03 +0000 (00:40 +0200)]
Bug 6875 cleaning opac-main.pl

C4::VirtualShelves, C4::Branch and C4::Acquisition are useless, removing their
loading

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 6fbe49ce31926d42902d3748abbb844aac414ae6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 cleaning mainpage.pl
Paul Poulain [Fri, 16 Sep 2011 22:34:40 +0000 (00:34 +0200)]
Bug 6875 cleaning mainpage.pl

AutoritiesMarc is loaded for nothing : we don't display authorities anywhere,
so removing the dependancy as well as the useless code

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 056b5faa407df5ef30c56afb91b5a1801df478ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4::Koha.pm
Paul Poulain [Fri, 16 Sep 2011 16:28:00 +0000 (18:28 +0200)]
Bug 6875 de-nesting C4::Koha.pm

* removed use C4::Output, that was not used
* moved use URI::split to getitemtypeimagelocation and switched to "require".
  Checked it still works through admin/itemtype.pl
* moved use Business::ISBN to _isbn_cleanup.pl and switched to "require".
  Checked it still works with the following small script :

use C4::Koha;
print GetNormalizedISBN("1-56592-257-3");

(GetNormalizedISBN uses _isbn_cleanup)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8165aeef777863d03f096f5547032d47d79cfa0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7432 : Fixing caching for C4::Languages
Chris Cormack [Thu, 2 Feb 2012 23:44:17 +0000 (12:44 +1300)]
Bug 7432 : Fixing caching for C4::Languages

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit efd26a44d5640555f7c1a97e782e3661af7d77f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7432 : Fixing caching for SQLHelper
Chris Cormack [Thu, 2 Feb 2012 23:39:43 +0000 (12:39 +1300)]
Bug 7432 : Fixing caching for SQLHelper

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 516abc48962bde84c1c58ff6bf59d969c962aab9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7432 : Fix how we are setting expiry time when caching
Chris Cormack [Thu, 2 Feb 2012 23:35:21 +0000 (12:35 +1300)]
Bug 7432 : Fix how we are setting expiry time when caching

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 70237c49ef1aced89dfaf56ad5c9a847c0dc9d83)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in...
Owen Leonard [Tue, 11 Oct 2011 18:52:19 +0000 (14:52 -0400)]
Bug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in opac

This patch standardizes the condition under which renewal controls
are displayed at the page (as opposed to item) level. In some
places "canrenew" was used, in others "patron_flagged" was used.
Now "canrenew" controls renew controls and "patron_flagged" only
triggers the display of user warnings.

This patch also allows for renewal information to be displayed
for each item in situations where OPAC renewals are allowed but
disabled for whatever reason. This gives the patron information
about used/available renew counts but hides renew controls.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0027fe0cc367632038f4562aaea22a582c785d9b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.06.03.001
Chris Nighswonger [Sun, 19 Feb 2012 21:35:19 +0000 (16:35 -0500)]
Updating Version Number to 3.06.03.001

12 years agoBug 6299 - Advertise this addition during upgrade
Tomas Cohen Arazi [Thu, 4 Aug 2011 20:47:42 +0000 (17:47 -0300)]
Bug 6299 - Advertise this addition during upgrade

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10, 2011: Fixed some small typos.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Oct 7th, 2011: rebased for master

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.6.x

12 years agoBug 6299 - add es-ES
Tomas Cohen Arazi [Wed, 10 Aug 2011 14:46:17 +0000 (11:46 -0300)]
Bug 6299 - add es-ES

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing Spanish I can't comment on the translations, but any errors can be
corrected at a later date.
(cherry picked from commit 1142b189f29808bae6f7f099f692b902795ab94b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6299 Add relator codes for fr-FR
Frédéric Demians [Mon, 30 Jan 2012 18:14:04 +0000 (19:14 +0100)]
Bug 6299 Add relator codes for fr-FR

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing French I can't comment on the translations, but any errors can be
corrected at a later date.
(cherry picked from commit 147a3f8b970450c97a41a4ef60f56c5f77748564)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6299 - Provide a list of authorized values for Relator terms
Tomas Cohen Arazi [Tue, 7 Jun 2011 14:27:37 +0000 (11:27 -0300)]
Bug 6299 - Provide a list of authorized values for Relator terms

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10,2011: Tested install and upgrade.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
January 28, 2012: Removed untranslated non-en SQL relator term files.
(cherry picked from commit 211a10c83ab36af3c299b05cd74864e6801bd072)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6838: Add pagination and filtering on subscriptions table
Julian Maurice [Fri, 2 Sep 2011 14:30:18 +0000 (16:30 +0200)]
Bug 6838: Add pagination and filtering on subscriptions table

Use dataTables plugin

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2916ddae4ad32886831004d8efe373a62eda198e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>