Commit graph

15987 commits

Author SHA1 Message Date
Paul Poulain
b90b271a0c Bug 7613 follow-up DBRev number 2012-04-06 17:37:26 +02:00
Chris Cormack
e3669815a0 Bug 7613 follow up to fix perlcritic errors
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-06 17:26:36 +02:00
Srdjan
12ff7355bb bug_7613: OCLC Connexion gateway
svc/import_bib:
* takes POST request with parameters in url and MARC XML as DATA
* pushes MARC XML to an impoort bach queue of type 'webservice'
* returns status and imported record XML
* is a drop-in replacement for svc/new_bib

misc/cronjobs/import_webservice_batch.pl:
* a cron job for processing impoort bach queues of type 'webservice'
* batches can also be processed through the UI

misc/bin/connexion_import_daemon.pl:
* a daemon that listens for OCLC Connexion requests and is compliant
  with OCLC Gateway spec
* takes request with MARC XML
* takes import batch params from a config file and forwards the lot to
  svc/import_bib
* returns status

ImportBatches:
* Added new import batch type of 'webservice'
* Changed interface to AddImportBatch() - now it takes a hashref
* Replaced batch_type = 'batch' with
  batch_type IN ( 'batch', 'webservice' ) in some SELECTs

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
2012-04-06 17:26:20 +02:00
d1dc3c0c2e Bug 7641 - Add ability to suspend reserves - Followup
* Switch from C4::Dates to $KohaDates
  * Fix 'Resume All Suspended All Requests'
  * Change button text to follow capitalization rules
  * Change 'requests' to 'holds'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-06 17:23:10 +02:00
Paul Poulain
ef038b258e Merge remote-tracking branch 'origin/new/bug_7310' 2012-04-06 16:02:11 +02:00
a334fec190 7368 Followup for indentation in VirtualShelves.pm
Corrects some further indentation issues, removes last tab from file.
Related to report 7310.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2012-04-06 16:01:38 +02:00
Paul Poulain
413a1e1e61 Merge remote-tracking branch 'origin/new/bug_7143' 2012-04-06 15:12:28 +02:00
Zeno Tajoli
7639cd89fb Italian translation teams
http://bugs.koha-community.org/show_bug.cgi?id=7143
2012-04-06 15:11:50 +02:00
Marc Balmer
1c8df08aea Bug 7785: Remove unused function columns() which uses a MySQLism.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-05 10:31:49 +02:00
Colin Campbell
ce046f9a73 Stop unnecessary warnings in get_language
Refactor code to be more idiomatic and clarify its intention was testing
undef against languages causing log warn was creating and assigning to
unnecessary variables calling accept_language with an undef is an
expensive way to get undef returned to the caller test we are asking it
a meabingful question use any rather than first ( we dont care about
firstness it should be unique anyway but it obscures the meaning of the
test ) split takes a pattern not a string

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Having put my hands recently in this part of Koha code, I can confirm
that this patch fix log warnings, and add clarity and conciseness.

