Commit graph

15697 commits

Author SHA1 Message Date
Julian Maurice
3b0d4e04e0 Bug 6440: Implement OAI-PMH Sets
New sql tables:
  - oai_sets: contains the list of sets, described by a spec and a name
  - oai_sets_descriptions: contains a list of descriptions for each set
  - oai_sets_mappings: conditions on marc fields to match for biblio to be
    in a set
  - oai_sets_biblios: list of biblionumbers for each set

New admin page: allow to configure sets:
  - Creation, deletion, modification of spec, name and descriptions
  - Define mappings which will be used for building oai sets

Implements OAI Sets in opac/oai.pl:
  - ListSets, ListIdentifiers, ListRecords, GetRecord

New script misc/migration_tools/build_oai_sets.pl:
  - Retrieve marcxml from all biblios and test if they belong to defined
    sets. The oai_sets_biblios table is then updated accordingly

New system preference OAI-PMH:AutoUpdateSets. If on, update sets
automatically when a biblio is created or updated.

Use OPACBaseURL in oai_dc xslt
2012-03-20 11:38:26 +01:00
Magnus Enger
aac5379b22 Bug 7696 - NORMARC lacks staff results XSLT
This patch adds NORMARCslim2intranetResults.xsl, to enable XSLT display
of intreanet search results when marcflavour = NORMARC. Most of the
logic is copied verbatim from NORMARCslim2OPACResults.xsl.

To test:

Make sure you have these system preferences set:
marcflavour = NORMARC
XSLTResultsDisplay  = using XSLT stylesheet

NORMARC and MARC21 is similar enough that testing on MARC21 records should
be OK. (I don't expect anyone to do detailed testing of a lot of the different
positions in leader, 007, 008 etc...)

Before the patch: viewing results in the staff client should give an error
message about a missing XSLT file.

After the patch: Record details should be displayed in the search results,
similar to how it is done for MARC21.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 11:24:45 +01:00
24dc37a490 Bug 7526 - longoverdue.pl leaves items marked as lost as still checked out to patron
When the longoverdu.pl script is run, and it marks an item as lost ( using
LostItem() ), if fails to remove the item from the borrower record. So, the
item is marked as lost, but is also still listed as checked out to the
borrower.

This commit adds the command line parameter --mark-returned. If used,
longoverdue.pl will remove lost items from the borrowers record.
Functionality will remain the same if it is not used.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

http://bugs.koha-community.org/show_bug.cgi?id=7426
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 11:22:52 +01:00
Jared Camins-Esakov
9f7e340f82 Bug 7724: Skip Linker test if Zebra isn't set up
One of the tests in t/db_dependent/Linker_FirstMatch.t ony works if Zebra is
running and authorities have been indexed. This was causing Jenkins agitas.
The test should be skipped if Zebra isn't running or authorities have not been
indexed at the time the test is run.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 11:21:10 +01:00
b3cae76694 Bug 5596 [REVISED 2] add author to holds to pull report
Adding output of author.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:30:11 +01:00
Jonathan Druart
f3ba35c0a0 Bug 7301: 'From' field is 1 year ago by default
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:28:17 +01:00
Matthias Meusburger
1e7437bbae Bug 7400: Add auto-completion on auth_finder
While typing an authority, will automatically propose authorities (similar to
autocompletion for patron search if activated)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested searching for authorities with and without autocomplete. Note that
this is most useful when used in the "Main entry" box instead of the
"Main entry ($a only)" box.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected tabs to spaces in auth-finder-search.inc while resolving merge
conflict.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:20:30 +01:00
Jonathan Druart
c548761bc1 Bug 7477: Followup: Fix perlcritic issues
Signed-off-by: Srdjan Jankovic <srdjan@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
An existing holiday in a branch is not deleted when the branch is overwritten:
* branch B, set today as closed
* switch to branch A, where today is not closed
* copy holidays to branch B
* today is still closed for branch B

That's important to notice for the documentation
2012-03-19 18:16:40 +01:00
Srdjan Jankovic
c5b878697e Bug 7477: Copy holidays from one branch to another
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-19 18:10:44 +01:00
20b68731e3 Bug 7668 - Improve navigation and toolbar options in guided reports
Creating new include, reports-toolbar.inc for presenting "action"
options to the user, in contrast with "view" options in the left-
hand navigation menu.

In the toolbar: New (guided report, SQL report), Edit, Run.

The presence of the toolbar allows the user to access functions
more flexibly: Getting directly to 'edit' or 'run' from the 'view'
page for instance.

Modifications to guided_reports.pl pass report id and name to
the template for clarity and for the purpose of enabling the
edit/run buttons.

