9 years agoonly use the label to initialize call number browse
Galen Charlton [Tue, 17 May 2011 22:06:38 +0000 (18:06 -0400)]
only use the label to initialize call number browse

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoadd a bit of context to upgrade SQL hints
Galen Charlton [Tue, 17 May 2011 19:09:51 +0000 (15:09 -0400)]
add a bit of context to upgrade SQL hints

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoImprovements to make-db-patch.pl
Thomas Berezansky [Tue, 17 May 2011 17:50:44 +0000 (13:50 -0400)]
Improvements to make-db-patch.pl

Grab all changes to base sql files into the upgrade script
Based on HEAD (uncommitted changes) or --from=refspec

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoConvert/move SQL script for Lazy Circ
Mike Rylander [Tue, 17 May 2011 17:44:35 +0000 (13:44 -0400)]
Convert/move SQL script for Lazy Circ

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoLazy Circ (AKA partial barcode lookup)
Thomas Berezansky [Fri, 13 May 2011 19:43:52 +0000 (15:43 -0400)]
Lazy Circ (AKA partial barcode lookup)

Database tables/access functions for prefix/suffix info

    Table: config.barcode_completion

    Function: evergreen.get_barcodes
        Takes org unit, context, and input barcode
        Context is a string and can contain:
            asset - asset.copy barcodes
            serial - serial.unit barcodes
            actor - actor.usr (via actor.card) barcodes
            booking - booking.resource barcodes
        Special case: asset and serial both in context
            Returns non-serial asset entries as asset
            Returns serial entries as serial
    Type for function return: evergreen.barcode_set

    With editing interface: Admin->Local Admin->Barcode Completion

    OpenSRF Call: open-ils.actor.get_barcodes
        Basically a passthrough to the database function
        Checks for permissions:
            STAFF_LOGIN - To do anything
            VIEW_USER - At home_ou of the user owning the returned
                        barcode when in actor context

Add get_barcode to menu.js and to xulG in a number of places
    Takes a window handle, a context, and an input barcode
    Passes the current OU, the context, and the input barcode to the db
    If multiple results come back it pops up a dialog
    Returns boolean false on no results
    Returns "user_false" on dialog cancel
    Returns an object with type, id, barcode on success
    If dialog was brought up, returns data used to populate button

Add option for looking up actors at checkout
    Org unit setting: Load patron from Checkout. Default: Don't.