http://bugs.koha-community.org/show_bug.cgi?id=7874
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 18:33:11 +02:00
Paul Poulain
2bc542789f Merge remote-tracking branch 'origin/new/bug_7284' 2012-04-04 18:18:26 +02:00
MJ Ray
9d65f66536 bug 7284: fix package build problem, move BEGIN into new
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 18:18:12 +02:00
Dobrica Pavlinusic
d0b2d72e0b Bug 7766 - C4/Auth.pm: emit DEBUG output to STDERR
writing to STDOUT breaks plack when running with DEBUG=1

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 18:09:24 +02:00
69a13493b4 Bug 2780 - Capitalize strings consistently (Acquisitions pages)
Correcting capitalization on strings in Acquisitions templates

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:48 +02:00
9e72156f75 Bug 2780 - Capitalize strings consistently (miscellaneous)
Correcting all remaining includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:46 +02:00
d1593d3f7a Bug 2780 - Capitalize strings consistently (Tools)
Correcting Tools-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:45 +02:00
b03679ab4c Bug 2780 - Capitalize strings consistently (Reports)
Correcting Reports-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:43 +02:00
9315c9a808 Bug 2780 - Capitalize strings consistently (Administration)
Correcting System administration-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:41 +02:00
313e4288d3 Bug 2780 - Capitalize strings consistently (Cataloging)
Correcting Cataloging-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:40 +02:00
6f756d2342 Bug 2780 - Capitalize strings consistently (Serials)
Correcting Serials-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:38 +02:00
85592866ab Bug 2780 - Capitalize strings consistently (Patrons)
Correcting Patron-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:37 +02:00
5324908059 Bug 2780 - Capitalize strings consistently (Patron cards)
Correcting Patron card creator-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:35 +02:00
ad1ebc293a Bug 2780 - Capitalize strings consistently (Labels)
Correcting Labels-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:33 +02:00
0ffbbfd9d5 Bug 2780 - Capitalize strings consistently (Circulation)
Correcting Circulation-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:07 +02:00
4800a515c5 Bug 2780 - Capitalize strings consistently (Budgets)
Correcting Budgets-related includes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:27 +02:00
1c8037e406 Bug 2780 - Capitalize strings consistently (catalog)
Correcting catalog-related includes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:25 +02:00
b53c369ce8 Bug 2780 - Capitalize strings consistently
Corrections to Authorities-related includes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:24 +02:00
3e358cb993 Bug 2780 - Capitalize strings consistently
Corrections to Acquisitions include files. Patch
also includes some corrections to unescaped ampersands.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:23 +02:00
Katrin Fischer
45b26ffe98 Bug 7482: overdues report downloads without names
This patch is an alternate patch for the bug. Instead of having
one column 'name' for a concatenated first and last name it
adds 2 separate columns to the exported csv file.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 17:39:36 +02:00
9db202af0d Bug 7876 - Add ids to divs and spans with ids in opac-user.tt
This commit adds an id to each div, and adds spans where
there are no appropriate divs to add. In addition, non-static text
such as the expiration date are wrapped in a special sub-span so
that data can be pulled and reused when customizing via jQuery.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 16:55:41 +02:00
Magnus Enger
607e5f6e52 Bug 7885 - Change filename of TransferLog suggested by packages to fit with logrotate
The apache accesslogs suggested by the default config files are called
*_log, which results in them not getting picked up by logrotate, which
looks for *.log. This patch changes the suggested filenames to *.log.

To test:
Not much to test here, just apply the patch and check that all
occurences of TransferLog and CustomLog are now on the form *.log

All the lines where these occur are commented out, so this will
not actually change any behaviour.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
2012-04-04 15:15:43 +02:00
Magnus Enger
58e98c3c38 Bug 7850 - Fix values for hidden in subfields of 952 + maxlength in NORMARC frameworks
This patch does three things:

- Add a copyright comment to normarc_fastadd_framework.sql
- Change the value of marc_subfield_structure.hidden from -1 to 0 for
  several subfields of 952, in both the default and fast add framework,
  using this SQL statement:
  update marc_subfield_structure set hidden = 0 where tagfield = '952' and hidden = -1;
- Add the maxlength column introduced by bug 7263 to all rows in
  marc_subfield_structure, setting the following maxlengths:
  000 = 24
  008 = 40
  all other subfields = 9999

The format of the SQL files is the one that is produced by exporting the
frameworks from the Web UI, with added copyright comments at the top.