To test: Apply the patch and go through the process of creating
a new saved SQL report. Note that the toolbar is present and
the buttons are functional at appropriate times.

New and Edit options should only be displayed if the user has
permission to create reports. Test with a user who does not
have create permission to confirm.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:00:15 +01:00
Srdjan Jankovic
973f84513f bug_7140: Added item description to complement icon to search result and biblio detail pages
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This seems like a very big improvement, especially for people using screen
readers. I agree that the change to C4::Search is required.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 17:52:45 +01:00
Paul Poulain
2eb590c269 C4::Members follow-up
Overdues already loaded, must set full sub patch

http://bugs.koha-community.org/show_bug.cgi?id=6875
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Fixes issue with circ/branchoverdues.pl
Passes tests.
2012-03-19 17:49:40 +01:00
Paul Poulain
d69ebc0568 Bug 6296 follow-up: DBrev 2012-03-19 17:37:31 +01:00
Robin Sheat
4cbeeedbe8 Bug 6296: allow users to be authenticated by SSL client certs
This adds a new syspref: AllowPKIAuth. It can have one of three states:
* None
* Common Name
* emailAddress

If a) this is set to something that's not "None", and b) the webserver
is passing SSL client cert details on to Koha, then the relevant field
in the user's certificate will be matched up against the field in the
database and they will be automatically logged in. This is used as a
secure form of single sign-on in some organisations.

The "Common Name" field is matched up against the userid, while
"emailAddress" is matched against the primary email.

This is an example of what might go in the Apache configuration for the
virtual host:

    #SSLVerifyClient require # only allow PKI authentication
    SSLVerifyClient optional
    SSLVerifyDepth 2
    SSLCACertificateFile /etc/apache2/ssl/test/ca.crt
    SSLOptions +StdEnvVars

The last line ensures that the required details are
passed to Koha.

To test the PKI authentication, use the following curl command:
    curl -k --cert client.crt --key client.key  https://URL/
(look through the output to find the "Welcome," line to indicate that a user
has been authenticated or the "Log in to Your Account" to indicate that a
user has not been authenticated)

To create the certificates needed for the above command, the following series
of commands will work:
    # Create the CA Key and Certificate for signing Client Certs
    openssl genrsa -des3 -out ca.key 4096
    openssl req -new -x509 -days 365 -key ca.key -out ca.crt
    # This is the ca.crt file that the Apache config needs to know about,
    # so put the file at /etc/apache2/ssl/test/ca.crt

    # Create the Server Key, CSR, and Certificate
    openssl genrsa -des3 -out server.key 1024
    openssl req -new -key server.key -out server.csr

    # We're self signing our own server cert here.  This is a no-no in
    # production.
    openssl x509 -req -days 365 -in server.csr -CA ca.crt -CAkey ca.key \
        -set_serial 01 -out server.crt

    # Create the Client Key and CSR
    openssl genrsa -des3 -out client.key 1024
    openssl req -new -key client.key -out client.csr

    # Sign the client certificate with our CA cert. Unlike signing our own
    # server cert, this is what we want to do.
    openssl x509 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key \
        -set_serial 02 -out client.crt
    openssl pkcs12 -export -in client.crt -inkey client.key -out client.p12
    # In theory we can install this client.p12 file in Firefox or Chrome, but
    # the exact steps for doing so are unclear, and outside the scope of this
    # patch

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with Common Name and E-mail authentication, as well as with PKI
authentication disabled. Regular logins continue to work in all cases when
SSL authentication is set to optional on the server.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA comment: synchronized updatedatabase.pl version of syspref with sysprefs.sql
version, to avoid divergent databases between new and upgrading users.
2012-03-19 17:02:44 +01:00
Paul Poulain
235a9dfb7d Merge remote-tracking branch 'origin/new/bug_7408' 2012-03-19 16:55:25 +01:00
8db5a6dadb Bug 7408 Fix ExpireReservesMaxPickUpDelayCharge syspref definition
Allow preferences translation

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
This patch fixes another sysprefs problem -
Syck parser (line 300, column -1): syntax error at /usr/lib/perl5/YAML/Syck.pm line 76, <$fh> line 1.
when clicking local use. I could not verify that it fixed translations, but fixing the local use prefs is important too, so I'm signing off.
2012-03-19 16:55:10 +01:00
0850d0c504 Bug 4976 - Status of item returned with process_koc.pl is empty in Intranet
Fix to ensure items returned through a processed koc file have
items.onloan and items.datelastseen set corrrectly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Uploaded a file with checked in and checked out items. all info
shows properly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 16:23:10 +01:00
Jonathan Druart
63ac6d7639 Bug 5698: Followup: Add date picker option to SQL Runtime Parameters
Move html

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 16:21:48 +01:00
Ian Walls
08b7589b85 Bug 5698: Add date picker option to SQL Runtime Parameters
Adds a date picker for SQL reports with the 'date' authorised_value.  Updates help
documentation for this new feature, as well.

