Commit Graph

12632 Commits

Author SHA1 Message Date
Jared CAMINS-ESAKOV 12bf736bec Fix bug 3811; Index language as word
An incorrect definition in record.abs was resulting in searches on languages returning incorrect results.  By changing the indexing mode from numeric to word, this patch fixes that problem.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 68dc783c7e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:09 -04:00
Galen Charlton c661e9d219 bug 5311: correction to database update
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d84902eca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:08 -04:00
Jared Camins-Esakov ed4049443e Update language mappings to fix Bug 5311
This patch updates the language_rfc4646_to_iso639 mapping table with the
correct mappings for several languages that were not mapped correctly to
the codes used in MARC, including Finnish (which was not mapped at all),
and Armenian (which was mapped to an obsolete code). This patch also
changes English and French to use the proper three-letter codes, which
will eliminate false positives when, for example, limiting by French
brings up results in Afrikaans.

This patch adds the changes to the updatedatabase.pl script, and removes
the incorrectly specified DBversion in the previous patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 20:09:50 -04:00
Galen Charlton 067c2d101d bug 5190: improve linking to MARC field documentation
* zero-pad tag numbers as needed
* handle special case for linking to UNIMARC 0XX vs. 1-8XX
* add a wrapper function
* add comment about the poor linkability of IFLA's UNIMARC documentation

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 141ec0b9bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:58 -04:00
Galen Charlton 19894217ef bug 5190: link to MARC21/UNIMARC online doc in the bib editor
Patch from  Tomás Cohen Arazi <tomascohen@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 29432ee42c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:58 -04:00
Nicole Engard 09ff5abc0c bug 5326 fix link to old prefs editor on patron attributes
on the patron attributes page if you have ExtendedPatronAttributes
turned off the error points you to the old sys prefs editor - this
patch fixes that

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 45a6cca1a1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:58 -04:00
Nicole Engard 08e8a31cdb bug 5326 fix extended patron attribute error
the error message if you have ExtendedPatronAttributes turned
off linked to the old sys prefs editor, link has been updated.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83f03fb9d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Owen Leonard 707af52936 Fix for Bug 5137, Remove obsolete code counting issues by item type in circ
The removed section of code contained a "my $dbh = C4::Context->dbh"
which was required for the query of BOR_NOTES. That line has been
moved accordingly.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b2bda465d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Owen Leonard 50656a56e7 Fix for Bug 5008 - "Remove" link missing when Cart in expanded view
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d41ba7300)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Nicole Engard 0084ce5a17 bug 4986 move serials prefs from cataloging tab to serials tab
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d1593acec7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Owen Leonard bb08a2f8ec Fix for Bug 5114 - Can't edit basket in Internet Explorer
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0bb33cd7ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:56 -04:00
Nicole Engard e6514b39fe bug 5019 remove link to funds
This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5eb56dd52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:56 -04:00
Frédéric Demians 4b3ce545de Bug 5177 Selecting default sort result by syspref
Syspref .pref file was defining a code for descending order which wasn't
expected by .tmpl files... 'desc' instead of 'dsc'.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aa7df17f7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:46:17 -04:00
Chris Cormack e74fc14914 Bug 5363 - Removing unused module (C4::Cache::FastMemcached)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:17:19 -04:00
Chris Nighswonger 9e75dd58ff Correcting Version Number for 3.2.x branch
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 15:07:01 -04:00
Galen Charlton 365ca51710 bug 4141: fix upgrade of OPAC XSLT parameters from 3.0.x
Note that OPACXSLTResultsDisplay and OPACXSLTDetailsDisplay
are boolean parameters in 3.2.x, not string parameters.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 14:28:34 -04:00
Chris Cormack 0a3f62bf19 Updating version number and fixing the xxx in updatedatabase ... my bad
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 14:28:17 -04:00
Galen Charlton c00f8c50dc bug 5308: add foreign key constraints as well
Follows up on previous patch to require that routing
list entries be linked to subscriptions and patrons.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 14:24:10 -04:00
Srdjan Jankovic 3cca3382bd bug 5308: subscriptionroutinglist more strict
borrowernumber and subscriptionid NOT NULL, UNIQUE(subscriptionid, borrowernumber)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 14:23:53 -04:00
Galen Charlton c425273111 bug 2567: let 008/15-17 and 008/24-27 be set
Fixes bug where the MARC21 008 plugin was falsely
claiming that it set the illustration and nature of
contents positions by deriving it from other fields
in the bib records.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 14:18:30 -04:00
Galen Charlton 9f4fcb42ae bug 5318: fix value of r4 rank weight
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-03 14:17:47 -04:00
Galen Charlton db1f4f23b5 bug 4991: follow-up tweaks
* make some strings translatable
* display library name instead of code in add/edit
  holiday panel
* minor textual fixes to hints

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 22:11:55 -04:00
Owen Leonard 16039eae5a Fix for Bug 4991, Overhaul of Calendar interface
- Put hints, key, and existing holidays into right column
- Style entry form for added clarity and consistency with other
  forms in Koha
- Change the way dynamically displayed hints are shown to better
  match existing static hints in Koha's interface
