working/Evergreen.git
13 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Mon, 29 Aug 2011 15:23:54 +0000 (11:23 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

13 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Bill Erickson [Mon, 29 Aug 2011 15:23:44 +0000 (11:23 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

13 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Jason Etheridge [Fri, 26 Aug 2011 20:03:15 +0000 (16:03 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

13 years agopin upgrade version number for magic macros
Jason Etheridge [Fri, 26 Aug 2011 20:02:05 +0000 (16:02 -0400)]
pin upgrade version number for magic macros
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoExpose sort values from lists
Thomas Berezansky [Tue, 23 Aug 2011 16:06:55 +0000 (12:06 -0400)]
Expose sort values from lists

Specifically useful for things like receipt templates.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoFive initial OU settings for %INCLUDE()% use
Thomas Berezansky [Tue, 23 Aug 2011 12:33:04 +0000 (08:33 -0400)]
Five initial OU settings for %INCLUDE()% use

header_text
footer_text
notice_text
alert_text
event_text

None are really restricted to a specific purpose. Names are more of a
hint than a requirement.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoReceipt Macros: %INCLUDE()%
Thomas Berezansky [Mon, 22 Aug 2011 00:00:55 +0000 (20:00 -0400)]
Receipt Macros: %INCLUDE()%

Takes a single parameter: The name of the include.

Each include is an OU setting: circ.staff_client.receipt.<name>

The includes are done as the first substitution. This has the benefit
of allowing other substitutions within them (including additional calls
to %INCLUDE()%) and the downside of not allowing dynamic includes.

Because an include can contain includes the code keeps track of all
includes already done, skipping those already included. This prevents
infinite loops when A includes B and B includes A, or longer variants
thereof.

Primary intended use would be for libraries to place frequently changed
notices and such in their templates. Instead of having to edit every
template on every workstation they use the %INCLUDE()% macro and edit
the org unit settings. At the next login the updated text appears on
every workstation.

Due to the includes being processed first a library could use them to
centrally administer templates by using an include for each piece of
each template.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoReceipt Macros: %SORT()%
Thomas Berezansky [Fri, 19 Aug 2011 19:15:48 +0000 (15:15 -0400)]
Receipt Macros: %SORT()%

Added to line item templates.
Takes one or more comma separated parameters:
field AS type ASC/DESC

AS type is optional
ASC/DESC is optional

Field is the field name without % signs.
Type is DATE, INT, FLOAT, NUMBER, LOWER, or UPPER

DATE will sort based on wrapping both sides in "new Date"
INT will sort based on wrapping both sides in parseInt
FLOAT and NUMBER will sort based on wrapping both sides in parseFloat
LOWER will apply .toLowerCase to both sides
UPPER will apply .toUpperCase to both sides

ASC (default) will sort in ascending order.
DESC will sort in descending order.

Can be specified more than once:
%SORT(a,b)% %SORT(c)%
Would sort by a, then b, then c.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoAdd SIP2 chargeable loan support.
Jason Stephenson [Thu, 30 Jun 2011 17:43:24 +0000 (13:43 -0400)]
Add SIP2 chargeable loan support.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoLP#824257 Fix nasty overlapping when patron has more than 6 notes
Michael Peters [Thu, 11 Aug 2011 01:31:02 +0000 (21:31 -0400)]
LP#824257 Fix nasty overlapping when patron has more than 6 notes

Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoPush phrases down to be subqueries, so they can be ORed together
Mike Rylander [Thu, 25 Aug 2011 19:56:15 +0000 (15:56 -0400)]
Push phrases down to be subqueries, so they can be ORed together

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
13 years agoMerge branch 'ttopac-advanced-sort-avail' into template-toolkit-opac
Lebbeous Fogle-Weekley [Thu, 25 Aug 2011 20:24:46 +0000 (16:24 -0400)]
Merge branch 'ttopac-advanced-sort-avail' into template-toolkit-opac

13 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

13 years agoAdd IDs to offline import/export buttons
Thomas Berezansky [Thu, 25 Aug 2011 12:43:07 +0000 (08:43 -0400)]
Add IDs to offline import/export buttons

Ensures that the import one, at least, can be found and disabled when
pending transactions exist.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoAdd a new visible alert to the main client screen alerting about pending transactions
Atom Edoceo [Mon, 22 Aug 2011 18:23:14 +0000 (11:23 -0700)]
Add a new visible alert to the main client screen alerting about pending transactions

Signed-off-by: Edoceo <code@edoceo.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoStamped upgrade script for acq-copy-creator-from-receiver
Mike Rylander [Thu, 25 Aug 2011 00:16:28 +0000 (20:16 -0400)]
Stamped upgrade script for acq-copy-creator-from-receiver

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoOption to set copy creator value to ACQ receiver
Bill Erickson [Wed, 24 Aug 2011 17:57:11 +0000 (13:57 -0400)]
Option to set copy creator value to ACQ receiver

YAOUS to support updating the asset.copy.creator value to match the
staff user that marked the ACQ-copy (acq.lineitem_detail) as received.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoStamped upgrade script for acq-lineitem-detail-receiver
Mike Rylander [Thu, 25 Aug 2011 00:09:04 +0000 (20:09 -0400)]
Stamped upgrade script for acq-lineitem-detail-receiver

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoShow copy receiver in ACQ copy grid
Bill Erickson [Wed, 24 Aug 2011 19:28:56 +0000 (15:28 -0400)]
Show copy receiver in ACQ copy grid

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoColumn to track ACQ copy (lineitem_detail) receiver
Bill Erickson [Wed, 24 Aug 2011 18:24:54 +0000 (14:24 -0400)]
Column to track ACQ copy (lineitem_detail) receiver

Creates acq.lineitem_detail.receiver column, set to the staff that
marked the copy as received.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoProtect against div-by-0 for negated words
Mike Rylander [Wed, 24 Aug 2011 18:36:54 +0000 (14:36 -0400)]
Protect against div-by-0 for negated words

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoTrack count of dummy atoms and use a NULL tsquery when all dummy
Mike Rylander [Wed, 24 Aug 2011 17:44:04 +0000 (13:44 -0400)]
Track count of dummy atoms and use a NULL tsquery when all dummy

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoUse unphrases in SQL generation
Mike Rylander [Wed, 24 Aug 2011 15:05:55 +0000 (11:05 -0400)]
Use unphrases in SQL generation

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoadd "unphrases" to capture negated phrases ( -"foo bar" ) and make the negator config...
Mike Rylander [Wed, 24 Aug 2011 15:03:34 +0000 (11:03 -0400)]
add "unphrases" to capture negated phrases ( -"foo bar" ) and make the negator configurable

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoIgnore empty atoms in query decomposition
Mike Rylander [Tue, 23 Aug 2011 19:03:56 +0000 (15:03 -0400)]
Ignore empty atoms in query decomposition

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoAdd to existing PO (by ID) from related items page
Bill Erickson [Tue, 23 Aug 2011 21:03:28 +0000 (17:03 -0400)]
Add to existing PO (by ID) from related items page

In the View/Place orders page for a bib record, it's now possible to add
a lineitem representing the bib record to an existing purchase order.

Includes a new general API call for adding a LI to a PO.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoSupport labelFormat for read-only AutoFieldWidget's
Bill Erickson [Tue, 23 Aug 2011 18:22:06 +0000 (14:22 -0400)]
Support labelFormat for read-only AutoFieldWidget's

Previously only worked with edit widgets (e.g. drop-downs).  This also
takes into account the fact that different instances of AutoFieldWidget
for the same class and value may have different labelFormat's

One user-visible result of this change is the ACQ read-only fund display
in purchase orders.  Funds will now show the code and year for funds in
the copy grid before and after the data is rendered read-only.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoBranchify patch from Steven Chan on LP bug #821640.
Jason Stephenson [Tue, 9 Aug 2011 21:19:49 +0000 (17:19 -0400)]
Branchify patch from Steven Chan on LP bug #821640.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoReally stop the z39.50 daemon when a client is connected.
Jason Stephenson [Thu, 23 Jun 2011 14:19:50 +0000 (10:19 -0400)]
Really stop the z39.50 daemon when a client is connected.

Send a SIGTERM instead of SIGINT from do_action when the action is
stop in oils_ctl.sh.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoEnhance sample Z39.50 config file
Dan Scott [Thu, 23 Jun 2011 02:55:27 +0000 (22:55 -0400)]
Enhance sample Z39.50 config file

Make "expose holdings" the default; use specific indexes for ISBN and
ISSN; show how to scope results to a part of the org tree; and show that
multiple database configs can be specified in the same file.

Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoMake some oils_ctl.sh improvements.
Jason Stephenson [Fri, 10 Jun 2011 17:43:32 +0000 (13:43 -0400)]
Make some oils_ctl.sh improvements.

Add start|stop|restart commands for z39.50 to oils_ctl.sh.

Use LOCALSTATEDIR and SYSCONFDIR configuration variables in
oils_ctl.sh.

Modify the existing SIP2 commands in oils_ctl.sh to use these
configuration variables.

Modify src/Makefile.am to replace LOCALSTATEDIR and SYSCONFDIR
variables in oils_ctl.sh when installing.

Add example/default xml configurations for z39.50:
Open-ILS/examples/oils_yaz.xml.example
Open-ILS/examples/oils_z3950.xml.example

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
13 years agoMenu item for "portal"
Thomas Berezansky [Sun, 3 Jul 2011 20:38:56 +0000 (16:38 -0400)]
Menu item for "portal"

To return a tab to "new" state without close/reopen

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoMake portal name its tab.
Thomas Berezansky [Sun, 3 Jul 2011 20:50:25 +0000 (16:50 -0400)]
Make portal name its tab.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoStamped upgrade script for LP#825245
Mike Rylander [Tue, 23 Aug 2011 18:41:41 +0000 (14:41 -0400)]
Stamped upgrade script for LP#825245

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoVandelay: added some info to print/csv bib output
Bill Erickson [Fri, 12 Aug 2011 14:02:57 +0000 (10:02 -0400)]
Vandelay: added some info to print/csv bib output

Added bib match count, import error, and error detail to print and CSV
queued record export.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoVandelay: show record match counts in record queue UI
Bill Erickson [Fri, 12 Aug 2011 13:07:35 +0000 (09:07 -0400)]
Vandelay: show record match counts in record queue UI

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agomaster-stamped upgrade script for LP#816131
Mike Rylander [Tue, 23 Aug 2011 18:32:17 +0000 (14:32 -0400)]
master-stamped upgrade script for LP#816131

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoReverse direction of org_unit_ancestors
Thomas Berezansky [Mon, 22 Aug 2011 18:44:17 +0000 (14:44 -0400)]
Reverse direction of org_unit_ancestors

Apparently callers expect it to start at the top of the org tree.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoUnwrapped upgrade script for oua_force_order
Thomas Berezansky [Thu, 11 Aug 2011 13:36:36 +0000 (09:36 -0400)]
Unwrapped upgrade script for oua_force_order

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoNew version of actor.org_unit_ancestors
Thomas Berezansky [Thu, 11 Aug 2011 13:35:18 +0000 (09:35 -0400)]
New version of actor.org_unit_ancestors

Preserves order through joins

Basically actor.org_unit_ancestors_distance with a join to get the
entire org units, rather than just IDs and a distance.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoFixed seaching for a colon (:) surrounded by white space
Liam Whalen [Thu, 11 Aug 2011 18:36:19 +0000 (14:36 -0400)]
Fixed seaching for a colon (:) surrounded by white space

When searching for a colon surrounded by white space the search would
freeze.  An example of such a search would be:
Climate change economics and policy : an RFF anthology
This was happening because the decompose function within QueryParser.pm
Would build a regular expression that would search the query for both
classes and class aliases e.g (keyword and kw).  However, when buliding
the regex for aliases QueryParser would add extraneous or symbols (|)
to the end of the regex without adding the accompanying alias.
This was happening because there was a check to see if the corresponding
class to each alias had already been added to the regex.  But, the
check to see if the alias had already been appened to the regex happened
too late.  I have moved the check to encopase the appending of the or
symbols and the class.
Signed-off-by: Liam Whalen <lwhalen@evergreen-dev.catalogue.nrcan.gc.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoAdds org unit selectors to Admin -> Server Admin -> Booking menu items, also modifies
James Fournie [Thu, 7 Jul 2011 02:07:50 +0000 (19:07 -0700)]
Adds org unit selectors to Admin -> Server Admin -> Booking menu items, also modifies
the IDL to give context-field based pcrud perms instead of 'require global'
This makes the booking module more org-unit scopable

Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoFix "Retarget Local Holds" for non-holdable copies
Thomas Berezansky [Fri, 19 Aug 2011 13:46:40 +0000 (09:46 -0400)]
Fix "Retarget Local Holds" for non-holdable copies

Specificially:

Wrap holdable check in is_true
Add check for current copy status holdable
Add check for current copy location holdable

The latter stores the fetched location for later use.
The one later use I found updated to check if the location is a reference.

The update copy code already checks if location is a reference and deals
with it properly.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoVandelay: Insufficient Quality Fall-Thru Merge Profile
Bill Erickson [Fri, 19 Aug 2011 15:20:55 +0000 (11:20 -0400)]
Vandelay: Insufficient Quality Fall-Thru Merge Profile

When a user selects "Merge On Single Match" or "Merge On Best Match" and
apply a minimum quality ratio, the fall-through profile will be used in
a secondary merge attempt for any records that fail the initial merge
due to insufficient record quality.

This allows the user to choose 2 different outcomes based on record
quality.  For example, you may wish to do a full overlay for all
high-quality records, but only extract subjects or other information
from lower quality records.  This also allows users to do record+copy
imports for high-quality records and copy-only imports for low quality
records (using a no-op merge profile like "replace 901c").

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoBranchify patch from LP bug #802523.
Jason Stephenson [Tue, 9 Aug 2011 17:41:04 +0000 (13:41 -0400)]
Branchify patch from LP bug #802523.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoUI cleanup for batch-holds from lists
Bill Erickson [Tue, 23 Aug 2011 14:42:54 +0000 (10:42 -0400)]
UI cleanup for batch-holds from lists

* Handle hold placement override with a single form and checkboxes
instead of a series individual forms

* Added a cancel button on the override page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoMake the sort-by and limit-to-available controls appear after adv search
Lebbeous Fogle-Weekley [Mon, 22 Aug 2011 22:28:18 +0000 (18:28 -0400)]
Make the sort-by and limit-to-available controls appear after adv search

This is hackish and suboptimal until we leverage the parsed queries soon
to be returned by QP.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
13 years agostamp an upgrade version for the czs use_perm feature
Jason Etheridge [Mon, 22 Aug 2011 21:32:09 +0000 (17:32 -0400)]
stamp an upgrade version for the czs use_perm feature

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agouse_perm column for config.z3950_source
Jason Etheridge [Fri, 22 Jul 2011 05:47:15 +0000 (01:47 -0400)]
use_perm column for config.z3950_source

The idea is that if a permission code is specified for a given source, then
staff will need that permission to use that source in the staff client z39.50
interface.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTPac: batch holds from on-the-fly lists and bookbags
Bill Erickson [Thu, 18 Aug 2011 21:14:38 +0000 (17:14 -0400)]
TPac: batch holds from on-the-fly lists and bookbags

* Enable the 'Place Hold' action in the drop-down for bookbag and
on-the-fly list items

* Place hold form now support lists of targets and will report error
conditions for each target

* Batch and individual hold overrides supported where appropriate

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoFix penalty generation during billing creation
Jason Etheridge [Fri, 19 Aug 2011 22:22:28 +0000 (18:22 -0400)]
Fix penalty generation during billing creation

by passing the editor object referencing the database transaction to xact_org

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoDisplay only available formats for metarecord holds in IE
Lebbeous Fogle-Weekley [Mon, 22 Aug 2011 14:37:30 +0000 (10:37 -0400)]
Display only available formats for metarecord holds in IE

The OPAC's usual hideMe()/unHideMe() tricks don't work for <option>
elements in Internet Explorer 8.  Use the disabled attribute.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoRemove cache-generator.sh from Makefile.am
Dan Scott [Sat, 20 Aug 2011 21:51:46 +0000 (17:51 -0400)]
Remove cache-generator.sh from Makefile.am

In a previous commit, we removed cache-generator.sh. Now we remove the
remaining reference to it in the Makefile.am that was generating an
error (reported by Ben Webb).

Signed-off-by: Dan Scott <dan@coffeecode.net>
13 years agoVandelay: repair item attr context org selector
Bill Erickson [Fri, 19 Aug 2011 19:50:22 +0000 (15:50 -0400)]
Vandelay: repair item attr context org selector

1. Prevents resetting the context selector to the workstation org unit
each time it's changed.

2. Prevent the unintentional pileup of dojo.connect() events, which
can lead to exponential growth in the number of server calls to fetch
import-item-attribute-definitions with each change of the context org
selector.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years ago#LP801961, error when running edi_fetcher.pl
Ben Shum [Tue, 2 Aug 2011 15:15:57 +0000 (11:15 -0400)]
#LP801961, error when running edi_fetcher.pl

This patch addresses an error encountered when running edi_fetcher.pl.
The method "is_dir" should be just plain "dir" in RemoteAccount.pm file.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoBranchify second patch from James Fournie on LP bug #791941.
Jason Stephenson [Tue, 9 Aug 2011 19:43:12 +0000 (15:43 -0400)]
Branchify second patch from James Fournie on LP bug #791941.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoBranchify the first patch from James Fournie on LP bug #791941.
Jason Stephenson [Tue, 9 Aug 2011 19:40:41 +0000 (15:40 -0400)]
Branchify the first patch from James Fournie on LP bug #791941.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoBranchify patch from LP bug #809478 and forward port to master.
Robert Soulliere [Tue, 9 Aug 2011 19:18:15 +0000 (15:18 -0400)]
Branchify patch from LP bug #809478 and forward port to 

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoTpac: fetch bib record piles non-atomicly to avoid large messages
Bill Erickson [Fri, 19 Aug 2011 13:56:48 +0000 (09:56 -0400)]
Tpac: fetch bib record piles non-atomicly to avoid large messages

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTpac: stream bookbag entry retrieval to reduce msg size
Bill Erickson [Fri, 19 Aug 2011 12:48:04 +0000 (08:48 -0400)]
Tpac: stream bookbag entry retrieval to reduce msg size

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoStricter order for actor.org_unit_parent_protect()
Dan Wells [Tue, 16 Aug 2011 21:22:47 +0000 (17:22 -0400)]
Stricter order for actor.org_unit_parent_protect()

actor.org_unit_parent_protect() may not work due to the fact
that 'IF' conditions in PL/pgSQL are not necessarily processed
in the order written. This line:

"IF TG_OP = 'INSERT' OR NEW.parent_ou
IS DISTINCT FROM OLD.parent_ou THEN"

may fail because the 'IS DISTINCT FROM' happens before the
'INSERT' check, and and that fails because there is no 'OLD'
variable for INSERTs.

This commit may not be the optimal style for this circumstance
in this language, but it works.  It also appears to change more
than it really does due to a loss of one level of indentation in
the structure.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoWhitespace Only Changes
Dan Wells [Tue, 16 Aug 2011 21:16:35 +0000 (17:16 -0400)]
Whitespace Only Changes

Files uses primarily tabs, function used both spaces and tabs.
It now uses all tabs.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoUpdate README to reflect the --create-database option
Dan Scott [Thu, 18 Aug 2011 19:32:53 +0000 (15:32 -0400)]
Update README to reflect the --create-database option

Now that eg_db_config.pl is intelligent enough to create the database,
update the README to free people from the tyranny of having to manually
issue database creation (and contrib-adding) commands.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Thu, 18 Aug 2011 16:27:54 +0000 (12:27 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

13 years agoTpac: style inactive holds w/ grey bground
Bill Erickson [Thu, 18 Aug 2011 16:17:03 +0000 (12:17 -0400)]
Tpac: style inactive holds w/ grey bground

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoAdd --create-database option to eg_db_config.pl user/tsbere/create_database
Thomas Berezansky [Thu, 18 Aug 2011 16:06:46 +0000 (12:06 -0400)]
Add --create-database option to eg_db_config.pl

Uses create_database.sql and superuser rights to do all
database creation steps other than making a usable superuser
account to begin with.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
13 years agoRemove CONFIG references from autogen.sh
Dan Scott [Tue, 16 Aug 2011 03:52:24 +0000 (23:52 -0400)]
Remove CONFIG references from autogen.sh

We're relying on OpenILS::Utils::Cronscript for the location of the
opensrf_core.xml file, so the vestigial references were unnecessary
noise.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoFurther autogen.sh cleanup
Dan Scott [Tue, 16 Aug 2011 03:14:01 +0000 (23:14 -0400)]
Further autogen.sh cleanup

* Roll cache-generator.sh functionality into autogen.sh
* No longer install deleted scripts
* Teach Perl build infrastructure about OpenILS::Utils::Configure

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoRevamp autogen.sh to call functions from a Perl module
Dan Scott [Mon, 15 Aug 2011 22:03:37 +0000 (18:03 -0400)]
Revamp autogen.sh to call functions from a Perl module

This cut moves all of the logic from the individual scripts that
autogen.sh used to call into a self-contained Perl module. We use
OpenILS::Utils::Cronscript to avoid much of the init dupe code.

Note that calling Perl functions from a bash script is not crazy pretty,
but perhaps in the long run autogen.sh becomes something else. This is
just a step towards consolidating those functions in a single module
while maintaining the same interface as before.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoTpac: repaired propagator casulaty; using mkurl instead
Bill Erickson [Wed, 17 Aug 2011 21:37:13 +0000 (17:37 -0400)]
Tpac: repaired propagator casulaty; using mkurl instead

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTPAC: Strip the "page" GET param from author searches
Dan Scott [Wed, 17 Aug 2011 21:18:54 +0000 (17:18 -0400)]
TPAC: Strip the "page" GET param from author searches

mkurl() generates a URL that, by default, retains all of the parameters
that the currnt query string includes - useful for retaining library
search scope, etc. However, searches for authors that are launched by
clicking on the author's name in the search results page / record
details were failing in many cases because the "page" parameter came
along with it - and if there weren't five pages of results for page=5,
for example, then no hits would be shown.

This commit removes the page param from the URL. In other places, all of
the params are stripped (see cnbrowse) but as I assume we want to retain
search scope and potentially other parameters, we'll start with the
smallest possible change.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoMark a string for i18n support in the TPAC
Dan Scott [Wed, 17 Aug 2011 20:43:46 +0000 (16:43 -0400)]
Mark a string for i18n support in the TPAC

Even alt strings deserve translation support...

Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoEscape TPAC "myopac" output to protect against XSS attacks
Dan Scott [Wed, 17 Aug 2011 19:36:15 +0000 (15:36 -0400)]
Escape TPAC "myopac" output to protect against XSS attacks

We're using the Template::Toolkit html and uri filters to ensure that
the usual suspects are escaped at output time to prevent trivial XSS
attacks.

berick: did some merge cleanup

Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoAssume username, not barcode, in TPAC login
Dan Scott [Wed, 17 Aug 2011 17:01:08 +0000 (13:01 -0400)]
Assume username, not barcode, in TPAC login

In the absence of a barcode regex OU setting (opac.barcode_regex), the
TPAC was assuming that the entered value was a barcode. However, the
default JSPAC assumption was that the entered value was a username. This
commit makes the TPAC continue to function with the same assumptions as
the default JSPAC in the absence of a barcode regex OU setting.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoTPac: Removed errant 'html' almost-filter
Bill Erickson [Wed, 17 Aug 2011 20:55:43 +0000 (16:55 -0400)]
TPac: Removed errant 'html' almost-filter

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTpac: more html output sanitizing
Bill Erickson [Wed, 17 Aug 2011 20:50:50 +0000 (16:50 -0400)]
Tpac: more html output sanitizing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTpac: more html output scrubbing
Bill Erickson [Wed, 17 Aug 2011 19:45:44 +0000 (15:45 -0400)]
Tpac: more html output scrubbing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTPac: more aggressive dynamic output filtering
Bill Erickson [Wed, 17 Aug 2011 19:28:53 +0000 (15:28 -0400)]
TPac: more aggressive dynamic output filtering

Making heavier user of html/uri filters to prevent accidental or
malicious rendering of html from dynamic data.  More to follow.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoVandelay: don't clear item import profile when creating new queue
Bill Erickson [Wed, 17 Aug 2011 13:17:17 +0000 (09:17 -0400)]
Vandelay: don't clear item import profile when creating new queue

This avoids the problem of: enter import-profile in the UI => enter name for
new queue => profile is cleared.  Import profile is still cleared/set when
an existing queue is selected, since existing queues already have an
item import profile set.

Part II of 90a7bde48a6ef5f7be73375612b5db88f8b31c95

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoLP 799719: Pass the DESTDIR variable to python installer
Dan Scott [Tue, 16 Aug 2011 15:50:45 +0000 (11:50 -0400)]
LP 799719: Pass the DESTDIR variable to python installer

Based on Ben Webb's patch, but using the same triple-slash to avoid any
possibility of confusion about the installation location (see also the
same adjustment made to OpenSRF).

Signed-off-by: Dan Scott <dscott@laurentian.ca>
13 years agoOpps ... use the correct number
Mike Rylander [Tue, 16 Aug 2011 15:19:35 +0000 (11:19 -0400)]
Opps ... use the correct number

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoStamped upgrade scripts for LP#790329
Mike Rylander [Tue, 16 Aug 2011 15:10:44 +0000 (11:10 -0400)]
Stamped upgrade scripts for LP#790329

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoLP#790329 org_lasso search is broken
Dan Scott [Thu, 28 Jul 2011 18:29:48 +0000 (14:29 -0400)]
LP#790329 org_lasso search is broken

Fix the JavaScript error when we attempt to create a feed for the
shortname of the org_unit_lasso (lassos have no shortname) - which lets
the request hit the backend Perl module, which in turn chokes on a test
for OU that only allows two conditions: either all digits is treated as
a numeric ID for an org unit, or it is a shortname. Of course, lassos
are negative integers, so we have to modify the test slightly to make it
happier.

There was no depth for org lasso copy counts, and this was handled
correctly in the main case by the asset.opac_lasso_record_copy_count()
function and its staff variant, but when a copy was not found at a given
org_unit in the lasso a request was made for the non-existent depth and
the function would error out.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoPlaceholder for 2.0-only LP#790329 fix
Mike Rylander [Tue, 16 Aug 2011 15:08:02 +0000 (11:08 -0400)]
Placeholder for 2.0-only LP#790329 fix

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoVandelay: don't clear match-set when creating new queue
Bill Erickson [Tue, 16 Aug 2011 14:55:39 +0000 (10:55 -0400)]
Vandelay: don't clear match-set when creating new queue

This avoids the problem of: enter match set in the UI => enter name for
new queue => match set is cleared.  Match set is still cleared/set when
an existing queue is selected, since existing queues already have a
match set.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoKeep the logging output of the EDI translator by default
Lebbeous Fogle-Weekley [Tue, 16 Aug 2011 13:10:45 +0000 (09:10 -0400)]
Keep the logging output of the EDI translator by default

There is valuable troubleshooting information there that is otherwise hard to
find.  This particularly matters when the output of an EDI
Action/Trigger template (JEDI) doesn't successfully get translated to
EDIFACT for nonobvious reasons.

In production environments, you might instead pipe to logger so that you can
collect output with syslog, rather than in a flat file.  As long as
output goes *somewhere.*

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
13 years agoLP#820409 fix org unit admin UI
Jason Etheridge [Mon, 15 Aug 2011 19:34:07 +0000 (15:34 -0400)]
LP#820409 fix org unit admin UI

This reverts part of 17e659eec3e23caf5d301b33aa5019b672ecd0e8, which was
tightening checks against null and '' to avoid implicit type-casting.

This line var modified_ou = new aou().fromStoreItem( current_ou ); was
producing a fieldmapper object where certain fields were being set to
contain the string "undefined" rather than a null.

The update method would take isdeleted == "undefined" as True.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoStamped upgrades for LP#825303
Mike Rylander [Tue, 16 Aug 2011 13:00:43 +0000 (09:00 -0400)]
Stamped upgrades for LP#825303

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoreturn only the one applicable OU setting value
Galen Charlton [Fri, 12 Aug 2011 20:09:11 +0000 (16:09 -0400)]
return only the one applicable OU setting value

Correct actor.org_unit_ancestor_setting so that it returns
at most one setting value, rather than the entire set
 of values defined for the OU and its ancestors.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agolp#825303: fix cat.default_classification_scheme lookup
Galen Charlton [Fri, 12 Aug 2011 16:18:54 +0000 (12:18 -0400)]
lp#825303: fix cat.default_classification_scheme lookup

Fixes a bug where the wrong default classification scheme
could be chosen when adding a new volume whose classification
scheme was not explicitly set.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoTTPac: Hide pagination for 1-page hits
Bill Erickson [Tue, 16 Aug 2011 12:24:38 +0000 (08:24 -0400)]
TTPac: Hide pagination for 1-page hits

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTTpac: added simple/detailed record view option to results page
Bill Erickson [Mon, 15 Aug 2011 21:38:12 +0000 (17:38 -0400)]
TTpac: added simple/detailed record view option to results page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTTPac: move results pageing chunk to new template
Bill Erickson [Mon, 15 Aug 2011 18:56:50 +0000 (14:56 -0400)]
TTPac: move results pageing chunk to new template

table.tt2 and paging are complex enough and will likely result in much
local customization.  Break them up into 2 page to simplify.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTTpac: show page range in results paging display
Bill Erickson [Mon, 15 Aug 2011 18:42:45 +0000 (14:42 -0400)]
TTpac: show page range in results paging display

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTTPac: change default any-format to 'All Formats'
Bill Erickson [Mon, 15 Aug 2011 15:28:19 +0000 (11:28 -0400)]
TTPac: change default any-format to 'All Formats'

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTTpac: option to override no-choice label in coded value selector
Bill Erickson [Mon, 15 Aug 2011 15:28:01 +0000 (11:28 -0400)]
TTpac: option to override no-choice label in coded value selector

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoTTpac: Chilifresh reviews panel occupies the width of the table
Bill Erickson [Mon, 15 Aug 2011 15:18:33 +0000 (11:18 -0400)]
TTpac: Chilifresh reviews panel occupies the width of the table

Signed-off-by: Bill Erickson <berick@esilibrary.com>
13 years agoStamped upgrade script for "lp 823496: do not fail to index personal names that have...
Mike Rylander [Sat, 13 Aug 2011 01:07:41 +0000 (21:07 -0400)]
Stamped upgrade script for "lp 823496: do not fail to index personal names that have relators"

Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agolp 823496: don't fail to index personal names that have relators
Galen Charlton [Tue, 9 Aug 2011 19:30:56 +0000 (15:30 -0400)]
lp 823496: don't fail to index personal names that have relators

The default definition for the author|other index inadvertantly
excluded names from 600, 700, 720, and 800 fields that have
relator values ($e) or codes ($4).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
13 years agoVandelay: capture one match per catalog record
Bill Erickson [Fri, 12 Aug 2011 21:03:11 +0000 (17:03 -0400)]
Vandelay: capture one match per catalog record

When searching for matches to existing catalog records
(biblio.record_entry's), Vandelay can in some cases result in multiple
like matches for the same record (with the same match score).  This
trims it down to 1 match per record.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>