Commit graph

8427 commits

Author SHA1 Message Date
Galen Charlton
9f2c77a686 bug 2000 - fix order of issuingrule lookup
Extended help on the alternate circulation rules
form to list the order of issuingrules lookup as
follows:

same library, same patron type, same item type</li>
same library, same patron type, default item type</li>
same library, default patron type, same item type</li>
same library, default patron type, default item type</li>
default library, same patron type, same item type</li>
default library, same patron type, default item type</li>
default library, default patron type, same item type</li>
default library, default patron type, default item type</li>

This includes modifying two routines in C4::Circulation to
follow this order: GetLoanLength() and GetIssuingRule().

The reason for this change is to have Koha exhaust all issuingrules
possibilities for a branch before checking the rules for
the default branch - this is consistent with what an admin
might expect from looking at the issuingrules forms, which display
settings a branch at a time, and is more consistent with how
circulation rules should work for indepdendent branches.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:03 -05:00
Galen Charlton
3e9a94c546 bug 2000 - alternate issuing rules - set sorting of rules
Issuing rules are now explicitly sorted by patron category,
then item type.  The default patron category sorts last; within
a list of item types for a given patron category, the default
item type sorts last.  This follows the order in which
the issuing rules are applied.

Since the primary sort is patron category, also moved that
to be the first column in the issuing rules table.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:03 -05:00
Galen Charlton
d6934ca397 bug 2000 - alternate issuing rules - some form cleanup
Improvements to smart-rules.pl to allow it to
replace issuingrules.pl.

* standardized "borrower type" to "patron category"
* made default item type and patron category ('Any')
  translatable
* regularized construction of parameters for rule
  deletion operatrion

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:00 -05:00
Galen Charlton
b35ebc644e bug 2000 - added several circ rules tables (DB rev 090)
The first new table is branch_borrower_circ_rules.

This table is used to store circulation rule attributes
that apply to a combination of patron category and branch
across all item types.  The one attribute defined is
maxissueqty, which sets the maximum number of loans
that a patron of a given category can take out at a given
branch.

Note that branch_borrower_circ_rules is for attributes
that apply across all item types.  This means that
issuingrules.maxissueqty has a different meaning: it is
the maximum number of loans per branch, category, and item type;
if issuingrules.itemtype is '*', that is a *default*
circulation rule used if no more specific rule is found.

The new table will allow the implementation of total
loan limit across item types without making the wildcard
'*' in issuingrules ambiguous.  Specifically, if branchcode,
categorycode, or itemtype is issuingrules is '*', that will now
always mean a loan rule to be applied if a more specific rule cannot be found.
Setting issuingrules.itemtype to '*' will no longer mean
to set a total limit across item types for maxissueqty.

The remaining new tables are used to store default
rules for the default branch, the default patron category,
or both:

default_branch_circ_rules - for a given branch, specify
the rule to apply if no more specific rule on
branch and patron category is found (i.e. patron category is default)

default_borrower_circ_rules - for a given patron category,
specify the rule to apply if no more specific rule
on branch patron category is found (i.e., branch is default)