- Add branch name (instead of branch code) for clarity
- Add the ability to add and edit holiday titles (previously
  only description could be edited).
- Add links to the list of existing single-day holidays and
  exceptions which opens the calendar to that month/year

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 22:11:38 -04:00
Galen Charlton 060f96dc05 tweak wording of merge target
Since the merge functionality is for merging biblio
records, not items, made the language more precise.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 22:10:52 -04:00
Nicole Engard 27830d9bb1 add missing help file for merging records
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 22:10:38 -04:00
Galen Charlton d6edcfa85e bug 5301: improve escaping of XML characters in bib output
<, >, ', or " in an item call number will no longer make
the bib displays break when using XSLT mode.

Added a new routine to C4::Koha, xml_escape(), to implement
converting &, <, >, ', and " to their corresponding
entities.

Patch loosely based on work done by Daniel Latrémolière <daniel.latremoliere@bulac.fr>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 20:18:26 -04:00
Galen Charlton e1bb59fc08 bug 5243: avoid crash when saving authority records on certain setups
This does not seem to occur on all platforms - C4::Search
exports SimpleSearch() by default - but adding the 'C4::Search::'
qualifier certainly doesn't hurt things.

Patch by Fridolyn Somers <fridolyn.somers@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 20:17:13 -04:00
Galen Charlton efe3cbf85a bug 5162: follow-up patch to not clear hidden input setting attribute type
Otherwise, can't saved new attributes set from a cloned
input or select control.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 20:10:58 -04:00
Owen Leonard 94a7573f57 Fix for Bug 5162, patron attributes 'new' link should create blank value
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 20:10:58 -04:00
Marcel de Rooy bc08e8cf6b Enhancement 5074 (Adding possibility to cleanup_database.pl to purge only older sessions) [UPDATED for master]
Currently, the misc/cronjobs script cleanup_database truncates the session table (deleting all records, including active sessions).
With an additional parameter sessdays, this behavior could be changed or (perhaps better) extended. If the parameter sessdays is passed along with a number of days, the script only deletes older session records. This is accomplished by examining the values of lasttime, atime or ctime in the record.
So, calling the script like:
  ./cleanup_database.pl -v -sessions -sessdays 7
will only delete sessions records older than 7 days. The "old style" call
  ./cleanup_database.pl -v -sessions
still works too and truncates the table as before.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:19:09 -04:00
Nicole Engard 430b609ee6 bug 5050 move language prefs to I18N/L10N tab
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:07:31 -04:00
Nicole Engard 7d44c3441f bug 5151 removed bolded terms in breadcrumbs
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:07:15 -04:00
Liz Rea b6cd3269b7 bug 5237: Testing renewals on patron barcodes with + signs at the end
According to notes in bug, patch was originally by Chris Cormack.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:07:01 -04:00
Nicole Engard b66b62bb45 bug 5163 change title of holds to pull page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:06:48 -04:00
Nicole Engard 1cbc1e3723 bug 5258 change 'order' to 'order line' on receive page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:06:32 -04:00
Colin Campbell 9cb72cb838 Bug 5224 Remove the adjective Shopping from basket
New orders breadcrumbs were using the inappropriate term
Shopping basket whereas basket is used elsewhere

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:06:13 -04:00
Nicole Engard 24897c9878 BUG 5239 add space between number and words in acq search
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:05:34 -04:00
Owen Leonard 0fac953b97 Fix for Bug 5221 - Preselect tab containing itemtype/authval image in use
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:04:19 -04:00
Owen Leonard b7da74d018 Fix for Bug 5236 - "hide my tags" link does nothing
Removing the link. The suggested functionality doesn't
seem useful.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 20:54:08 -04:00
Galen Charlton 49b0fd9af4 remove unused template include
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 20:53:49 -04:00
Owen Leonard 17993838c0 Fix for Bug 5223, 'related subjects' should read 'subjects'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 15:04:54 -04:00
Owen Leonard 8a281ef292 Fix for Bug 4261 - keyword mapping should show which framework the map is for
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 15:04:29 -04:00
Galen Charlton 53e17af66c history updates - recent releases
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 15:04:05 -04:00
Galen Charlton 7b251b91f1 bug 5327: follow-up to fix SIP tests
* removed t/SIP_SIPServer.t - despite the file name,
  C4/SIP/SIPserver.pm is not actually a module and
  cannot be 'used' or 'required'
* set module search path so that t/SIP_ILS.t and
  t/SIP_Sip.t will pass

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 15:03:45 -04:00
Katrin Fischer 2d2e61bdb4 Bug 5327: More basic unit tests for C4 modules
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 15:03:11 -04:00
Chris Cormack b4d75c2648 History updates
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 15:02:46 -04:00
Galen Charlton eb7f3f57ce remove extraneous semicolon
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-10-31 21:29:52 -04:00
Brian Engard 64406f04cd Updated links in Main Page Help
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-10-31 21:29:15 -04:00
Nate Curulla 5c8bbba02b Bug 5327: Add unit test for ItemType.pm
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-10-31 21:09:02 -04:00
Daniel Grobani 37981b0341 unit test stub for Z3950.pm
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-10-30 22:37:14 -04:00