Call sites for get_barcode:
    Lookup Patron By Barcode (actor only)
    OPAC's Staff Client Place Hold (actor only)
    Checkout (asset only by default, with actor if above option set)
    Checkin (asset only)
    Item Status (asset only)

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoLP#783486: Improve authority lookup performance
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

Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agostop hold permit check from crashing if age protection in effect
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>
9 years agoIgnore "deleted" authority records when using the tag-validation method
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>
9 years agoBorrow on_or_after() from MFHD/Caption.pm in MFHD/Date.pm
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>
9 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Galen Charlton [Mon, 16 May 2011 17:29:32 +0000 (13:29 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

9 years agostandardize name of 2.0-2.1 upgrade script
Galen Charlton [Mon, 16 May 2011 17:29:10 +0000 (13:29 -0400)]
standardize name of 2.0-2.1 upgrade script

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agopersist partial changes to new copies in vol/copy editor has new copies are gathered.
Jason Etheridge [Mon, 16 May 2011 16:12:40 +0000 (12:12 -0400)]
persist partial changes to new copies in vol/copy editor has new copies are gathered.

In other words, you can do something like enter 5 in the "# of Copies" field, enter the first barcode (say b1), edit an attribute (say, set Circulate = No), and then enter a second barcode (b2).  Previously, the changes made to b1 would be lost as b2 was entered (or as other movement around the barcode entry textboxes happened) and both copies would get a Circulate = Yes, but now in this scenario, you would see 1 copy set to No and 1 copy set to Yes for the Circulate attribute.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agosimpler language, and the behavior of this action is configurable
Jason Etheridge [Mon, 16 May 2011 15:56:58 +0000 (11:56 -0400)]
simpler language, and the behavior of this action is configurable

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agofirst pass at 2.0 to 2.1 upgrade script
Galen Charlton [Mon, 16 May 2011 15:33:42 +0000 (11:33 -0400)]
first pass at 2.0 to 2.1 upgrade script

Tested so far on an upgrade from 2.0.1; goes up
to DB patch 0533.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agousability tweak
Jason Etheridge [Sun, 15 May 2011 20:35:05 +0000 (16:35 -0400)]
usability tweak

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agodefault the label class according to library setting during vol creation
Jason Etheridge [Sun, 15 May 2011 20:15:30 +0000 (16:15 -0400)]
default the label class according to library setting during vol creation

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoremove this comment, testing the repo & email
Jason Etheridge [Sun, 15 May 2011 20:02:32 +0000 (16:02 -0400)]
remove this comment, testing the repo & email

9 years agoNuke one more Trunk reference: windowssetup.nsi
Thomas Berezansky [Sat, 14 May 2011 22:22:01 +0000 (18:22 -0400)]
Nuke one more Trunk reference: windowssetup.nsi

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoMore SVN to Git rigging
Thomas Berezansky [Sat, 14 May 2011 19:57:27 +0000 (15:57 -0400)]
More SVN to Git rigging

Staff client Makefile can no longer build based on SVN.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoremove references to SVN now that we're using Git
Galen Charlton [Sat, 14 May 2011 20:19:36 +0000 (16:19 -0400)]
remove references to SVN now that we're using Git

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoTrivial whitespace change
Galen Charlton [Sat, 14 May 2011 19:39:03 +0000 (15:39 -0400)]
Trivial whitespace change

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoadd missing update script for change to circ age stored procedure
gmc [Fri, 13 May 2011 20:57:59 +0000 (20:57 +0000)]
add missing update script for change to circ age stored procedure

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20475 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Ben Ostrowsky (LP#782268) to simplify seed/example permission setup and...
miker [Fri, 13 May 2011 17:30:47 +0000 (17:30 +0000)]
Patch from Ben Ostrowsky (LP#782268) to simplify seed/example permission setup and move one step towards being able to rid ourselves of permission.perm_list.id

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20473 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoA bevy of MFHD bug fixes (and test cases)
dbwells [Fri, 13 May 2011 16:01:04 +0000 (16:01 +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/trunk@20470 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofix query in various copy count functions
gmc [Fri, 13 May 2011 15:41:10 +0000 (15:41 +0000)]
fix query in various copy count functions

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20468 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofor upgrade, let prefix and suffix in audit be null
gmc [Fri, 13 May 2011 13:25:27 +0000 (13:25 +0000)]
for upgrade, let prefix and suffix in audit be null

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20466 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoadd affix columns to acn auditor table
gmc [Fri, 13 May 2011 13:07:59 +0000 (13:07 +0000)]
add affix columns to acn auditor table

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20464 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES...
miker [Thu, 12 May 2011 19:50:55 +0000 (19:50 +0000)]
Patch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES circs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20461 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoWrap proximity refreshing in a transaction to avoid timespans where there is no such...
miker [Thu, 12 May 2011 19:22:42 +0000 (19:22 +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/trunk@20455 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAddress LP#779975; Status of Available (0) not honored because 0==false -- use ternar...
miker [Thu, 12 May 2011 15:17:50 +0000 (15:17 +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/trunk@20452 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAdd missing permission checks to Serial.pm
dbwells [Thu, 12 May 2011 14:23:30 +0000 (14:23 +0000)]
Add missing permission checks to Serial.pm

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20449 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoInvoice from LI seeds invoice data
erickson [Mon, 9 May 2011 18:27:42 +0000 (18:27 +0000)]
Invoice from LI seeds invoice data

    * When creating a new invoice from a lineitem, seed the invoice with
        provider data from the lineitem.
    * Make money textbox's a little larger to accommodate larger sums
        without scrolling
    * Truncate long titles in lineitem summary view

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20448 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoMisc updates to installer rigging
phasefx [Fri, 6 May 2011 19:41:00 +0000 (19:41 +0000)]
Misc updates to installer rigging

Fewer spurious errors (extras.nsi, MUI_TEXT)
More checks (makensis, unzip, branding)
Slightly improved Welcome screen

Author: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20446 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agobump xulrunner version
phasefx [Fri, 6 May 2011 03:17:08 +0000 (03:17 +0000)]
bump xulrunner version

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20443 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoUse valid JSON in Dojo i18n for Searcher.js
dbs [Thu, 5 May 2011 18:38:36 +0000 (18:38 +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/trunk@20437 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoFix typo introduced in r20425
senator [Thu, 5 May 2011 17:24:47 +0000 (17:24 +0000)]
Fix typo introduced in r20425

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20431 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Niles Ingalls to make patron phone number searching more matchy.
senator [Thu, 5 May 2011 16:40:08 +0000 (16:40 +0000)]
Patch from Niles Ingalls to make patron phone number searching more matchy.
With assistance from Mike Rylander on pointing out the needed indexes to keep
search fast, and from Mike Peters on arranging a last minute DCO :-)

Type numbers into a patron phone number field and get a match regardless of
the punctuation actually used in the database.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20429 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Thomas Berezansky to do the following:
senator [Thu, 5 May 2011 16:35:59 +0000 (16:35 +0000)]
Patch from Thomas Berezansky to do the following:
    Add more "click to copy" fields

    User's Name
    All three phone numbers

    Also fix issue where tooltip didn't clear when re-opening search form

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20427 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAdd a feature authored by Joscha Filius for the International Institue of
senator [Thu, 5 May 2011 15:42:00 +0000 (15:42 +0000)]
Add a feature authored by Joscha Filius for the International Institue of
Social History: a diacritical palette for the MARC editor!

Afelonne Doek of IISH wants the community to benefit from this code.  To try
it out, press control S in the marc editor (reguarly non-flat-text view).

You can insert the characters you see, and you can right click on entries in
your palette to customize.  Customizations /should/ persist through staff client
restart (untested by me so far).

This should make cataloging in multiple (Western-ish) languages at once easier.

Below I copy and paste some of Joscha's message to the list where he introduced
this code:

> *Bugs:*
> A known bug is that is you switch marc edit styles back and forth the
> listener trigger won't work anymore. Also for a far as I know there is at
> least another bug concerning layout which is as far as I know not the result
> of my doing.
> *Here comes a possibly nasty part*, to ensure that the diacriticals remain
> intact throughout the persist I've changed global_util.js to URL encode and
> URL decode all stored values. This might cause backwards incompatibility
> with values that are already stored for other purposes without encoding.
> This needs to be checked.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20425 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoRemove redundant plpgsql install step from README
dbs [Thu, 5 May 2011 04:39:44 +0000 (04:39 +0000)]
Remove redundant plpgsql install step from README

PostgreSQL 9.0 includes plpgsql by default, and running the
createlang plpgsql step throws an error that could concern
the installer. Drop the step from the README.

Signed-off-by: Dan Scott <dan@coffeecode.net>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20423 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from James Fournie improving due-date-editor usability by auto-checking the...
miker [Wed, 4 May 2011 18:00:49 +0000 (18:00 +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/trunk@20420 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Jason Boyer swapping the order of report and template name in emailed...
miker [Wed, 4 May 2011 17:47:20 +0000 (17:47 +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/trunk@20417 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agodebugging aid
phasefx [Wed, 4 May 2011 13:48:56 +0000 (13:48 +0000)]
debugging aid

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20414 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoinclude these so we can get proper line numbers when debugging
phasefx [Wed, 4 May 2011 13:48:51 +0000 (13:48 +0000)]
include these so we can get proper line numbers when debugging

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20413 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoFix some Serial Control text boxes which were too small to use effectively.
dbwells [Wed, 4 May 2011 13:48:20 +0000 (13:48 +0000)]
Fix some Serial Control text boxes which were too small to use effectively.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20412 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoOnly pass the label to the CN browse search API, that is all we care about for the key
miker [Wed, 4 May 2011 05:29:32 +0000 (05:29 +0000)]
Only pass the label to the CN browse search API, that is all we care about for the key

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20410 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoCollaboration patch from Joseph Lewis and Michael Peters addressing LP#758007, missin...
miker [Wed, 4 May 2011 05:13:02 +0000 (05:13 +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/trunk@20407 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoCollaboration patch from Joseph Lewis and Michael Peters addressing LP#758007, missin...
miker [Wed, 4 May 2011 05:12:10 +0000 (05:12 +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/trunk@20406 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAddressing LP#732681 at upgrade time -- make authority records useful for controlling...
miker [Wed, 4 May 2011 05:01:04 +0000 (05:01 +0000)]
Addressing LP#732681 at upgrade time -- make authority records useful for controlling bibs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20405 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoInitial fix from Michael Peters addressing small-screen UI issues: LP#767507
miker [Wed, 4 May 2011 04:54:09 +0000 (04:54 +0000)]
Initial fix from Michael Peters addressing small-screen UI issues: LP#767507

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20400 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoChange an ERROR to a DEBUG log message in mod_idlchunk
dbs [Wed, 4 May 2011 04:43:06 +0000 (04:43 +0000)]
Change an ERROR to a DEBUG log message in mod_idlchunk

Reported by James Fournie at Sitka, this message was logged
as an error when it is simply a debug message; we drop the
level accordingly so that it will not appear in the Apache
logs during the normal course of operations.

Signed-off-by: Dan Scott <dan@coffeecode.net>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20397 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Michael Peters to protect cut-in-line holds from staff without the appropr...
miker [Wed, 4 May 2011 04:40:16 +0000 (04:40 +0000)]
Patch from Michael Peters to protect cut-in-line holds from staff without the appropriate permission

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20394 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Ben Ostrowsky addressing button order: LP#754660
miker [Wed, 4 May 2011 04:31:06 +0000 (04:31 +0000)]
Patch from Ben Ostrowsky addressing button order: LP#754660

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20392 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPrevent uninitialized var warnings in OpenILS::WWW::SuperCat::unapi
dbs [Wed, 4 May 2011 03:46:27 +0000 (03:46 +0000)]
Prevent uninitialized var warnings in OpenILS::WWW::SuperCat::unapi

Given a tag URI like tag:localhost,2011:biblio-record_entry/1 with
no format, Evergreen was throwing uninitialized variable warnings
and attempting to invoke "open-ils.supercat..formats" due to the
unitialized $type variable, which resulted in an Apache error.

On the TT OPAC, this enables Zotero to successfully offer import
of all entries on the search results page. On the AjaxPAC, it seems
that Zotero parses the page before the unAPI hrefs have been supplied
by JavaScript.

Signed-off-by: Dan Scott <dan@coffeecode.net>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20390 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoFix typo in fm_IDL.xml
dbs [Tue, 3 May 2011 16:54:44 +0000 (16:54 +0000)]
Fix typo in fm_IDL.xml

"oils_persist" namespace was missing an "s" in one instance, preventing
autogen.sh from running.

Bug reported by Thomas Berezansky.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20388 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAvoid data loss by setting MARC::Charset->assume_unicode(1)
dbs [Tue, 3 May 2011 16:29:16 +0000 (16:29 +0000)]
Avoid data loss by setting MARC::Charset->assume_unicode(1)

When using MARC::File::XML, MARC::Charset is used to perform character
conversions; however, MARC::File::XML does not tell MARC::Charset that it is
handling Unicode data. If we do not tell MARC::Charset that it is handling
Unicode data, it can return an error which results in the loss of data
(typically a subfield containing one or more characters which MARC::Charset
does not have an equivalent mapping outside of Unicode).

This problem could be reproduced in authority_control_fields.pl with a
subfield like "von Hans-Christian Müơller" - when this subfield was encountered
without assume_unicode(1), a null string was returned for that subfield, and
if the record was written back to the database due to an authority match being
found in a different field, the only recourse was to restore the record from
auditor.biblio_record_entry_history. The same sort of problems could occur
for any other script or function that modifies the data being handed to it
using MARC::File::XML and BinaryEncoding => UTF8.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20385 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoFollowup patch to the first listed in https://bugs.launchpad.net/evergreen/+bug/745123
miker [Tue, 3 May 2011 15:03:59 +0000 (15:03 +0000)]
Followup patch to the first listed in https://bugs.launchpad.net/evergreen/+bug/745123

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20382 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Jason Stephenson ( LP#770261, https://bugs.launchpad.net/evergreen/+bug...
miker [Tue, 3 May 2011 14:55:37 +0000 (14:55 +0000)]
Patch from Jason Stephenson ( LP#770261, https://bugs.launchpad.net/evergreen/+bug/770261 ) adding support for bibliographic level inspection in the hold and circ matrix matchpoint tests.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20380 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAdd support for sre/distribution summary methods (including merge), advanced receivin...
dbwells [Mon, 2 May 2011 20:57:01 +0000 (20:57 +0000)]
Add support for sre/distribution summary methods (including merge), advanced receiving, and unit-less receiving in the serial control items tab

This commit includes three new minor features for the Serial Control interface.  First, you are now able to set the latent 'summary_method' field on distributions, with the most significant new setting being 'merge with sre'.  This setting effectively combines the sre marc with the generated holdings to form a single unified statement.  Second, the previous 'receive' functionality has been renamed to 'advanced receive', and 'receive' will now show items from an entire subscription, but not allow you to receive directly into a specific unit (you can still receive into new/auto units).  Third, a basic menu entry has been added for receving into 'no unit', allowing items to be received not forcing them to be unitized.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20378 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agodebian backports url changed. updated install docs in README to match
erickson [Mon, 2 May 2011 15:50:59 +0000 (15:50 +0000)]
debian backports url changed.  updated install docs in README to match

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20376 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoflesh stat_cat_entries in the call number tree method used by Holdings Maintenance...
phasefx [Mon, 2 May 2011 15:04:54 +0000 (15:04 +0000)]
flesh stat_cat_entries in the call number tree method used by Holdings Maintenance, since those copies get shoved into the copy editor and we want stat cat entries to show up there

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20374 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoFix bug and typo in stat cat editor
phasefx [Mon, 2 May 2011 14:05:56 +0000 (14:05 +0000)]
Fix bug and typo in stat cat editor

Specifically, disabling the ability to select a stat cat type on no permissions on current type.

If you don't have permissions on ASSET you could never get to ACTOR.

If you picked ACTOR without rights you couldn't get back to ASSET.

Also, re-enable the library selector and new buttons when you do change to one you can add for.

Author: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20371 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofix "undefined is in transit"
phasefx [Mon, 2 May 2011 13:20:40 +0000 (13:20 +0000)]
fix "undefined is in transit"

Fix bug squashing of params in checkin_via_barcode2 in circ/util.js.

Author: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20368 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoContentCafe summary of avaible item content
erickson [Sun, 1 May 2011 15:29:39 +0000 (15:29 +0000)]
ContentCafe summary of avaible item content

Added "available_json" support for Content Cafe.  Returns and array of
available content for a given item, where the content type is mapped to
one of the Evergreen standard added content types, e.g. "summary",
"anotes", "reviews", ...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20367 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAfter investigation by Dan Scott, Michael Peters and Mike Rylander (a little), apos...
miker [Sun, 1 May 2011 13:52:48 +0000 (13:52 +0000)]
After investigation by Dan Scott, Michael Peters and Mike Rylander (a little), apos removal in advanced search normalization is considered harmful.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20364 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Michael Peters, Jason Boyer and Jason Etheridge addressing LP#744244:...
miker [Sun, 1 May 2011 13:47:10 +0000 (13:47 +0000)]
Patch from Michael Peters, Jason Boyer and Jason Etheridge addressing LP#744244: bill_details.xul "Checkout or Renew Library" column is blank

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20361 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoRemove hard-coded default bootstrap location from authority_control_fields.pl
dbs [Sun, 1 May 2011 12:20:55 +0000 (12:20 +0000)]
Remove hard-coded default bootstrap location from authority_control_fields.pl

Let autoconf do its magic and we get away from one more hard-coded

Signed-off-by: Dan Scott <dan@coffeecode.net>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20359 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoSlight optimization for authority_control_fields.pl
dbs [Sun, 1 May 2011 12:11:27 +0000 (12:11 +0000)]
Slight optimization for authority_control_fields.pl

Instead of creating two CStoreEditors per bib record, reuse the global
CStoreEditor for read operations; this way we only have to create a new
CStoreEditor if a record has fields to authorize.

Signed-off-by: Dan Scott <dan@coffeecode.net>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20356 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAdd excerpt AC and avoid rate-limiting for OpenLibrary content
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

9 years agoUpdate Makefile.install and README for PostgreSQL 9.0
dbs [Sat, 30 Apr 2011 23:42:18 +0000 (23:42 +0000)]
Update Makefile.install and README for PostgreSQL 9.0

Along with cleaning out references to Debian Etch, Debian Lenny,
Ubuntu Hardy, add the Debian Squeeze, Ubuntu Lucid, and Fedora 14
PostgreSQL 9.0 repo locations, and convert the README to Asciidoc

Remove references to Fedora 13 and genericize it for Fedora 14
(with the thought that Fedora 15 will probably be coming out
soon). Also add PostgreSQL 9.0 packages as a target for the
database server in Makefile.install.

Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20352 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofix the new deps stuff
miker [Wed, 27 Apr 2011 20:25:10 +0000 (20:25 +0000)]
fix the new deps stuff

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20351 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoChange barcode to link to item status
phasefx [Wed, 27 Apr 2011 19:12:27 +0000 (19:12 +0000)]
Change barcode to link to item status

For copy details change the barcode to a link to the item status.
This only applies to the staff client itself due to an isXUL check first.

This allows for a staff member to get more details on the copy with a single click, rather than copy/paste of the barcode.

Author: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20349 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Mike Rylander to support load-from-file as an alternative to load-from...
erickson [Wed, 27 Apr 2011 18:43:08 +0000 (18:43 +0000)]
Patch from Mike Rylander to support load-from-file as an alternative to load-from-network

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20347 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoTurn ebooks AC from OpenLibrary into usable HTML
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

9 years agoBad miker ... correcting exclusion constraint definition
miker [Wed, 27 Apr 2011 16:12:03 +0000 (16:12 +0000)]
Bad miker ... correcting exclusion constraint definition

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20345 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoTeach OpenLibrary.pm how to extract ebook links from OpenLibrary results
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

9 years agostock schema version of 0526
miker [Wed, 27 Apr 2011 15:51:40 +0000 (15:51 +0000)]
stock schema version of 0526

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20343 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoUtility to create a template for a DB patch file
gmc [Wed, 27 Apr 2011 15:28:38 +0000 (15:28 +0000)]
Utility to create a template for a DB patch file

Besides creating the script, also does some basic sanity checks
on the patch number and the number(s) of any deprecated or
supsersed patches.

usage: ./make-db-patch.pl --num <patch_num> --name <patch_name> [--deprecates <num1>] [--supersedes <num2>]

Make template for a DB patch SQL file.

    --num          DB patch number
    --name         descriptive part of patch filename
    --deprecates   patch(es) deprecated by this update
    --supersedes   patch(es) superseded by this update

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20342 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agosupport for depracate/supersede tracking of upgrade scripts, and automatic rejection...
miker [Wed, 27 Apr 2011 15:24:54 +0000 (15:24 +0000)]
support for depracate/supersede tracking of upgrade scripts, and automatic rejection of conflicting scripts

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20341 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoOne more strictly integer check for fleshing feeds in SuperCat
dbs [Wed, 27 Apr 2011 12:26:25 +0000 (12:26 +0000)]
One more strictly integer check for fleshing feeds in SuperCat

Missed this one in r20336. Argh.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20340 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoConsolidate on checking for integers for -full / -uris
dbs [Wed, 27 Apr 2011 12:16:15 +0000 (12:16 +0000)]
Consolidate on checking for integers for -full / -uris

The check for an integer when $flesh eq 'uris' was throwing errors
and breaking authority browsing; rather than complicating matters
further, use an explicit integer for the return value when the format
ends with "-uris" so that we can simply test for an integer value
greater than 0.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20335 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPrevent a MARC::File::XML error from killing authority_control_fields.pl batch
dbs [Wed, 27 Apr 2011 01:44:20 +0000 (01:44 +0000)]
Prevent a MARC::File::XML error from killing authority_control_fields.pl batch

Continuing to make this script bullet-proof, MARC::File::XML cares deeply
about things like whether datafields have indicators and throws exceptions
that, if not caught, kill a processing script - like this one.

Borrowing the approach from marc_export, wrap the new_from_xml() call in
a try / otherwise block and roll on.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20332 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoHold, Transit, and Hold/Transit Slips used to suppress the printer dialog, but we...
phasefx [Tue, 26 Apr 2011 20:44:11 +0000 (20:44 +0000)]
Hold, Transit, and Hold/Transit Slips used to suppress the printer dialog, but we lost that when we moved to templated slips.  This adds a sticky Printer Prompt checkbox to Check In for controlling that behavior.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20327 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoSetting print.always_print_silent to false is a bad thing, since it trumps gPrintSett...
phasefx [Tue, 26 Apr 2011 20:44:08 +0000 (20:44 +0000)]
Setting print.always_print_silent to false is a bad thing, since it trumps gPrintSettings.printSilent, and will cause a print dialog regardless of Printer Prompt or Auto-Print checkboxes.  Let's clear it instead when toggling it off, and if we find it lingering as false from past code, let's clear it then too.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20326 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoProtect against errors returned by open-ils.search
dbs [Tue, 26 Apr 2011 17:18:14 +0000 (17:18 +0000)]
Protect against errors returned by open-ils.search

If open-ils.search returns an error rather than a result, prevent
authority_control_fields.pl from bombing out completely; instead,
flag the problem in STDERR and move on to the next record.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20323 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoset the cancel cause field when patrons cancel holds. There's a holdsCancel function...
phasefx [Tue, 26 Apr 2011 15:49:11 +0000 (15:49 +0000)]
set the cancel cause field when patrons cancel holds.  There's a holdsCancel function that also does this, but it never gets called by anything

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20320 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofix disappearing cursor/caret for Check In
phasefx [Tue, 26 Apr 2011 14:38:23 +0000 (14:38 +0000)]
fix disappearing cursor/caret for Check In

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20314 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoMake authority_control_fields.pl resistant to database timeouts
dbs [Tue, 26 Apr 2011 14:12:46 +0000 (14:12 +0000)]
Make authority_control_fields.pl resistant to database timeouts

LP 771237 describes how on an underpowered system, the work that
authority_control_fields.pl tries to do on a per-record basis may hit the
CStore default timeout of 6 seconds for a transaction and automatically
end the transaction, resulting in no work being committed once the script tries
to update the bibliographic record. Searching each controlled field for a
matching authority record can be costly in a database with millions of
authority records.

To enable the script to accomplish its work on underpowered test systems, use a
regular read-only CStoreEditor session to accomplish the lookups and create a
separate CStoreEditor session to issue the update in a transaction if required.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20311 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoLP#771187: fix syntax error in stored procedure def
gmc [Tue, 26 Apr 2011 13:14:06 +0000 (13:14 +0000)]
LP#771187: fix syntax error in stored procedure def

Author: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20309 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoRegression in pulling physical characteristics from a record in an SVF world, spotted...
miker [Mon, 25 Apr 2011 18:42:26 +0000 (18:42 +0000)]
Regression in pulling physical characteristics from a record in an SVF world, spotted by Jason Stephenson

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20307 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoRegression in pulling physical characteristics from a record in an SVF world, spotted...
miker [Mon, 25 Apr 2011 18:42:11 +0000 (18:42 +0000)]
Regression in pulling physical characteristics from a record in an SVF world, spotted by Jason Stephenson

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20306 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoUse layout.css to control table of contents from OpenLibrary added content
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.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20303 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoExtend i18n support for Register Patron interface
dbs [Sat, 23 Apr 2011 05:34:37 +0000 (05:34 +0000)]
Extend i18n support for Register Patron interface

Missed out on the Save / Show Fields dialogue in the previous
commit; this gets us up to speed on the entire interface.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20299 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoAdd i18n support to the User Editor / registration interface
dbs [Sat, 23 Apr 2011 05:22:05 +0000 (05:22 +0000)]
Add i18n support to the User Editor / registration interface

Per LP # 754898, the Register Patron interface currently contains
many hardcoded strings. Given that the previous patron registration
interface supported translation, this is a regression in 2.0.

Accordingly, we extend the use of Dojo i18n support to provide the
strings for buttons and a number of labels on the Register Patron
interface. The bulk of the remaining text is provided by the fieldmapper
definitions, which should in theory be translated automatically for us.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20298 dcc99617-32d9-48b4-a31d-7c20da2025e4

10 years agoaddress the empty-query case
miker [Fri, 22 Apr 2011 21:34:56 +0000 (21:34 +0000)]
address the empty-query case

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20295 dcc99617-32d9-48b4-a31d-7c20da2025e4

10 years agoDisable Save Columns in xul holds interface when Hold Details is being viewed. https...
phasefx [Fri, 22 Apr 2011 21:13:04 +0000 (21:13 +0000)]
Disable Save Columns in xul holds interface when Hold Details is being viewed.  https://bugs.launchpad.net/evergreen/+bug/691599   Not the best fix, but the quickest fix

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20292 dcc99617-32d9-48b4-a31d-7c20da2025e4

10 years agoAddress LP#730743, errant parens cause pain
miker [Fri, 22 Apr 2011 20:44:30 +0000 (20:44 +0000)]
Address LP#730743, errant parens cause pain

Specifically, we prune subplans that contain no nodes (empty parens), and avoid dropping out of the top level query context when we encounter a close-paren.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20289 dcc99617-32d9-48b4-a31d-7c20da2025e4

10 years agoorg unit setting for making unified Volume/Item interface optional. fix the volume...
phasefx [Fri, 22 Apr 2011 18:09:39 +0000 (18:09 +0000)]
org unit setting for making unified Volume/Item interface optional.  fix the volume interface in its standalone incarnation, and tweak the label for editing items in holdings maintenance

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20287 dcc99617-32d9-48b4-a31d-7c20da2025e4

10 years agoDon't disable the Create Volume/Item button when building the data structure from...
phasefx [Fri, 22 Apr 2011 15:56:37 +0000 (15:56 +0000)]
Don't disable the Create Volume/Item button when building the data structure from the form.

If you have say, a <textbox> with on onchange event that disables a <button> and re-enables it shortly thereafter, and the onchange event was triggered by you clicking on said button while the textbox has focus/changes, then the disable action will prevent any click on the button from registering.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20285 dcc99617-32d9-48b4-a31d-7c20da2025e4

10 years agoTurn off non-working print button for holds pull
phasefx [Fri, 22 Apr 2011 14:28:29 +0000 (14:28 +0000)]
Turn off non-working print button for holds pull


Author: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20280 dcc99617-32d9-48b4-a31d-7c20da2025e4