Dan Scott [Fri, 24 Jun 2011 13:59:07 +0000 (09:59 -0400)]
Improve handling of OpenLibrary content in various browsers
Firefox and Internet Explorer would display multiple links in a most
disturbing fashion; the event model seems to be different than on
Chrome, as the same link was being appended to a record that had an OL
link for each record in the result list.
Also, teach the search results to proxy OL "Borrow" links.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 24 Jun 2011 13:46:56 +0000 (09:46 -0400)]
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read
Jason Stephenson [Wed, 22 Jun 2011 14:48:58 +0000 (10:48 -0400)]
Check if hold is really available in Trigger::Validator.
Add checks for shelf time and no fulfillment time in
HoldIsAvailable in OpenILS::Application::Trigger::Validator.
We've had some issues with poorly migrated data and people
messing with holds that causes the original logic to trigger
for unfilled holds. Plus, the extra precaution of checking
more precise conditions of an actually filled hold can't hurt,
can it?
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Wed, 22 Jun 2011 14:43:02 +0000 (10:43 -0400)]
Make bucket content retrieval authoritative
LP#492036, we neeed all bucket methods to be authoritative. Some already were, this finishes the job.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Michael Peters [Wed, 22 Jun 2011 14:14:55 +0000 (10:14 -0400)]
LP#790639: Provide actual text, rather than id values in patron search results for various columns
Cleaned up some tabs versus spaces and a needless trailing comma from original patch. Not porting to master, hoping to use collab/phasefx/fm_columns instead.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Dan Wells [Tue, 21 Jun 2011 21:09:58 +0000 (17:09 -0400)]
Further clean-up of Serials interfaces
When trying to come up with good tests, found a few bugs (imagine!).
Some have been nagging for a while now.
1) For 'MFHDDrawn' event, make sure it runs if deleting the last
serials data of any kind for that record (to unpopulate the menus
properly)
2) Make sure global mfhd member (g.mfhd) is cleared in the same case
(i.e. deleting the last serials data for that record)
3) Add a string to better indicate when no MFHD records are available
for 'Legacy Record Entry' drop-down
4) Convert submitted empty drop-down values to 'null' as needed in
distribution editor
5) Mark subscription 'start date' as a required field
6) Make serial virtual records better handle deleted 'legacy record
entries' attached to distributions, and also expose non-deleted
record entries even if in 'use_sdist_only' summary mode
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Dan Wells [Fri, 17 Jun 2011 19:26:39 +0000 (15:26 -0400)]
Better coordination of MFHD/SRE adding/deleting
Adding or deleting MFHD records from the XUL menus requires
coordinating the OPAC display, the XUL menus, and the Serial
Control distribution editors. The previous code frequently
required some non-obvious manual refreshing to make it work.
This commit keeps them in sync using custom events instead.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Dan Wells [Tue, 21 Jun 2011 15:44:10 +0000 (11:44 -0400)]
MFHD compressed holdings short-circuit logic
If you attempt to get compressed (or uncompressed) holdings from
a MFHD record with only a caption, the code should short-circuit
and return an empty list.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Tue, 21 Jun 2011 15:57:39 +0000 (11:57 -0400)]
LP#783590 fix patron alert message highlighting
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Mike Rylander [Tue, 21 Jun 2011 15:41:22 +0000 (11:41 -0400)]
Add "tnf" index for faster title sorting (pre-SVF)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Fri, 17 Jun 2011 16:30:12 +0000 (12:30 -0400)]
Set AC timeout value to 3 seconds and describe tradeoffs
As discussed on the Evergreen Development mailing list, the higher the
AC timeout value, the greater the risk of a denial of service. 30 is
therefore too high to be comfortable as a default setting, so we're
dropping it down to 3 as a compromise between the original value of 1
(which resulted in a number of request timing out where added content
was actually available) and the much-less-safe 30.
In addition, we document inline the risk/reward of different values and
provide some justification for the default value that we chose, so that
Evergreen system administrators will have guidance when tweaking this
setting.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Mon, 20 Jun 2011 15:16:21 +0000 (11:16 -0400)]
DROP biblio.reingest_uris() after use
We will hopefully only need to reingest URIs in bulk once, and can
therefore DROP the biblio.reingest_uris() function after it has been
successfully invoked.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Dan Scott [Mon, 20 Jun 2011 14:56:44 +0000 (10:56 -0400)]
Protect URI reingest from failure due to malformed XML
In an ideal world, there would be no malformed XML. But our world is the
real world of libraries, and while the well_formed_xml() protects
against malformed XML in Evergreen 2.0 systems, in some cases bad XML
has been able to find its way into Evergreen systems in the past.
A single biblio.record_entry row containing malformed XML in the marc
column will prevent the call to reingest URIs from succeeding. By
limiting the set of records to those with well-formed XML, we can
increase the chance of the URI reingest succeeding at the cost of more
processing time.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Mike Rylander [Mon, 20 Jun 2011 14:37:32 +0000 (10:37 -0400)]
Incorporate explode_array -> unnest change and fix for located URIs into upgrade script
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 20 Jun 2011 14:24:33 +0000 (10:24 -0400)]
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into collab/gmcharlt/rel_2_0_7_db_update
Bill Erickson [Thu, 16 Jun 2011 15:50:16 +0000 (11:50 -0400)]
Repaired exchange rate PO activation bug
Code was using the wrong hash key to read data from cstore request,
resulting in a NULL debit amount when activating a PO with a different
provider => fund currencies. This resulted in POs that could not be
activated.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Thu, 16 Jun 2011 14:16:39 +0000 (10:16 -0400)]
Move the user/dbs/lp797304_lp797307 upgrade script into place with a number
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 16 Jun 2011 13:50:25 +0000 (09:50 -0400)]
Merging branch user/dbs/lp797304_lp797307
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Cherry picking the following:
commit
7be2a32620587af27de4316e42a308e913e9314c
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 22:35:26 2011 -0400
Add a stored procedure to reingest problematic URIs
Assuming that href = label in asset.uri is a red enough flag for the
problem in LP 797307 where the perfectly good label was being thrown
away, reingest the unique set of records connected with such asset.uri
rows.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
commit
39fe0c4a8a3074ff4c1e427ad9f00a0760bac260
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 21:54:51 2011 -0400
Add unwrapped upgrade script for biblio.extract_located_uris
See XXXX.biblio.extract_located_uris.sql for the upgrade script, waiting
to be signed off and committed.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.biblio.extract_located_uris.sql
commit
7e6d2bfd7e9a5cbe57e4aacdf0b4b015a566883d
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 21:34:15 2011 -0400
Avoid duplicate row issues in biblio.extract_located_uris
As there is currently no unique constraint on the non-ID columns of
asset.uri, ensure that we only select a single ID from the tables until
we dedupe the tables. Use an ORDER BY to grab the matching row with the
lowest ID so we can clear out the rows with higher IDs.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
commit
e79a805299ec734a29ee5bfa77dc74bc1fd208cd
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 14:02:49 2011 -0400
Fix LP 797304 and 797307 - asset.uri parsing bugs
Per 797304: one would expect asset.uri.label to be populated with the
value of 856 $y, however, it was getting populated with 856 $u - perhaps
as a result of the ordering of array entries in XPATH() not matching the
XPath expression. Instead of including 856 $u in the XPath expression
for uri_label, just assign its value to uri_label if uri_label is
otherwise NULL.
Per 797307: biblio.extract_located_uris() tries to reuse an existing
active asset.uri entry rather than create a new row; however, it does
not handle the case where there is no public note aka "use restriction"
and will end up creating a duplicate row every time the record is
reingested. Teach it to handle NULL values properly.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
(cherry picked from commit
da70b778268afff19c3dd4f2e9e4c9e85cfeb7e3)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
(cherry picked from commit
6019d97c2a0604675cd0c00ec747f248f3f79849)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Etheridge [Wed, 15 Jun 2011 07:13:50 +0000 (03:13 -0400)]
lp797321: Disable the Apply Payment button during payment processing to mitigate chance of duplicate payments.
I can't actually reproduce the creation of duplicate payments locally with
trunk/2.x, but there are reports of it, and this doesn't seem to hurt. Not
a complete solution, but better than before
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Dan Scott [Wed, 15 Jun 2011 03:12:28 +0000 (23:12 -0400)]
Get the "Borrow similar" link correct
A copy/paste error led to a link that didn't go anywhere in the "Borrow
similar online" case.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Lebbeous Fogle-Weekley [Mon, 13 Jun 2011 20:40:07 +0000 (16:40 -0400)]
Fix a serial batch receive problem reported by Sally Fortin
That prevents receiving items when not using units in some cases.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Mon, 13 Jun 2011 19:34:03 +0000 (15:34 -0400)]
Set a more generous AC timeout value
A timeout value of 1 second is a bit too tight for many added content
providers; set the default to 30 seconds to avoid too many artificial
timeouts.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Wells [Tue, 7 Jun 2011 16:06:57 +0000 (12:06 -0400)]
Support for required fields in Serial Control editors
Adds a basic check for any fields marked as 'required', and alerts and
prevents submitting if they are blank.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Tue, 31 May 2011 17:55:29 +0000 (13:55 -0400)]
Remove all references to Cookie(s).js and Cookies.js
Dojo toolkit is the new Cookie manager, so any lingering
references to Cookie.js (a typo in any case) are no longer
valid, and we no longer need to ship Cookies.js with
Evergreen.
Cookie.js typo was reported by Steven Chan in LP 790429
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Tue, 7 Jun 2011 14:16:25 +0000 (10:16 -0400)]
Use the new status.opac_visible attribute in search summary
Until we exposed the OPAC visibility of the status element as set in
config.copy_status, We previously had to hardcode the logic for whether
a given copy should be displayed based on its status. Now we can simply
use the status.opac_visible attribute to determine visibility.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 7 Jun 2011 14:09:57 +0000 (10:09 -0400)]
Add opac_visible attribute to copy and serial unit statuses
config.copy_status defines an opac_visible column, but that attribute
was not being exposed in the holdings XML, so code that displayed copies
and serial units based on the holdings XML had to hardcode the display
based on the status ID or name instead of using the configured setting.
To simplify display logic, teach holdings XML about the opac_visible
column and expose its value in the status element as a new opac_visible
attribute.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 6 Jun 2011 17:38:17 +0000 (13:38 -0400)]
Make copy status visibility match default config.copy_status settings
Previous version of this patch had hardcoded copy status settings to
0, 7, 12 to match the "Available" settings, rather than the OPAC
visibility settings available from config.copy_status for each status.
Until config.copy_status.opac_visible translates into an opac_visible
attribute on the status element in the holdings XML, this is probably
the best we can do.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 31 May 2011 02:49:00 +0000 (22:49 -0400)]
Plug the many OPAC visibility holes in search result item display
Check volume and circ_lib and copy status OPAC visibility (and
deleted status in the case of volumes) in addition to the existing
copy and copy-location checks.
Worst hack is hard-coded copy status IDs of 0, 7, 12 - but this is
currently used throughout the code, so one more can't hurt that much
(OWWW).
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Mon, 13 Jun 2011 00:23:47 +0000 (20:23 -0400)]
Remove 2.1 bits that infiltrated 2.0 database upgrades
Core schema was fine, but the cherry-picked upgrade script didn't show
any conflicts (naturally) so some pieces of the 2.1 schema that don't
exist in 2.0 made their way into the 0554 upgrade script.
Thanks to Ben Shum for catching this.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 11 Jun 2011 11:05:53 +0000 (07:05 -0400)]
Update upgrade files that had conflicting numbers
0549 and 0550 were taken by other commits over time.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 11 Jun 2011 11:15:55 +0000 (07:15 -0400)]
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/unnest_2_0
Galen Charlton [Fri, 10 Jun 2011 21:34:51 +0000 (17:34 -0400)]
start 2.0.6 to 2.0.7 DB upgrade script
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Galen Charlton [Fri, 10 Jun 2011 20:58:03 +0000 (16:58 -0400)]
lp#795737: improve staff bib search copy visibility check
An errant join in query used to see if a bib is visible
in the search OU scope for a bib search initiated from the staff
client signficantly degrade the speed of such searches.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Fri, 10 Jun 2011 14:42:51 +0000 (10:42 -0400)]
missing string for MFHD deletion
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Thomas Berezansky [Fri, 10 Jun 2011 13:22:56 +0000 (09:22 -0400)]
Mark invalid home ous as such in patron editor
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Tue, 7 Jun 2011 17:52:22 +0000 (13:52 -0400)]
Use native unnest() db function instead of explode_array()
Per LP 789747, the custom explode_array() database function
was found to generate significantly slower results for searches than
using the native (and equivalent) unnest() array function. Given that
unnest() has been part of PostgreSQL since 8.4 and Evergreen 2.0
requires a minimum of PostgreSQL 8.4, this patch removes the definition
of the explode_array() functions and replaces its usage with unnest().
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Lebbeous Fogle-Weekley [Fri, 3 Jun 2011 19:17:48 +0000 (15:17 -0400)]
Prevent future dates of birth in patron editor
The patron editor form allowed staff to enter a date of birth that takes
place in the future. While it is theoretically conceivable (hah) that
a library might register patrons that have yet to be born, it is
unlikely enough that we will not even assign this behavior to an
org-unit setting, but we will take the bold move of using a regular
expression to prevent a future dates of birth at all.
Note that if a library system travels into the past, this will cause all
sorts of problems in the patron editor interface (not to mention
overdues). Please do not mix Evergreen and time travel.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Thu, 2 Jun 2011 19:44:36 +0000 (15:44 -0400)]
Fix false MFHD editing cues (LP #791974)
The in-DB serial holdings use the same general display code as
the MFHD records, but were falsely triggering MFHD administration
widgets when in fact no MFHD record exists. These holdings were
already being marked, so this fix honors that mark.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Thu, 2 Jun 2011 14:17:07 +0000 (10:17 -0400)]
Tweak MFHD scoping
Three changes:
1) Add a closure for 'entryNum' value (currently used for some display
placement and menu-entry correlation)
2) Remove depth-climb to simplify code and better approximate copy scoping
3) Move 'here' assignment out of the foreach
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Fri, 27 May 2011 17:51:59 +0000 (13:51 -0400)]
Fix rendering of MFHD records when ownership is out of scope
Dojo would die with a null reference error when an MFHD record
was retrieved that was outside of the current OU search scope.
For example, if a given bib record had one linked MFHD record
for BR1, and one linked MFHD record for BR4, the details page
would choke trying to draw the MFHD holdings in a scope that
only included BR1 and end up drawing nothing. Ungood.
Moving the ownership check and invoking _holdingsDrawMFHD()
only after ensuring that the record is within our scope resolves
the problem.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 6 Jun 2011 16:11:58 +0000 (12:11 -0400)]
LP 791546: advanced search ISBN/ISSN in .staff mode
In 1.6, advanced search ISBN/ISSN searches always operated in .staff
mode, returning results whether the results should have been visible to
the user or not. This confused patrons who saw records to which they had
no access.
In 2.0, this behaviour changed so that advanced search ISBN/ISSN
searches never operated in .staff mode. This confused staff who were
used to retrieving records via the ISBN/ISSN search when they wanted to
add holdings for their own library to the records.
The pattern for addressing this problem and satisfying both use cases is
the same - use the multiclass.query.staff method if we invoke the ISBN
or ISSN searches with the .staff method name.
One could easily refactor many of the search method bodies in this
module to use the exact same logic, keying off the method name to
identify the identifier field and the .staff portion of the method name
to determine whether to invoke .staff mode or not. For now we just
address the ISBN and ISSN entry points.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Bill Erickson [Fri, 3 Jun 2011 20:35:25 +0000 (16:35 -0400)]
PO activation date display improvement
Use the smarter Util.js date parsing code to prevent small time offsets
in PO activation date display.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Thu, 2 Jun 2011 18:40:57 +0000 (14:40 -0400)]
Teach result_common.js to OpenLibrary requests
Now that the proxied OpenLibrary requests are working, teach
result_common.js to use them and get an advantage from being an
access-rights-authenticated IP address (if applicable).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 2 Jun 2011 17:03:22 +0000 (13:03 -0400)]
Support proxying bulk Read API requests for access rights
Using IP-based access right determination runs into problems with a pure
JavaScript API, as users may be accessing the API from any location in
the world. Proxying the requests via the library system server ensures
that the access rights for users of those libraries are properly
displayed.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 2 Jun 2011 16:25:33 +0000 (12:25 -0400)]
Return transparent images if no cover art is found
For now the URL is hardcoded; later on we'll refactor AddedContent.pm to
give us access to more information about our Apache environment to
default to something much, much smarter.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 2 Jun 2011 15:57:04 +0000 (11:57 -0400)]
Working TOC HTML and cover images from OpenLibrary Read API
TOCs are now part of the "data" response in the Read API.
Covers are accessed with the "cover" key in the "items" objects.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 2 Jun 2011 13:56:05 +0000 (09:56 -0400)]
Get OpenLibrary covers from any related items
Cover requests for exact matches sometimes fail to produce results, but
covers from similar items (other editions of the same work) are often
available. Take that!
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 2 Jun 2011 13:46:24 +0000 (09:46 -0400)]
Begin cutting AddedContent over to the OpenLibrary Read API
Use the all-in-one Read API request to get results; this should
cut our requests in half and improve our caching results.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
dbs [Sun, 1 May 2011 00:28:23 +0000 (00:28 +0000)]
Add excerpt AC and avoid rate-limiting for OpenLibrary content
OpenLibrary added rate-limiting (100 cover requests per 5 minutes)
for cover images requested by ISBN; using the OpenLibrary book
API to pull the list of direct cover URLs avoids the rate limit.
Also, add excerpt added content calls for OpenLibrary.
Signed-off-by: Dan Scott <gitorious@coffeecode.net>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20354
dcc99617-32d9-48b4-a31d-
7c20da2025e4
Signed-off-by: Dan Scott <dan@coffeecode.net>
dbs [Wed, 27 Apr 2011 16:18:54 +0000 (16:18 +0000)]
Turn ebooks AC from OpenLibrary into usable HTML
Add <a> elements to turn URLs into links, and use the upper case
ebook format as the content of the link. "Read online" is the one
i18n-unfriendly exception, but this is a good start.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20346
dcc99617-32d9-48b4-a31d-
7c20da2025e4
Signed-off-by: Dan Scott <dan@coffeecode.net>
dbs [Wed, 27 Apr 2011 15:54:48 +0000 (15:54 +0000)]
Teach OpenLibrary.pm how to extract ebook links from OpenLibrary results
If the Internet Archive has an available ebook, then OpenLibrary will
provide links to it in various formats. For now, we return the results
as a plain set of <div> elements with class attributes denoting what
kind of ebook was returned; i18n will have to take care of providing
an actual label. Oh, and I guess we want to turn these into actual
<a> links...
Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20344
dcc99617-32d9-48b4-a31d-
7c20da2025e4
Signed-off-by: Dan Scott <dan@coffeecode.net>
dbs [Mon, 25 Apr 2011 18:19:12 +0000 (18:19 +0000)]
Use layout.css to control table of contents from OpenLibrary added content
Rather than forcing people to edit OpenLibrary.pm to modify the inline CSS,
use a class and rely on CSS from layout.css to make it easier to skin.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Thu, 2 Jun 2011 05:42:49 +0000 (01:42 -0400)]
Don't make OpenLibrary requests without an ID
It is rather silly to make requests if you have not pulled any IDs out
of the records to pass along to OpenLibrary, so do not do that. Also
refactor and add a bit more defensiveness.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Thu, 2 Jun 2011 02:18:42 +0000 (22:18 -0400)]
Add some style to the OpenLibrary read links
George Oates provided an OpenLibrary GIF to use for the
links, and we can drop the links right into the block of
white space between copy counts and bibliographic info.
Also a bit of refactoring to reduce code duplication.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Thu, 2 Jun 2011 01:43:40 +0000 (21:43 -0400)]
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read
Dan Scott [Wed, 1 Jun 2011 22:06:13 +0000 (18:06 -0400)]
Whitespace cleanup in aisle 3 (O:A:Reporter)
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Wed, 1 Jun 2011 12:52:57 +0000 (08:52 -0400)]
LP#740466 Sort report folders by name
Add order_by to Reporter.pm to sort report folders by name
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Wed, 1 Jun 2011 18:33:59 +0000 (14:33 -0400)]
Serial holdings display consistency fix
When holdings are sourced from both MFHD and the DB, display may be
inconsistent due to a hard-coded ', ' in Serial.pm. This patch works around
the problem by storing generated_coverage as a JSON array instead of a string,
leaving display formatting to the OPAC.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Wed, 1 Jun 2011 05:58:27 +0000 (01:58 -0400)]
Implement OpenLibrary ebook availability via Ajax
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Wed, 1 Jun 2011 02:22:32 +0000 (22:22 -0400)]
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read
Michael Peters [Tue, 31 May 2011 12:44:49 +0000 (08:44 -0400)]
LP#739444 Incrementing opac.dtd copyright date
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 28 May 2011 04:00:47 +0000 (00:00 -0400)]
Duh. == not = for an equality test
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 28 May 2011 03:55:38 +0000 (23:55 -0400)]
integrate the OpenLibrary Read API into search results
Still early days, but works based on the sample Read API
output provided by Mike for a single ISBN search.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Jason Etheridge [Fri, 27 May 2011 17:02:14 +0000 (13:02 -0400)]
indicate what date format to use for offline patron registration
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Fri, 27 May 2011 15:39:53 +0000 (11:39 -0400)]
Fix Hold Capture checkin mode
oils_persist was trumping hardcoded values.
Also, change how checked is set/unset for reliability.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Mike Rylander [Thu, 26 May 2011 20:03:39 +0000 (16:03 -0400)]
Patch suggested by Jason Boyer for LP#788601
The <script> tag for the chrome frame message has a misplaced semicolon,
which causes an odd looking display issue in Internet Explorer. I
realize that ideally very few people will be using IE, but even if
they're not interested in a quality browsing experience we should
probably put our best face forward.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
(cherry picked from commit
bbc874ddb42ac05130ccfad92fc55ccebd6af882)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Wells [Thu, 26 May 2011 15:19:40 +0000 (11:19 -0400)]
Distinguish between 'Show Groups' checkboxes in Serial Control
Two different checkboxes ended up with the same ID, which, as one might
expect, kinda worked and kinda didn't.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Thu, 26 May 2011 14:53:42 +0000 (10:53 -0400)]
Checking for 'twisty' leads to false negatives in Serial Control
Since a tree can be opened with a double-click, we can't rely on 'twisty'
being set to load the child data.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Jason Etheridge [Wed, 25 May 2011 20:56:24 +0000 (16:56 -0400)]
missed this way back when. fix multiple event override handling (for ilsevent lacking events), re: lp#757634. Also add some missing typeof's
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Dan Scott [Wed, 25 May 2011 15:38:11 +0000 (11:38 -0400)]
Fix authority linking script typo
Problem reported by Ditty Mulder <dmu@iisg.nl>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Wed, 25 May 2011 13:29:13 +0000 (09:29 -0400)]
upgrade_deps_block_check() is not in the branches at this point
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Wed, 25 May 2011 03:20:40 +0000 (23:20 -0400)]
Use the right upgrade log format for 2.0 upgrade
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Wed, 25 May 2011 01:56:13 +0000 (21:56 -0400)]
Trivial line-wrapping patch for call number class defaults
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Tue, 24 May 2011 14:53:09 +0000 (10:53 -0400)]
Make label_class on any new call numbers default to org_unit setting
Evergreen 2.0 added a label_class column to the call number table with
one major purpose being the generation of correct sort keys. You can
also specify a default label class as an org unit setting. However:
1) There are no interface elements for setting the label class of an
individual call number.
2) The default setting from the actor.org_unit_setting
'cat.default_classification_scheme' value, if set, is not consulted
(that is, not set in the call number table) when new call numbers are
created.
These two facts together greatly reduce the utility of this very
valuable feature, as all new call numbers end up in the 'Generic' class.
While #1 has been addressed in 2.1+, there is still work to be done in
setting this class on import. Also, which interface parts (if any) make
it back to 2.0 is subject to debate.
This commit addresses #2.
See lp #787150.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Tue, 24 May 2011 20:55:47 +0000 (16:55 -0400)]
Bring serial.unit in line with asset.copy
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Jason Etheridge [Tue, 24 May 2011 18:55:57 +0000 (14:55 -0400)]
remove restriction on resetting pw to random number when Use Phone Password setting is active. uEditMakeRandomPw will still get called for new users, but should get overwritten once a phone number is entered
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Galen Charlton [Tue, 17 May 2011 04:40:02 +0000 (00:40 -0400)]
stop hold permit check from crashing if age protection in effect
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Mike Rylander [Mon, 23 May 2011 15:14:02 +0000 (11:14 -0400)]
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0
Mike Rylander [Mon, 23 May 2011 15:07:20 +0000 (11:07 -0400)]
Revert "Wrap proximity refreshing in a transaction to avoid timespans where there is no such information"
This reverts commit
85b522e155283010f8e58f51c78afc119ab3d813.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Mon, 23 May 2011 14:16:16 +0000 (10:16 -0400)]
Update Lenny prereqs for MARC::Record 2.0.1+
2.0 requires MARC::Record 2.0.1+, and the packaged version of
MARC::Record is just 2.0.0. This causes mysterious failures of
various open-ils.search.biblio.* methods - so teach the prereq
installer to get a new enough version of MARC::Record on Lenny.
Aside: The juggling of prereqs in a single Makefile for multiple distros
is starting to get extremely complex, perhaps it's time to split them
out to a single Makefile per distro?
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Mon, 23 May 2011 13:38:22 +0000 (09:38 -0400)]
Apply Apache file expiration to the current official Javascript content type
At least on Ubuntu 10.04, Javascript files are generally delivered
with a Content-Type header of 'application/javascript', not
'application/x-javascript'. This change applies the much shorter
18 hour expiration to the affected files, rather than allowing them
to default to 1 month.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Lebbeous Fogle-Weekley [Fri, 20 May 2011 19:47:04 +0000 (15:47 -0400)]
Fix bad seed data in an A/T template
The action_trigger event def template for printing acq invoices was
syntatically broken. The collapse filter isn't important per se, but
it balances the extra [% END %] at the bottom of the template, and it
was there originally, and I see no reason not to put it back.
Incidentally, maybe the database upgrade script in the commit will be
the first in master to successfully use the new
evergreen.upgrade_deps_block_check() function ?
Reported by Sally Fortin.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Fri, 20 May 2011 14:17:05 +0000 (10:17 -0400)]
Fix a problem with open-ils.circ.holds.retrieve_all_from_title
Anoop Atre spotted this bug that's triggered by selecting "View Holds"
from "Actions for Selected Record" in the catalog seen through the staff
client.
Said method would error out like this:
[2011-05-20 10:04:03] open-ils.circ [ERR
:31866:CStoreEditor.pm:109:
13058333633194115] editor[0|1] request error
open-ils.cstore.direct.serial.issuance.id_list.atomic :
{"subscription":[]} : Exception:
OpenSRF::DomainObject::oilsMethodException 2011-05-20T10:04:03
OpenILS::Utils::CStoreEditor
/openils/lib/perl5/OpenILS/Utils/CStoreEditor.pm:412 <500> Severe query
error -- see error log for more details
because when trying to gather issuance-type holds, it didn't properly test
whether there actually were any subscriptions and issuances related to
the bib record in question.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Galen Charlton [Fri, 20 May 2011 01:28:50 +0000 (21:28 -0400)]
add missing upgrade step to create staging schema
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Lebbeous Fogle-Weekley [Wed, 18 May 2011 21:26:58 +0000 (17:26 -0400)]
Add permission checking for updating and deleting volumes.
This addresses LP #784062 reported by Ben Shum, and I think others?
Creating volumes was already covered. The ability to delete volumes
without permission would be less often an issue in practice since you
would need permission to delete the volume's copies before you could
delete the volume itself.
Anyway, this should square things.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Tue, 17 May 2011 04:29:47 +0000 (00:29 -0400)]
LP#783486: Improve authority lookup performance
Testing showed that the two indexes added herein improve
authority lookup performance radically; on a 16 GB RAM
database server with 1.1M records, lookup times decreased
from 5500 ms to 0.223 ms. Recommended, would EXPLAIN ANALYZE
again.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Mike Rylander [Mon, 16 May 2011 22:17:30 +0000 (18:17 -0400)]
Ignore "deleted" authority records when using the tag-validation method
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Wells [Mon, 16 May 2011 19:23:10 +0000 (15:23 -0400)]
Borrow on_or_after() from MFHD/Caption.pm in MFHD/Date.pm
Signed-off-by: Dan Wells <dbw2@calvin.edu>
dbwells [Fri, 13 May 2011 16:06:04 +0000 (16:06 +0000)]
A bevy of MFHD bug fixes (and test cases)
1) Remove hard-coded 'gap' text from format_part()
2) Honor $ypm## for chron_to_date() for annuals
3) Removed overly simple check on $w as digit
4) Allow for combined chronologies other than 2nd level
5) Make calendar changes trump $u counts
6) Honor issue restarts at calendar changes
7) Rudimentary support of $u counts for non-restarting issue numbering
8) Special interpretation of $yps for early winters (i.e. winter is the first season of the calendar year)
9) Teach chron_to_date() about early winters
The last two points deserve some special attention. A large number of journals consider 'Winter' to be the first season of the year, so Winter 2011 means (roughly) January 2011, not December 2011. However, there is no explicit way to indicate this in the standard, and also the code relies in many ways on the fact that 24 (chronology code for winter) is greater than 21 (code for spring). To work around this, we are interpreting a certain ambiguous pattern in a particular way. Specifically, if you set $w to a digit, then set $y to 'ps24,21,22,23' (or some variation with '24' as the first value), you will get this winter-first behavior. Also, the season is treated internally as '20' then converted to '24' when processing is completed.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20472
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 12 May 2011 19:52:47 +0000 (19:52 +0000)]
Patch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES circs
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20463
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 12 May 2011 19:23:52 +0000 (19:23 +0000)]
Wrap proximity refreshing in a transaction to avoid timespans where there is no such information
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20457
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 12 May 2011 15:19:04 +0000 (15:19 +0000)]
Address LP#779975; Status of Available (0) not honored because 0==false -- use ternary op with defined() instead
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20454
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbwells [Thu, 12 May 2011 14:24:33 +0000 (14:24 +0000)]
Add missing permission checks to Serial.pm
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20451
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 5 May 2011 18:41:20 +0000 (18:41 +0000)]
Use valid JSON in Dojo i18n for Searcher.js
Dojo i18n processing scripts require valid JSON (quoted keys in hashes),
even though Dojo itself is more relaxed and accepts unquoted keys. So,
do the i18n dance here.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20439
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 5 May 2011 18:07:27 +0000 (18:07 +0000)]
adding upgrade script
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20433
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 4 May 2011 18:01:27 +0000 (18:01 +0000)]
Patch from James Fournie improving due-date-editor usability by auto-checking the check box; LP#
70956965
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20422
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 4 May 2011 17:50:39 +0000 (17:50 +0000)]
Patch from Jason Boyer swapping the order of report and template name in emailed notices; LP#777273
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20419
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbwells [Wed, 4 May 2011 13:50:22 +0000 (13:50 +0000)]
Fix some Serial Control text boxes which were too small to use effectively.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20416
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 4 May 2011 05:18:18 +0000 (05:18 +0000)]
Collaboration patch from Joseph Lewis and Michael Peters addressing LP#758007, missing patron merge OU settings.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20409
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 4 May 2011 04:59:36 +0000 (04:59 +0000)]
Addressing LP#732681 at upgrade time -- make authority records useful for controlling bibs
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20403
dcc99617-32d9-48b4-a31d-
7c20da2025e4