Commit graph

2938 commits

Author SHA1 Message Date
Colin Campbell
f7f3dadd2e Bug 2653 Protect against sending End of Message in Text
Remove any carriage returns in text data as they will be
interpreted as end of message by clients and cause communication failure

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:54:18 -04:00
777e5d53cd fix typo in variable name
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:15:45 -04:00
Srdjan Jankovic
863938f16c Escape input that goes in HTML; Reworked search history insert SQL
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:12:01 -04:00
Nahuel ANGELINETTI
b41e6e0f73 (MT #2962) add converted chars from ISO5426
This add 0xBE and 0xBD conversion to char table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:30:43 -04:00
Nahuel ANGELINETTI
4b5483c61e (MT #3075) fix oe char from iso5426
this add oe conversion in chartable for iso5426.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:30:42 -04:00
91990d783a additional improvement to POD for CanBookBeIssued()
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:03:45 -04:00
Lars Wirzenius
ea06cc504b Fix pod documentation for CanBookBeIssued method to refer to the right variable.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:02:20 -04:00
48491cb1c7 fix syntax error present in previous ILS-DI patch series
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:52:08 -04:00
Henri-Damien LAURENT
825a6abf3e C4/ILSDI/Services.pm Fixing rebasing and merge problems
Previous patches introduced many merge conflicts.
This patch fixes them all

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:50 -04:00
Henri-Damien LAURENT
711c649315 (MT 2563) : ILSDI PatronLookUp Problem
owed to the change in C4::Members API, GetMember had to be adapted

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:48 -04:00
Henri-Damien LAURENT
f3581a594e ILS-DI Messages uniformization
[MT2306_2271] ILS-DI Message codes consistence

The services now returns ILSDI error codes in a <code> tag, plus details in a <message> tag.

Exemple:

<LookupPatron>
<code>MissingParameter</code>
<message>The required parameter patron_id is missing.</message>
</LookupPatron>

[MT2306_2271] Minor changes in HTML

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:31 -04:00
b340fb834c bug 4314: add using_https environment variable
Added new HTML template variable, using_https, for use
of OPAC or staff-side templates that may need to know
whether to use http:// or https:// links to off-site
content.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:23:35 -04:00
Lars Wirzenius
7279f55b60 Fix FSF address in directory C4/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:56 -04:00
Lars Wirzenius
6d4894f912 Remove whitespace from ends of lines of copyright statement.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:49 -04:00
011ff56bd6 Merge branch 'Bug3482' of git://github.com/ptfs/Koha-PTFS into to-push
* 'Bug3482' of git://github.com/ptfs/Koha-PTFS:
  Bug 3482: Updated DB version
  Bug 3482 changed name of notices file
  Bug 3482 Allow hold notices to be sent in print form
  Add expiration date, today to hold notices
  Modified to use dirspec only
  Bug 3482 Print Notices via HTML
2010-03-16 20:02:31 -04:00
Koha User
e3421f0f9f Fixes bug 4232: Undefined hash references in Label Creator
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-10 15:59:35 -05:00
Jesse Weaver
63e871dd40 Bug 3482 Allow hold notices to be sent in print form
This is done by saving the notices in the message_queue table with
type 'print'. The notices are generated from a notice named
HOLD_PRINT. At the end of the day, they are dumped to an HTML file and
marked as sent by a new cronjob.

This setup is intended to be temporary; modules/batch/ shouldn't be around
forever.

Mandatory SQL:
INSERT INTO message_transport_types (message_transport_type) values ('print');
2010-02-22 10:52:04 -05:00
Jesse Weaver
b7e35a3725 Add expiration date, today to hold notices
This adds the new, virtual placeholders <<today>> and
<<reserves.expirationdate> that can be used in letter templates.
2010-02-22 10:51:44 -05:00
Garry Collum
a37545eb14 Bug 2655: Fixes availabilty counts if items are on hold shelf. Patch (2/2)
This fixes the opac results - non xsl transformed - and the intranet result lists.

Also fixes opac-detail which was showing all items 'on hold' if there was a bib level request, whether items were on the hold shelf or not.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:12:16 -05:00
Garry Collum
9fa69bff82 Bug 2655: Partial fix for Items on hold shelf showing as available.
Fixes the opac results (opac-search.pl), if using xsl to transform data.  I have no way to test UNIMARC results, if someone could test it for me.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:12:12 -05:00
4bade723ef Revert "(bug #3778) GetBranchesLoop and searchMyLibraryFirst"
Reverting this commit to resolve bug 4016.  This revert has the
same effect as a patch submitted by Garry Collum on 20 February 2010.

This reverts commit 2345dc7c27.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 18:04:15 -05:00
c12ff97647 bug 3242 follow-up: fix crash when emailLibrarianWhenHoldIsPlaced is ON
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:56:44 -05:00
Nahuel ANGELINETTI
8168ccb4c7 (bug #3242) send email when hold is placed
[cherry-picked from 3.0.x]

This add a new letter in database, and each time a new hold is placed, a new mail is enqueued.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-02-19 05:41:08 -05:00
21c7f786bf bug 1532: various code cleanup
* export C4::Reserves::CancelExpiredReserves
* rename  misc/cronjobs/cancel_expired_reserves.pl
  to misc/cronjobs/holds/cancel_expired_holds.pl
* added cancel_expired_holds.pl to example crontab
* fix staff crash if AllowHoldDateInFuture is on
* expirationdate is now nullable instead of relying
  on 0000-00-00

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:48 -05:00
Kyle M Hall
3502810346 (bug 1532) Reserves Updates Ported From Dev_Week
This is a much improved re-implementation of the reserves updates from dev_week.
Less new code has been added, and more existing functions are used instead of adding new ones.

The 'Lock Hold' function has been removed due to it not working as intended.

[RM note for documentation: this adds the following features:

* ability to specify an expiration date for a hold request
  when placing it via the staff interface or OPAC
* daily batch job to cancel expired holds
* nice interface to change the priority of hold
  requests for a bib in the staff interface]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:47 -05:00
Michael Hafen
e752822d04 bugfix Guided Reports - allow user specified limit in sql
Tweak the regular expression in strip_limit to work.
Tweak execute_query to use the user limit if it's lower than the hard coded one.
Also total is calculated somewhere else now.

This helps most with the csv export of a report so the user can set their own
limit instead of having the hard coded limit of 9999.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 13:52:18 -05:00
8f965b95e4 Bug 4047 - Add a link to branch URL if available on holdings in OPAC
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:29:15 -05:00
3d16451ac5 bug 1080 follow-up: make sure 'sound' isn't listed as a language
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:06:59 -05:00
Colin Campbell
ea7aa11d71 Make GetBooksellerFromId error return consistent
return undef or empty array in error cases
hopefully if we're consistent someone may start checking it
removed unnecessary ()s

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 10:29:47 -05:00
J. David Bavousett
bc06a7736a Bug 3775: Accounts::chargelostitem uses title, but title not available to it
This patch fixes the SELECT so that title is available when it is used
later on, which will prevent 'Use of uninitialized value' errors.

It also uses JOIN properly, which the original query and my initial
patches for this did not.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 11:25:25 -05:00
Matthias Meusburger
64b79bf620 MT2116 : CSV Exports : add 'new line' as separator
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 08:00:53 -05:00
Matthias Meusburger
3bbbc15ccf MT 2116: Addons to the CSV export
Fix encoding selection

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 07:54:11 -05:00
Matthias Meusburger
0268a58e16 MT2116: Addons to the CSV export
Adds the ability to customize CSV exports through the use of a YAML file.

The following customizations are available :
  - Preprocessing
  - Postprocessing
  - Field-by-field processing

The YAML field should be stored in the tools/csv-profiles/ directory and
named after the id of the CSV profile you want to customize.
An example file is provided in that directory.
(cherry picked from commit 76655b5b94)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 07:51:33 -05:00
Nahuel ANGELINETTI
39a727a43b (bug #4062) add item index in zebra conf
This add the "item" index.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 07:18:42 -05:00
Chris Nighswonger
599887a185 Bugfix: [1/3] overdue_notices.pl does not process all advertised fields
Note: overdue_notices.pl really needs to be completely re-written.

The script does not process all fields advertised in tools/letter.pl
This patch adds code to process all fields advertised as well as any
from the items table.

It also adds two additional tags for use in the letter templates:

<item></item> which should enclose all fields from the biblio, biblioitems,
and items tables.

<fine></fine> which should be enclosed by the item tag and should
enclose a currency identifier per ISO 4217. If this tag is present with
a proper identifier, the fine for that item will be displayed in the
proper currency format. Note: ISO 4217 changes from time to time therefore
all currencies may not be supported. If you find one that is not
supported, please file a bug with the Locale::Currency::Format author
Tan D Nguyen <tnguyen at cpan doe org>.

An example of the implimentation of these two tags in a notice template
might be like:

The following item(s) is/are currently overdue:

<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <fine>GBP</fine></item>

Which, assuming two items were overdue, would result in a notice like:

The following item(s) is/are currently overdue:

"A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: £3.50
"History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: £3.50

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 06:36:01 -05:00
c097736084 Fix for bug 2885, now an error message is thrown instead of a silent fail
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 20:29:44 -05:00
72fd935a2e bug 1542: remove now unneeded parameter
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:31:58 -05:00
df99b9b69c bug 1542 followup - tweak to keep handling the UI selected value out of C4
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:31:21 -05:00
Chris Cormack
8f902d3248 Bug 1542, followup patch to tidy up some messy dropdown behaviour
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:14:19 -05:00
625021ada7 Changes to further work on Bug 3550, Use GetRecordValue to get the subtitle
- Adding subtitle display to OPAC Cart, lists, and reading record
- Minor tweaks to some displays

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 14:39:42 -05:00
aece7ada1d Perltidy of C4/VirtualShelves/Page.pm
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 20:24:45 -05:00
Matthias Meusburger
59f31b9836 BZ4116: results from cataloging search is different from advanced search results
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 06:31:57 -05:00
79b8fca2b1 Additional changes to fix Bug 3920, XSLTdetailDisplay syspref controls both OPAC and Intranet
This patch adds XSLTDetailsDisplay and XSLTResultsDisplay variables
for the staff client, OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay
variables to the OPAC. Note that the XSLTResultsDisplay doesn't actually
do anything because no one has added an XSLT version of search results
to the staff client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:36:25 -05:00
Chris Cormack
87ff46ba67 Bug 3797, second part of the patch, extending output_html_with_http_headers to take a status parameter (optional)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 14:11:53 -05:00
Henri-Damien LAURENT
007b10446f bug Fixing : 3640
This patch filters all non itemrelated fields in the marcrecord before making update

AddItemhad the same problem as ModItem
They would try and take fields which would not be item fields

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:57:00 -05:00
Chris Nighswonger
0eb65d1902 Bugfix: Uncommenting pagination code
Pagination code was commented out during development causing the
spill over page one to be wrapped back onto page one. This patch
fixes that problem.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-09 11:03:18 -05:00
Colin Campbell
bcde53b5ba Bug 2505 Enabled warnings in authorities/*
Fixed obvious warnings generators in scripts
with mismatched comparisons or undefined variables
removed temporary variable selected while ensuring the
comparison it represented was between two defined variables

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:47:53 -05:00
Colin Campbell
f4b3c131dc Bug 3723 Correct return of Institution in Patron Info Resp
While the comment correctly notes that the order of variable length
fields is not fixed some units expect mandatory fields to
follow the sequence in the protocol definition and fail
parsing otherwise. Moved institution id to its expected
place in the patron information response.

Indented the first half of the if (patron_valid) so its clearer
that two cases are handled here.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:22:29 -05:00
Colin Campbell
1deaecb6d8 (Bug 3767 - Return error if checkin passed an invalid item
If an invalid item barcode is passed to checkin
the sip2 connection dies. This is because although
no item object is created its mehods are called in Checkin
To maintain the connection properly catch the condition
and return the correct response to the unit
(should also fix Bug #3696 )

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:19:01 -05:00
Chris Nighswonger
2433a91e92 Removing depricated file from the C4::Labels module.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 20:54:40 -05:00