This fix ensures that searches will still work when -x is not used when
reindexing Zebra.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e18ddca9d4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
In Liz's second comment on this bug, she points out that local-only
holds (and also no-holds) items are being used to fill the first hold
in the queue, no matter where located, transitting if necessary. If
all the items on a biblio are set to no-holds types, this problem
would never arise, as no holds could be *placed*. But if you have
one or more unlimitedor local-hold items, then holds are getting
filled by the first item to cross a scanner, no matter what.
This patch will check during C4::Reserves::CheckReserves to make sure
that the hold being handed back to AddReturn is actually fillable by
the item just scanned. One caveat: If CircControl is set to "the library
you are logged in at", this will cause items checked in at
other-than-their-home-library to fill local holds at the library where
scanned. This is, however, an edge case!
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 784b9df4f2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
When using XSLT mode, the OPAC results display will show "&" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&" with "&" and then extends the previous fix to apply to all occurrences
of "& " instead of just the first.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d52f3680f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.
Note: This should be backported to 3.2.x
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5a924cc530)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9b5e18c4ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 07b9125861)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6e580439b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e297c6cb8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 728b3725df)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
When hidelostitems system preference is enabled, lost items are hidden on OPAC
detail page but are shown on result page. This patch modify MARC21/UNIMARC XSL
in order to take into account hidelostitems syspref on OPAC result page.
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 326222e3f1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Update to default Apache config; should result in a slight
performance benefit.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 12cc56a9c7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Restores ability to search on extended borrower attributes that are configured to be searchable
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ee0cc18b3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
loops were slightly illogical and db accesss was excessive
and repetitive. caused it not to scale well on large datasets
Routines in Acquisition.pm seem to have inconsistent views
of the data.
rework logic to utilize db and processing better
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0fd3b7f112)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 002baadaf4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- 'Not checked out since:' date was not added to query
- borrowers with only checkouts and no returns since this date were considered inactive
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f2cf6c2db3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b39466c965)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 306871578e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Not part of the bugfix per se, but taking this chance
to clean up some inconsistent tabbing.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2e963dc416)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Offline circ no longer tries to calculate the due date
directly, instead relying on the AddIssue and AddRenewal
APIs to do so. This corrects a bug where the due date
would be calculated incorrectly if the item-level_itypes
system preference is turned on.
This change also has the effect of causing the issue date
for loans uploaded via offline circulation to be set
to the time stamp recorded by the offline circulation client.
Test plan:
* Turn on item-level_itypes
* Create an example item whose loan policy per
the item's item type would be different from
the default policy based on the bib-level type.
* Create a test KOC file with a loan of the test
item and the checkout date artificially set
to yesterday.
* Upload the file:
- Before the fix, the due date would be set
to the default due date. Also, the issue date
will be set to the date of the upload.
- After the fix, the due date would be calculated
correctly based on the item's item type. Also,
the issue date will be set to the date recorded
by the offline circulation client.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 935635aba5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Reimplements support for -r, as well for -reset
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8dc56a0d2c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6718e14e7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c84dad3b18)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b285cf44d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Correcting check for circulation permission. Also updating
updateitem.pl (for setting lost and damaged statuses) with
circulate permissions.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7a587112f0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Reimplementation of Nahuel's patch from 2010-03-02
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ba9aab76b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dbe3780fc0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.
This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4735e296cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Calendar picker JS can't come before main JS includes
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2dde876798)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Field enumchron in items table is now varchar(80).
We have records that need a much longer field, even up to 400 or 500 chars.
I suggest to change its type to TEXT (variable length with max 64K; tinytext
goes up to 255 chars and is just too short).
Mediumtext or longtext are not needed; as a side note these types are used in
the items table for e.g. booksellerid and more_subfields_xml..
Revised original patch thanks to Ian Walls: update kohatructure.sql. Copied the change in deleteditems as well.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fca88d102b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 87ec412648)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 19adf162ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbd08ffd09)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ded7b9897)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop,
which forces a selected branch. Removing the extra call, and just measuring the size of
@branchloop as it was build, plus some dereferencing, fixes the issue.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixing: Undefined subroutine prepare called on line 722.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 439d2224e1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Modifying empty cart function to take a paramter: if true,
cart will be emptied without a prompt.
Removing unnecessary "javascript:" pseudo-protocol.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 61f6828d12)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit edafbd941d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jared Camins-Esakov
ruth@bywatersolutions.com
Chris Nighswonger
Chris Nighswonger
Frédéric Demians
Chris Cormack
Nicole Engard
Janusz Kaczmarek
Henri-Damien LAURENT
Marcel de Rooy
Galen Charlton
Stéphane Delaune
Colin Campbell
Tomás Cohen Arazi
Katrin Fischer
Frédérick Capovilla
Paul Poulain
Ian Walls
Reed Wade
Nahuel ANGELINETTI
Owen Leonard
MJ Ray
Robin Sheat