To test:
1.  Create a new report with two date parameters, using the syntax:
<<Label for this selection of date|date>>
2.  Run the report
3.  Select dates
4.  The SQL generated should format the dates properly in ISO, and keep track of which
date is which

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-03-19 16:20:29 +01:00
0576342cbb Bug 7670 - make required fields red
Adding "required" style and "Required" note to additem fields,
consistent with the way required fields are displayed
on the add patron form.

This patch also corrects an error in the client-side validation
script which misidentified which fields were required. Leaving
a required field empty should result in an alert and the missing
field being highlighted in yellow.

To test, open the add item form on a record which uses
a framework in which one or more item fields are required.
Required fields should be labeled in red and appended with a
"Required" note.

Submit the form while some required fields are empty. You should
see a javascript alert. The empty mandatory fields should have
a yellow background.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Works - passes tests.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-16 12:52:17 +01:00
bdd8eb5a81 Bug 7656 - "undefined" pop-up message when putting hold on reference item
This is a single line fix. Initializing the msg var to an empty
string solves the problem.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-16 12:10:40 +01:00
Paul Poulain
afc6628082 welcome David Cook, you're 178th 2012-03-16 11:54:13 +01:00
b49af1df17 Bug 7618 Escape HTML special characters for SQL displayed above results in Report module
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-16 11:52:06 +01:00
Paul Poulain
ba6c8485ca Merge remote-tracking branch 'origin/new/bug_7368' 2012-03-16 11:50:42 +01:00
8a1ce25939 7368 Typo in cart_to_shelf
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-16 11:50:29 +01:00
493d7a0f6e Bug 7644 - Invalid markup in staff client language chooser
This patch removes invalid markup from the language chooser
in the intranet. It also copies the markup and style of
the staff client include to the OPAC so the two are
more consistent. I hope that will make future changes
and debugging a little easier.

I believe this patch also fixes Bug 7366, "Language chooser
display problems."

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes bug 7366, but there is still a difference between staff
and OPAC.
Installed languages: en, en-NZ, de-DE, fr-FR
Activated langauges: en, en-NZ, fr-FR
OPC shows English, staff shows en-NZ as label for the list.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-16 11:46:01 +01:00
Paul Poulain
533ecd9392 Bug 7557 follow-up: DBRev number and removed default value
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7557#c17,
this follow-up also remove the default value for the syspref
2012-03-14 16:38:07 +01:00
Katrin Fischer
b9abfee3ab Bug 7557: Change hardcoded routing list note into a system preference
Adds a new system preference RoutingListNote under the Serials tab.

The note will display above the note from the subscription and replace
the current hardcoded note:

"Notes: Please return this item promptly as others are waiting for it."

The patch adds unique ids to all notes and the note in general, so it
can be styled using CSS.

Also corrects the routing slip template to follow the HTML4 rule.

Update 2012-03-12: Fixed problem in updatedatebase.
2012-03-14 16:27:07 +01:00
Paul Poulain
0ef6b0d5c6 Merge remote-tracking branch 'origin/new/bug_6875' 2012-03-14 16:16:21 +01:00
Ian Walls
386284d2d5 Bug 6875 Followup: De-nesting C4::Items breaks bulkmarcimport
Removing 'use C4::Branch' in favour of a subroutine-specific 'require C4::Branch'
causes the GetBranchName subroutine to return an error, as it's not defined
in C4::Items.  Adding "C4::Branch::" scoping fixes the error, which is what's done here.

To confirm problem:
1.  Attempt to run bulkmarcimport.pl before applying the patch.  You should get
    ERROR: Adding items to bib 435 failed: Undefined subroutine &C4::Items::GetBranchName
    called at /home/sekjal/kohaclone/C4/Items.pm line 656, <GEN13> line 435.