default_circ_rules - global default if no more specify rule
on patron category and branch is available.  Note that this
table is constructed so that it can have at most
one row.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:18:59 -05:00
paul
5314a32914 adding string for translator
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:56 -05:00
paul
2aafe3e5b2 french translation updated (again)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:55 -05:00
paul
a1befaf8f9 updating french translation (lot of fixes)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:51 -05:00
paul
827203132c movin patron flags to template to have translatable strings
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:50 -05:00
paul
867788e8cf escaping field to deal with quotes in shelf name
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:49 -05:00
paul
2c687bc4a3 minor fixes in marc frameworks
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:48 -05:00
paul
317634b21d minor translation fixes
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:46 -05:00
paul
99b6db29b2 Adding some suggestion reasons in french
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:45 -05:00
Joe Atzberger (siptest
5aecb46ad0 SIP - Lots of regexp hacking of input streams and verbose debugging feedback.
The basic problem is that the SIP logic doesn't know where the
input is coming from.  It might be a RAW socket, and it might
be telnet.  If it is telnet, although the specs declare a
character set (from MS, unfortunately), they do not specify a telnet
implementation.  So you might get telnet handshaking or
renegotiations in the middle of an otherwise peaceful session and
these should not be taken as SIP commands.  Patches include a move
towards using $CRLF from Socket to avoid problems w/ foreign platform
mapping \n and \r to \015 or \012.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:42 -05:00
Galen Charlton
c5ac051f70 bug 2264: do not clear patron zipcode and city
When edting only a part of the patron record (e.g.,
the library use section or the alternate address), the
zipcode and city were cleared due to an error in
form processing.  Now the city and zipcode are set
only of those fields are actually in the submitted form.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 20:45:54 -05:00
Galen Charlton
356e48b678 bug 2263 - transfer zipcode when selecting guarantor
The template for the guarantor search implies that
the zipcode is one of the values to be copied from
guarantor to guarantee.  Fixed so that the transfer
can actually take place.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 20:45:53 -05:00
Galen Charlton
fff5631fc7 bug 2262 - fix delete guarantor button
Added an ID attribute so that the JavaScript
for the 'delete guarantor' button could
clear the guarantorid field.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 20:45:44 -05:00
22654a5977 Redesigning and bugfixing language-picker. Switching from fixed footer positioning to one with flows with page length. Fixing major unreported bug which prevented any but the first sublanguage menu from displaying.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 13:09:42 -05:00
Galen Charlton
df1f46f9da bug 2253: improve rebuild_zebra's handling of zebraqueue
Prior to this patch, rebuild_zebra.pl -z was effectively
hanging on to a lock on the zebraqueue table, preventing
other scripts from inserting new entries into the table.
This had the effect of causing circulation operations
to time out.

Refactored by having rebuld_zebra.pl pull the active
queue into memory, then mark entries done by zebraqueue.id.
Consequently, rebuild_zebra.pl should no longer
block adding new entries into zebraqueue.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 09:49:06 -05:00
Galen Charlton
56356ced1a bug 2258 - new script to sync embedded items
Created a new script, sync_items_to_marc_bib.pl,
to replace the item tags embedded in the MARC bib
records with fresh versions taken from the items table.

This script should be run as follows:

maintenance/sync_items_to_marc_bib.pl --run-update

Assuming that you're using Zebra, rebuild_zebra.pl -b -z
or rebuild_zebra.pl -b -r should be run after running
this script.

This script should be run if you have used
link_bibs_to_authorities.pl prior to the first
patch for bug 2258.  It can also be used if there
is any reason to suspect that the embedded item tags
do not reflect the items table.

With this script I am creating a maintenance/ subdirectory of
misc/ to hold scripts that are meant to fix problems
in the database but are not (or should not be, anyway) necessary
for regular use.

Documentation: add to documentation for server side scripts

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 09:06:15 -05:00
Ryan Higgins
c5bfa45844 Remove 95c and 95r subfields from default MARC21 framework -- These have no tag definitions.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 08:32:09 -05:00
Joshua Ferraro
89e12081c1 Fix for bug 2260: UNIMARC misconfiguratin on itemtype
WARNING: THIS PATCH REQUIRES A REINDEX FOR UNIMARC RECORDS
2008-06-19 08:19:37 -05:00
Joshua Ferraro
5ae7d4ea97 Circulate permission misspelling 2008-06-18 19:46:13 -05:00
Andrew Moore
6e52709824 Bug: 2259: eliminate lines too long for git to use.
This patch modifies 13 HTML templates and includes that have lines in them longer than 998 characters. Lines this long are known to break git.

I believe that none of these change behaviour at all, but I'm concerned about one of them. It adds whitespace (carraige returns) inside a <title> tag. I'm not certain that all browsers will deal with this OK.

No documentation changes necessary here.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 19:25:52 -05:00
Galen Charlton
6858da97c3 bug 2258 - do not duplicate embedded items
If a MARC bib is modified by this batch job,
do not duplicate the item tags embedded in
it (e.g., 952 for MARC21).  When modifying
a bib record, any embedded item tags must
be removed before calling ModBiblio - perhaps
this should be moved to ModBiblio itself.

Also removed an error in the job's help text.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 19:25:07 -05:00
Joshua Ferraro
fee2ddc086 Fix for bug 2212: Searching with Itemtype limit doesn't work
The issue was that the index for itemtype is different depending
on whether you're using item-level or bib-level itemtypes. This
patch detects the system choice and sets the index properly
2008-06-18 13:57:22 -05:00
Joshua Ferraro
6c9b83fbdc Resolves bug 2250: RFC: New System Preference to Determine which 'Types' and associated icons to display in advanced Search
For documentation, please indicate that as part of profiling,
staff can refer to the AdvancedSearchTypes system preference to
choose where to draw the advanced search 'Types' from. Currently
this is implemented as a choice, between itemtypes and ccodes,
but it's been designed to work with any authorised value so long
as an index exists for searching by that authorised value.

By default, and if this syspref doesn't exist, it will pull from
itemtypes as before.
2008-06-18 13:01:20 -05:00
89d34a7c48 A better fix for Bug 2229, I think. Text inside basket.js can be translated fine, this instance simply lacked the call to the dummy function for gettext. It's important /not/ to have the "Cart" text in masthead.inc because there should be no Cart link for users with javascript turned off.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 11:41:47 -05:00
d900b2a63d Adding required jquery files for update Cart notification popup.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 11:19:58 -05:00
be1ab41d2f Position of cart details popup needs to be specified numerically since jquery can't seem to accurately calculate the dimensions of the cart button.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:58:40 -05:00
4128725f69 Continuing work on Cart popup
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:58:40 -05:00
a0dfa0e5a6 Testing change to cart popup display system. Attempting to fix display flakiness associated with YUI method.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:58:39 -05:00
d8c60f6bdf Fix for Bug 2240, "opac-search.pl masthead does not include 'cart' and 'list' buttons, " and other minor markup corrections.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:36:04 -05:00
b999e12bb1 Lowering truncation threshold for display of system preference values to better accomodate average display size. Compromise fix for Bug 2132, "Sys Pref Column too Wide."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:36:03 -05:00
9821a11537 Fix for Bug 2097, "Extra bar after subject headings in OPAC."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:36:01 -05:00
374a07a5d2 Adding missing menu item for Stop Words. Fixes Bug 1995, "Link Missing from Admin Menu."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:53:20 -05:00
64d65d838a Restructuring guarantor display to address Bug 2220 ("Guarantor needs two fields to be labeled"). This change probably means an updated screenshot is necessary.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:52:52 -05:00
39576cd44c Whitespace was causing table sorting problem. Fixes Bug 2215, "In page JavaScript sort not working for title on holds tab for my summary."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:52:22 -05:00
37e4866b5b Correction to allow pop-up window to scroll. fixes Bug 2209, "Editing records in the inventory."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:51:49 -05:00
ac7c215be3 Markup corrections. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:53 -05:00
904a148509 Markup correction. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:50 -05:00
Ryan Higgins
5996c38fbd remove some warns
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:49 -05:00
Galen Charlton
ce1fbe0785 bug 2252 - check correct items for item-specific holds
C4::Reserves::_Findgroupreserves(), instead of
getting all requests for a bib, now gets only the
requests that are title-level (itemnumber is null)
or for that specific item.  This prevents an item
from filling an item-level hold for a different item
attached to the same bib, which is the expected
behavior for item-level holds.

[LL Bug 22]

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 13:09:41 -05:00
6c9eeabc71 Corrrecting layout for opacuserlogin = 0. Fixes Bug 2228, "Wrong page design on opac-main.pl when no login section."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:32:37 -05:00
5697bef959 Removing redundant column. Fixes Bug 2202, "No need for View Column on Authority Search"
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:58 -05:00
6729244bb5 Terminology correction (fixes Bug 2200, "Mislabeled Column on Overdues Report")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:37 -05:00
691bcc631c Markup corrections to cataloging pages; Fixes for Bugs 2166 (" Book Jackets Not Showing on My Summary"), 2194 ("No results for Authority Search Shows blank record"), and 2196 ("Extra comma being added to record display")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:09 -05:00
Joe Atzberger
0afe72e9ce Bugfix patron search for cards/labels related to pagination.
Pagination was working for searching, but the "type" and batch_id
were not making it onto subsequent pages (i.e., the 2nd page of "B"
names).  This corrects the problem with the base URL passed to
pagination_bar.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 06:26:44 -05:00
Daniel Kahn Gillmor
04a8fb567d fix coins/openurl breakage when search terms include author names. (thanks, chris on #koha@irc.katipo.nz!)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 06:26:41 -05:00
Joe Atzberger
ac9c6f004d Bugfix LDAP config to play nice with Zebra.
The section in KOHA_CONF was moved inside <config> and renamed
<ldapserver>.  Perldoc updated to correspond.  Tested with local
LDAP and existing test (t/db_dependent/Auth_with_ldap.t).
Patch can be applied with confidence based on comparison of 2 dumps:
perl -e 'use C4::Context; use Data::Dumper; my $context=C4::Context->new("./old_config.xml"); print Dumper ($context->{server}->{ldapserver}),"\n";'
 and
perl -e 'use C4::Context; use Data::Dumper; my $context=C4::Context->new("./new_config.xml"); print Dumper (C4::Context->config("ldapserver")),"\n";'
These dumps reflect the way Auth_with_ldap accesses configuration info before and after.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-16 15:37:13 -05:00
Joe Atzberger
579021df92 Bugfix 1978 - on circ, check date specified output is later than now.
This resolves all remaining significant parts of the bug.
Note that this may have to be revisited for hourly or partial-day circ functionality
for 3.2.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-16 15:37:11 -05:00