To test:
- Install nb-NO
- Run through the web installer in Norwegian on an empty database
- Select NORMARC as the marcflavour
- Be sure to select the fast add framework ("Rammeverk for
  hurtigkatalogisering" under "Valgritt")
- Check in Home › Administration › MARC Frameworks that 000 and 008
  for both frameworks have the right length
- Add a dummy record so you get to the item edit screen and check that
  the form for subfields looks good. The subfields that are shown
  should be 01234578abcdefghjoptuvwyz and all subfields should have
  a text box or a dropdown associated with them. Check this for
  for both the default and fast add frameworks

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Walked through the test plan, seems to work well.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 14:54:50 +02:00
91898359cb Bug 7858 - Missing packages from install_misc/ubuntu.packages
- Adding missing dependencies to install_misc/ubuntu.packages
- Removing items from CPAN instructions which are installed
  as packages

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Seems to add all necessary packages.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 14:49:48 +02:00
Dobrica Pavlinusic
10e89e616a Bug 7860 - /virtualshelves/addbybiblionumber.pl plack scoping
Variable "$query" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 115.
Variable "$loggedinuser" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 129.
Variable "$shelfnumber" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 134.
Variable "$newvirtualshelf" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 135.
Variable "$sortfield" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 136.
Variable "$category" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 137.
Variable "$loggedinuser" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 137.
Variable "$authorized" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 139.
Variable "$errcode" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 140.
Variable "@biblionumber" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 143.
Variable "$query" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 145.
Variable "$authorized" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 150.
Variable "$loggedinuser" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 150.
Variable "$shelfnumber" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 150.
Variable "@biblionumber" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 151.
Variable "$query" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 153.
Variable "$errcode" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 157.
Variable "$authorized" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 162.
Variable "$loggedinuser" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 162.
Variable "$shelfnumber" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 162.
Variable "$template" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 165.
Variable "$errcode" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 173.
Variable "$loggedinuser" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 178.
Variable "$template" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 180.
Variable "@biblionumber" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 188.
Variable "$template" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 196.
Variable "$template" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 204.
Variable "$newshelf" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 205.
Variable "$authorized" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 206.
Variable "$errcode" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 207.
Variable "$query" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 209.
Variable "$cookie" is not available at /srv/koha/virtualshelves/addbybiblionumber.pl line 209.
Can't call method "param" on an undefined value at /srv/koha/virtualshelves/addbybiblionumber.pl line 115.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 11:18:52 +02:00
Katrin Fischer
a3f1b8cb5e Bug 7864: Little changes to the display
Changes the display of subscribers a bit.

- Makes each name a link to the patron account instead of having a separate
  'View' link behind each name
- Show the title and subscrption number as link to the subscription detail
  page instead of just 'subscription'

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 10:58:36 +02:00
Katrin Fischer
b70a9f4554 Bug 7864: Reintroduce list of subscribers to a serial alert message
Adds a link to the existing template from the serial detail page:

Patron alert with: RLIST (subscribers)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-04 10:58:34 +02:00
Liz Rea
81d5f9dcda Bug 7888 - Permission for "change password" button in circ toolbar should be "borrowers" instead of "staffaccess"
Patch changes permisison for "change password" button in circ-toolbar.inc from staffaccess to borrowers.

To test:
- With a staff user with borrowers permission, verify the change password button is shown for a normal patron.
- With a staff user without borrowers permission, verify the change password button does not appear.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 10:55:48 +02:00
Paul Poulain
7335add2a2 bug 7291 follow-up DBRev number 2012-04-03 18:32:25 +02:00
Jonathan Druart
64d39e1d9e Bug 7291: Followup: removes backquotes
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:19:48 +02:00
Jonathan Druart
d76dbace5e Bug 7291: Adds new field aqbooksellers.deliverytime
New field deliverytime in aqbooksellers table. It is an estimated
delivery time for orders (in days).
You can set this delay on the supplier modification page.
It is used in the late orders search.

The order estimated date is the aqbasket.closedate +
aqbooksellers.deliverytime

If you set a delay, the query check if closedate <= today - delay

If you set a "delivery time from" and a "delivery time to", the query check if
$delivery_time_from <= aqbooksellers.deliverytime is not NULL and if
closedate + deliverytime >= $delivery_time_to
if there is not a time_to then $delivery_time_to = the current date.
2012-04-03 18:19:46 +02:00
Dobrica Pavlinusic
53a7fb7ba3 Bug 7851 - circ/circulation.pl plack scoping
Errors:

Variable "$totalprice" is not available at /srv/koha/circ/circulation.pl line 448.
Variable "%renew_failed" is not available at /srv/koha/circ/circulation.pl line 456.
Variable "$todaysdate" is not available at /srv/koha/circ/circulation.pl line 458.
Variable "@todaysissues" is not available at /srv/koha/circ/circulation.pl line 459.
Variable "@relissues" is not available at /srv/koha/circ/circulation.pl line 459.
Variable "@previousissues" is not available at /srv/koha/circ/circulation.pl line 461.
Variable "@relprevissues" is not available at /srv/koha/circ/circulation.pl line 461.

Test scenario:
1. go to circulation page
2. verify errors in console output of plack
3. apply patch
4. reload and verify that errors are gone

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:14:19 +02:00
Dobrica Pavlinusic
4fe0af468b Bug 7859 - members/pay.pl plack scoping
Variable "$borrowernumber" is not available at /srv/koha/members/pay.pl line 112.
Variable "$borrower" is not available at /srv/koha/members/pay.pl line 129.
Variable "$input" is not available at /srv/koha/members/pay.pl line 142.
Variable "$borrowernumber" is not available at /srv/koha/members/pay.pl line 157.
Variable "$user" is not available at /srv/koha/members/pay.pl line 171.
Variable "$input" is not available at /srv/koha/members/pay.pl line 172.
Variable "$input" is not available at /srv/koha/members/pay.pl line 181.
Variable "$borrowernumber" is not available at /srv/koha/members/pay.pl line 187.
Variable "$branch" is not available at /srv/koha/members/pay.pl line 187.
Variable "$borrowernumber" is not available at /srv/koha/members/pay.pl line 222.
Variable "$input" is not available at /srv/koha/members/pay.pl line 239.
Variable "$borrowernumber" is not available at /srv/koha/members/pay.pl line 246.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:13:12 +02:00
Dobrica Pavlinusic
44eafcb886 Bug 7863 - opac-addbybiblionumber.pl plack scoping
Test scenario:

1. issue search query
2. select 1 result
3. add to: new list, list-1, private
4. select 2 results
5. add to (exiting) list-1
4. select 3 results
6. add to: new list, list-2, public
7. using lists drop-down, view and delete list-1 and list-2

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:12:37 +02:00
Colin Campbell
fab0b80ddb Bug 7562 Add strict & warnings to KohaDates Plugin
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

http://bugs.koha-community.org/show_bug.cgi?id=7814
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:11:46 +02:00
Adrien Saurat
2bb924e28d Bug 7866: z39.50 search list ordered by rank
In the z39.50 cataloging search page, the servers
are now sorted by rank and name.

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-04-03 18:10:57 +02:00
fd43cc3270 7868 Followup for opac
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Trivial fix. Counterpart for staff by Adrien Saurat.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:09:46 +02:00
Adrien Saurat
b95a9d4500 Bug 7868: cleans logs when doing a Search on the intranet
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the patch: combined if statements and added a check for pubshelves too.
2012-04-03 18:09:44 +02:00
Katrin Fischer
7d78c1236d Bug 1662: Is there a difference between Full and Simplified for Serials History
Changes description of system preference SubscriptionHistory:

When showing the subscription information for a bibliographic record,
preselect [brief history|full history] view of the serial issues.

To test:
1) Verify new description shows in system preference editor (tab serials)
2) Verify description is correct (OPAC > Subscription tab > more details)

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:07:07 +02:00
Colin Campbell
32c5ef613d Use hour or day deltas to calculate overdue durations
If durations are calculated by subtraction they will use units
larger than those we care about and these are not convertable
to the smaller units we are attempting to enumerate
Use the appropriate delta methods to calculate theee fines