To test:
2.  apply patch
3.  run bulkmarcimport again.  Error should disappear.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Note that this problem only appears when importing records with item (952)
fields.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-14 16:16:07 +01:00
Stéphane Delaune
a7ee8caf07 Bug 5749 Fix borrower address display in intranet
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-14 16:14:15 +01:00
Paul Poulain
70dd8d8829 Merge remote-tracking branch 'origin/new/bug_7661' 2012-03-14 15:00:50 +01:00
59483744ae 7661 Followup for resolving moved Record test 2012-03-14 14:59:46 +01:00
Paul Poulain
cdb05842c3 Merge remote-tracking branch 'origin/new/bug_7031' 2012-03-14 14:47:34 +01:00
Paul Poulain
249b00d2e1 Bug 7031 follow-up typo fix & tab removed
* s/adsearch/advsearch/ as it was a typo
* replaced tab by 4 spaces
2012-03-14 14:47:21 +01:00
52848003e3 7031 Followup: typo
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2012-03-14 14:35:30 +01:00
effd4d2fd8 Bug 7031 Follow-up, More options for AdvancedSearchTypes
This follow-up patch corrects some markup errors and removes some
markup which I think is superfluous:

- Using template FILTER command to remove invalid punctuation from
  ID attributes (to quiet the HTML validator)
- Removing <fieldset> since options are bordered by the tab box now
- Correcting the conditional which controls the table markup
  to prevent extra/missing </tr>
- Adding missing ID attribute in the OPAC template

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-03-14 14:35:29 +01:00
ae737fcde6 Bug 7031 Follow-up: Staff search displays OPAC description instead of the normal description for the authorized values
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-14 14:35:29 +01:00
Ian Walls
c04404c2fb Enh 7031: More options for Advanced Search
Adds the ability to perform advanced searches in both the OPAC and staff client on more than
a single AdvancedSearchType at a time.  Support included for Itemtype, Collection Code and Shelving Location.

AdvancedSearchTypes syspref preference is repurposed; no longer a single value, it can now take
multiple item code fields separated by "|".  The order of these fields will determine the order
of the tabs in the OPAC and staff client advanced search screens.  Values within the search type
are OR'ed together, while each different search type is AND'ed together in the query limits.  The
current stored values are supported without any required modification.

Each set of advanced search fields are displayed in tabs in both the OPAC and staff client.  The
first value in the AdvancedSearchTypes syspref is the selected tab; if no values are present, "itemtypes"
is used.  For non-itemtype values, the value in AdvancedSearchTypes must match the Authorised Value name, and
must be indexed with 'mc-' prefixing that name.

<li> elements in tab are assigned unique IDs, so the text of the tab can be altered to match the
library's needs (using JQuery)

The logic to handle the 5 element row limit has been moved from the Perl to the templates, since Template::Toolkit
has a simple method for extracting the count of an element in a loop and performing 'modulus' on it.

2011-12-21: Incorporated changes recommend by Owen Leonard on bug report.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-14 14:35:27 +01:00
Jared Camins-Esakov
333236f2fa 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>
2012-03-14 14:33:22 +01:00
Paul Poulain
440736468a bug 7261 follow-up DBRev number 2012-03-14 14:16:01 +01:00
2577e0b6c5 7261 Followup to make tests consistent
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2012-03-14 14:14:24 +01:00
Juan Romay Sieira
68ddf79121 Bug 7261 System Preference to select the first day of week
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-03-14 14:14:12 +01:00
Katrin Fischer
f149931bbd 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>
2012-03-14 14:09:44 +01:00
Paul Poulain
49c387cddf Merge remote-tracking branch 'origin/new/bug_7661' 2012-03-13 18:14:26 +01:00
Paul Poulain
befebb8a5c bug 7661: Moving C4::tests to unit tests 2012-03-13 18:07:54 +01:00
Jonathan Druart
50585c3429 Bug 5341: Moves the "save" button to the top of the serial receiving
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-13 18:04:10 +01:00
Jonathan Druart
da920b1da9 Bug 5341: Moves the "save" button to the top of the serial receiving
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-13 17:23:49 +01:00
aed0d8a63d 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>
2012-03-13 16:35:02 +01:00
a0316d4d27 Bug 7698: Add CHR/ICU Zebra tokenization choice to installation
Word search with multi-part facets works properly only with Zebra ICU
tokenization. This patch add a new question to Koha command line
installer:

  Zebra has two methods to perform records tokenization
  and characters normalization: CHR and ICU. ICU is
  recommended for catalogs containing non-Latin
  characters. (chr, icu) [chr]

How to test:

  - perl ./Makefile.PL
  - Try each possible value for new parameter
  - Take a look at zebradb/etc/default.idx file.
    Depending of the parameter you get this line:
      icuchain words-icu.xml
    or this one:
      charmap word-phrase-utf.chr

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(Note: This patch was previously associated with bug 3216; I moved it to a
separate bug because including ICU is a good idea independent of the fix for
the particular issue described in bug 3216)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-13 16:08:04 +01:00