Commit graph

16186 commits

Author SHA1 Message Date
Dobrica Pavlinusic
574f46fb19 Bug 7821 - fix C4::Templates::_current_language
Bareword "C4::Templates::_current_language" not allowed while "strict subs" in use at /home/oleonard/kohaclone/C4/XSLT.pm line 175.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Fixes the problem.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-02 11:33:17 +02:00
Paul Poulain
f9207da8f2 bug 7821 follow-up: escaping {} in regexp 2012-03-29 17:23:50 +02:00
Dobrica Pavlinusic
f91bd36399 Bug 7821 - {langcode} will be replaced with current interface language
This makes bug 4032 support multi-language Koha installation which is important
for some of Koha users.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) After update XSLT system preferences are set to 'default'. All views
(OPAC and staff, results and detail page) work and switching languages
selects the correct translated file.

2) Leaving empty works and normal views are used.

3) Putting in a single URL without placeholder works.

4) Putting in a URL with placeholder works. Created local directories
have to match the language codes.

NOTE: In order to make the URLs and patchs work, the Utils file needs to be
copied too.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 17:05:12 +02:00
Paul Poulain
8f17915231 Bug 4032 follow-up: removing ` in syspref 2012-03-29 16:59:34 +02:00
Paul Poulain
94c1dabfa4 Bug 4032 follow-up: DBRev number 2012-03-29 16:59:13 +02:00
Stéphane Delaune
df0a6a71d7 Bug 4032 XSLT systempreference takes a path to file rather than YesNo
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

I am signing it off because it doesn't break anything and I will report
another bug for language issues described in my previous comment.

Removed MySQLism backquotes
2012-03-29 16:58:55 +02:00
MJ Ray
9d394e12fc Bug 7729 : svc/bib: support appending ?items=1 to the URL to fetch or modify items
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-03-29 16:52:04 +02:00
eb3dc448d2 Bug 7835 - submit and cancel buttons on diff lines on notices
Changing markup of cancel button to match standard Koha pattern.
Also correcting some invalid markup:
 - unescaped ampersands
 - invalid form action attributes
 - improperly nested elements in <ol>
 - invalid "for" on label

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 15:19:24 +02:00
Paul Poulain
0a44448bfb bug 7641 follow-up: remove some unconditionnal warns 2012-03-29 15:10:34 +02:00
Paul Poulain
b7a6071cf5 bug 7641 follow-up: activate use strict (see coding guidelines) 2012-03-29 15:10:16 +02:00
Paul Poulain
69a1d77dd9 bug 7641 follow-up DBRev number 2012-03-29 15:09:43 +02:00
f446b3d03d Bug 7641: Suspend Reserves
Adds the ability to suspend reserves. The new system preference
AutoResumeSuspendedHolds enables the ability to set a date for
a suspended hold to automatically be resumed.

When a hold is suspended, it will continue to increase in priority
as the holds above it are fulfilled. If the first holds in line
to be filled are suspended, the first non-suspened hold in line
will be used when an item can fulfill a hold that has been placed.

http://bugs.koha-community.org/show_bug.cgi?id=7641
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Tested with the preference on and off:
1. placed several holds in the staff client
2. suspended some with a date
3. suspended some without a date
4. triggered hold message by checking in for hold with suspensions
5. the suspended hold was skipped as it should be
6. tested suspending holds in the OPAC w and w/out dates
7. ran the cron to clear suspensions with dates

All the above tests worked as expected. Signing off.
2012-03-29 14:37:49 +02:00
Jared Camins-Esakov
98c59fc357 Bug 7701: Error when sending serial alerts
Probably due to bug 6875, C4::Letters is no longer used by C4::Serials, so that
when SendAlerts is called (exactly when this happens is a mystery to me), you
will get an error. Adding a "require C4::Letters;" and prefixing SendAlerts to
C4::Letters:: should fix it.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes the perl error. Steps to reproduce:

1) Create a subscription and set patron notification to "Routling list" -
this is necessary, so that a link to email notifications shows up in the OPAC.
2) Search for the serial record in the OPAC and click on the more details
view from the subscriptions tab. Subscribe to email notifications.
3) Go back into the serials module and receive and issue for the serial.
Before the patch a nasty perl error will be shown, after the patch
receiving works.

I couldn't confirm that the email was sent out with my setup, but this patch
certainly fixes serial receive.

[Update 2011-02-29] Fixed the typo and retested. Looks good, but couldn't check
if the mail was actually sent.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 11:13:04 +02:00
Jared Camins-Esakov
937480abe0 Bug 7617: Sort authority results by authid
Add the option of sorting authority search results by authid, and instruct the
FirstMatch and LastMatch linkers to use that sort order rather than the default
search order.

To test:
1. Install new Zebra authorities config
    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/record.abs, and
    etc/zebradb/marc_defs/unimarc/authorities/record.abs
2. Reindex authorities in Zebra
3. Set LinkerModule to FirstMatch or LastMatch
4. Add two identical authority records, and a bib record with a heading that
   matches them
5. Run misc/link_bibs_to_authorities.pl on that record
6. Confirm that the authid that's been inserted into subfield $9 of that
   heading is the first, if you selected FirstMatch, or last if you selected
   LastMatch

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I followed the test plan and checked that for "Last match" and "First match"
the correct authority was selected and linked to the record.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 11:04:58 +02:00
Magnus Enger
448dbe2df5 Bug 7537 - Implement TraceCompleteSubfields, TraceSubjectSubdivisions and UseICU for NORMARC XSLT
IMPORTANT! This patch relies on the patch for Bug 7092, which is now pushed to
master.

As the title says, this patch implements TraceCompleteSubfields,
TraceSubjectSubdivisions and UseICU for NORMARC XSLT, both for the OPAC
and the Intranet. This affects how clickable subject-links are constructed.

To make this work the indexing of MARC fields in the 600 range is changed
to include "Subject:p" in several new places.

To test:

Find a record with a "complex" subject, like "Internet -- Law and legislation".
MARC21 and NORMARC are very similar in how they handle subjects, so testing
on a MARC21 database should be OK. (Changes in indexing reflect changes already
made to the MARC21 indexing.)

Make sure you have these syspref settings:
- marcflavour = NORMARC
- XSLTDetailsDisplay = using XSLT stylesheets
- OPACXSLTDetailsDisplay = using XSLT stylesheets

(Ideally, testing should be done on a real NORMARC setup, but since the changes
to indexing only reflect how it's already done in MARC21, I think testing
on a MARC21 installation with marcflavour = NORMARC should be OK.)

Now try the different combinations of TraceCompleteSubfields,
TraceSubjectSubdivisions and UseICU, and check the format of the
clickable links, both in the OPAC and staff client. Here's what you should
be seeing:

1.
TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Don't include
UseICU = Not using
  opac-search.pl?q=su:"Internet"
UseICU = Using
  opac-search.pl?q=su:{Internet}

2.
TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Don't include
UseICU = Not using
  opac-search.pl?q=su,complete-subfield:"Internet"
UseICU = Using
  opac-search.pl?q=su,complete-subfield:{Internet}

3.
TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Include
UseICU = Not using
  opac-search.pl?q=(su:"Internet") AND (su:"Law and legislation.")
UseICU = Using
  opac-search.pl?q=(su:{Internet}) AND (su:{Law and legislation.})

4.
TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Include
UseICU = Not using
  opac-search.pl?q=(su,complete-subfield:"Internet") AND (su,complete-subfield:"Law and legislation.")
UseICU = Using
  opac-search.pl?q=(su,complete-subfield:{Internet}) AND (su,complete-subfield:{Law and legislation.})

UPDATE 2012-03-23
- Change the syspref TracingQuotes to UseICU, see bug 7092
- Change boolean operator from "and" to "AND", see bug 7695

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: UseControlnumber must be turned off.

1) Works.
2) Works.
3) Works.
4) Works.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 11:00:32 +02:00
Magnus Enger
43214bbcce Bug 7436 - Set itemtypes.rentalcharge = 0 in sample data for nb-NO and de-DE
Set the rentalcharge = 0 for sample itemtypes (except Music for nb-NO).

To test:
Run through the web-installer for nb-NO and de-DE, and check that
itemtypes are displayed correctly for each language.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>.
Note: You have to install the language first in order to be able
to select it in the web installer. There was a problem
in the po files for nb-NO that kept all files from being created
correctly. I fixed the po file and did an installation with all sample
files. There is a problem with z3950servers.sql that is not caused
by this patch:
z3950servers.sql
ERROR 1136 (21S01) at line 1: Column count doesn't match value count at row 1

Web installer for de-DE ran without problems on the sample files.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 10:43:07 +02:00
Katrin Fischer
25f7841028 Bug 4819: Add ids to OPAC detail page
Patch adds an unique id to every item tab and
to every column in the items table on the holdings tab.

http://bugs.koha-community.org/show_bug.cgi?id=4819
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 10:42:14 +02:00
aa8c40120b Bug 7485 - Cannot edit barcode on Fast Add
Simple fix, a special case was added for the fast add framework
in the case that an item was being checked out that had not been
catalogued. In that case, the barcode was being passed as a parameter
through addbiblio.pl to additem.pl.

This barcode param was used to overwrite the existing value, so if
no barcode param was passed ( which is only the case with fast adds
from the circ screen ), the barcode field would appear empty in the
items editor.

This commit causes that special case code to check for an existing
barcode value first, and only use the cgi parameter 'branch' in the
case that there is no existing barcode value.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Editing barcode of fast added item now works. Passes t xt

Recommend this for 3.6 release.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 10:01:35 +02:00
Paul Poulain
cfa444d583 bug 6858 follow-up indenting with spaces 2012-03-28 18:10:40 +02:00
Matthias Meusburger
15c8a453fc Bug 6858: Adds staticfines.pl for static fines processing
Add a tool to calculate static fine. For example, 7 days left = 1€ fixed fine

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 17:59:50 +02:00
Paul Poulain
0486d0c6b7 Merge remote-tracking branch 'origin/new/bug_6199' 2012-03-28 17:54:55 +02:00
Robin Sheat
b96c8b7ffa Bug 6199 - allow bulkmarkimport.pl to remove duplicate barcodes
This adds the -dedupbarcode option that allows bulkmarkimport to erase
a barcode but keep the item of any items it finds with duplicate
barcodes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 17:30:54 +02:00
Dobrica Pavlinusic
95bf6fb012 Bug 7829 - reports/ remove all exit(1) for plack
In Bug 7772 Ian correctly noted that reports have exit(1) all over the place.
This is left over from old code, and this patch changes them to exit(0).

I decided to use plain exit as opposed to explicit exit(0) since it produces
cleaner code, but I'm welcoming suggestion on this.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:25:24 +02:00
Katrin Fischer
8136a31f54 Bug 7823: [SIGNED-OFF] Ergonomy improvements: Rename button to "New patron"
"New" for adding new patrons is hard to translate and is not consistent
with the naming of similar buttons in other parts of Koha.

Patch changes "New" to "New patron".

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Patch does what it says and ii makes sense to change the wording.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:24:09 +02:00
Magnus Enger
c429c8d774 Bug 7695 - Change boolean operator from "and" to "AND"
When XSLTDetailsDisplay/OPACXSLTDetailsDisplay = on and
TraceSubjectSubdivisions = Include, subject sudivisions are
combined with the boolean operator "and". Currently, this word is
translated along with other occurrences of the same word, resulting
in a false "no records found" for users of non-English templates.

This patch replaces "and" with "AND" which should have no effect on
searching (since Zebra is case-insensitive in this regard) but will
make the boolean operator stand out from other uses of "and" in
translations.

TraceSubjectSubdivisions is currently only implemented in MARC21,
so UNIMARC and NORMARC is not affected.

To test:

XSLTDetailsDisplay/OPACXSLTDetailsDisplay = using XSLT
TraceSubjectSubdivisions = Include
marcflavour = MARC21

Find a record with a clickable subject that includes one or more
subdivisions and check that the subdivisions are combined with
"AND", not "and". Check that you get the expected result when
clicking on the subject.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy to test and works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:23:26 +02:00
Magnus Enger
2f5f7bfe31 Bug 7837 - nb-NO z3950servers.sql misses column names
Fix installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql so it
includes column names.

To test:
- Install the nb-NO language
- Run through the web installer, and make sure to select the optional
  ("Valgfritt") z3950servers.sql file
- Check there are no errors
- Check that the Z39.50 errors are displayed OK in
  Home › Administration › Z39.50 Servers

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Web installer runs without any errors now and I checked that
the Z39.50 servers were imported correctly and can be edited.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:21:15 +02:00
Magnus Enger
b9464ad66c Bug 7727 - NORMARC XSLT OPAC detail view shows double tabs
With marcflavour = NORMARC and OPACXSLTDetailsDisplay = Using XSLT,
the detail view displays a double set of tabs for Normal/MARC/ISBD
views, one above the title and one below.

To test:
marcflavour = NORMARC
OPACXSLTDetailsDisplay = Using XSLT

Since the contents of the recaords do not matter here, the patch
can be tested on MARC records of any flavour.

- Check that double tabs are shown
- Apply the patch
- Check that only the set of tabs at the top is shown

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:19:59 +02:00
Paul Poulain
fc63a2479f Bug 5354 follow-up : dealing with a wrong regexp
I could not reproduce the working behaviour when I found that the tiny follow-up introduced a bug
| being a reserved char in regexp, split '|' is not splitting on '|' ! we must write '\|' !
2012-03-28 16:17:45 +02:00
Paul Poulain
1610a7d61c bug 5354 follow-up DBRev number 2012-03-28 16:15:34 +02:00
Jonathan Druart
a52d3fbf9d Bug 5354: Followup. Change separator 2012-03-28 15:56:45 +02:00
Jonathan Druart
5167e8034d Bug 5354: Partial duplication of a subscription
A new syspref (SubscriptionDuplicateDroppedInput) contains the list of fields to
duplicate when duplicating a subscription. The library will be able to
define that, for example, the internal note should not be duplicated

Test plan:
On the detail subscription page, click Edit > Edit as New (Duplicate):
All the information must be copied from the original subscription.

Fill the syspref SubscriptionDuplicateDroppedInput with a list of fields
you don't want to be duplicated (e.g. location;notes;branchcode).

Repeat the duplicate action. Normally, information for these fields are
not copied.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
2012-03-28 15:51:23 +02:00
fe03c32e22 Bug 7786 Adding More Lists-option to the Add-to combo of staff search results
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 15:48:18 +02:00
Chris Cormack
ec23131ea1 Bug 5549 : Fixing the test to only run if the test data exists
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
test passes after the patch. Win.
2012-03-27 09:18:37 +02:00
Dobrica Pavlinusic
db312526b2 Bug 7775 - tools/upload-file.pl: scoping for plack
$uploaded_file is now scoped with our, and we set correct filename

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:17:45 +02:00
Dobrica Pavlinusic
d4233cf1dd Bug 7799 - admin/marctagstructure.pl plack scoping
duplicate_framework needs $dbh so we get it from C4::Context

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:15:56 +02:00
Dobrica Pavlinusic
71d104d20b Bug 7773 - serials/subscription-add.pl scope for plack
This fixes scope of $query and $nextexpected

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:14:11 +02:00
Dobrica Pavlinusic
9b403f8607 Bug 7801 - admin/patron-attr-types.pl plack scoping
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:12:36 +02:00
Dobrica Pavlinusic
c508a8c1b3 Bug 7800 - admin/matching-rules.pl plack scoping
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:11:57 +02:00
Dobrica Pavlinusic
8d7d8af618 Bug 7790 - tools/manage-marc-import.pl breaks with plack
transfer $template to add_matcher_list for correct scoping
and score $dbh and $runinbackground with our

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:10:20 +02:00
Dobrica Pavlinusic
4905c80974 Bug 7798 - admin/item_circulation_alerts.pl plack scoping
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:09:36 +02:00
Dobrica Pavlinusic
ef3a2c62df Bug 7795 - admin/authorised_values.pl breaks with plack
scoping fixes for Variable "*" is not available errors

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 18:08:28 +02:00
Paul Poulain
8271673722 bug 7470 follow-up, fix POD doc 2012-03-26 17:53:28 +02:00
Dobrica Pavlinusic
18eb3ea59a Bug 7797 - admin/currency.pl needs scoping for plack
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 16:27:15 +02:00
Dobrica Pavlinusic
de8ad03aae Bug 7772 - reports/bor_issues_top.pl: we need to exit(0) for plack
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 16:25:57 +02:00
Ian Walls
378f17d7f7 Bug 7743 followup: fix use of removed formattedwaitingdate param in opac-user.tt
Replaces formattedwaitingdate with just waitingdate, since no longer create and export
that template variable

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 16:22:54 +02:00
Julian Maurice
3414c117cd Bug 7743: Update opac-readingrecord.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:52 +02:00
Julian Maurice
8555749fd6 Bug 7743: Update opac-showreviews.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:47 +02:00
Julian Maurice
bc3f39b702 Bug 7743: Update opac-userupdate.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:45 +02:00
Julian Maurice
e1148ec52a Bug 7743: Update sco/sco-main.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:43 +02:00
Julian Maurice
f893f54ea1 Bug 7743: Update opac-detail.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:41 +02:00