Adds a separate hours_between method to calendar
This should strictly be checking opening hours (of which
closed days are a special case) of the relevant branch
These need adding to branches

http://bugs.koha-community.org/show_bug.cgi?id=7852
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>

QA comment: renamed "days_minus_grace" variable to "units_minus_grace"
Also added POD to _get_chargeable_units

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 17:59:56 +02:00
Serhij Dubyk {Сергій Дубик}
b915f4ff32 Bug 6434 - Ukrainian and Russian MARC sql-tables
Changes: Marc21 support, 995 for items (Unimarc), authorities types for both
MARC's, many small field/subfield changes

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works, doesn't break anything, seems to be in Ukrainian/Russian (I can't
judge).

It's a huge patch (21M). That's why it's attached as a bz2 archive: so the
archive must be downloaded, decompressed, and then applied.

General remark: Adding this patch to Koha will increase substantially Koha git
repository size. It shows that non-code files (.po files, SQL files)
could/should be managed outside Koha core repository. See this discussion:

http://wiki.koha-community.org/wiki/Git_Splitting_and_Shrinking

Here is my test plan:

[1]  Apply the patch on master
[2]  Install ru-RU and uk-UA languages:
     cd misc/translator
     ./translate ru-RU uk-UA
[3]  re-create Koha DB:
     DROP DATABASE koha;
     CREATE DATABASE koha;
[4]  Load Koha pro interface: get web installer
[5]  Choose ru-RU language
[6]  Everything is in Russian. Click blindly on button until reaching the
     page where to choose Unimarc/Marc21.
[7]  Choose Unimarc.
[8]  Tick on everything to load all UNIMARC SQL files.
[9]  All SQL are loaded without any error.
[10] Check Koha cataloguing.
[11] Go to [3] and choose Marc21 at step [7].
[12] Go to [3] and choose uk-UA at step [5].
[13] Go to [3] and choose uk-UA at step [5] and Marc21 at step [7].
2012-04-02 12:16:49 +02:00