From: Mike Rylander Date: Tue, 26 Nov 2013 20:27:08 +0000 (-0500) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5f4e152c2f752635b6ea9e21900e66bc12afd77e;p=working%2FEvergreen.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Mike Rylander --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..498626fee7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1171 @@ -Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs. -Those seeking a change log are encouraged to run 'git log -v', or read -it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log +commit 6fda90189ec7aaf0cc832fcf0a0a7d8925af0eb8 +Author: Mike Rylander +Date: Tue Nov 26 15:22:43 2013 -0500 + + Updating translations; Fixing make_release for ChangeLog generation + + Signed-off-by: Mike Rylander + +1 1 build/i18n/po/AutoFieldWidget.js/fi-FI.po +1 1 build/i18n/po/Searcher.js/fi-FI.po +1 1 build/i18n/po/TranslatorPopup.js/fi-FI.po +1 1 build/i18n/po/User.js/fi-FI.po +2 4 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +15 37 build/i18n/po/acq.js/acq.js.pot +1 1 build/i18n/po/admin.properties/fi-FI.po +1 1 build/i18n/po/auth.properties/fi-FI.po +1 1 build/i18n/po/authority.js/fi-FI.po +2 4 build/i18n/po/capture.js/capture.js.pot +1 1 build/i18n/po/capture.js/fi-FI.po +1 1 build/i18n/po/cat.properties/fi-FI.po +2 2 build/i18n/po/circ.properties/circ.properties.pot +1 1 build/i18n/po/circ.properties/fi-FI.po +1 1 build/i18n/po/common.properties/fi-FI.po +7 19 build/i18n/po/conify.js/conify.js.pot +1 1 build/i18n/po/conify.js/fi-FI.po +691 691 build/i18n/po/db.seed/db.seed.pot +1 1 build/i18n/po/db.seed/fi-FI.po +1 1 build/i18n/po/fm_IDL.dtd/fi-FI.po +17 17 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +1 1 build/i18n/po/ils_events.xml/fi-FI.po +298 358 build/i18n/po/ils_events.xml/ils_events.xml.pot +1 1 build/i18n/po/lang.dtd/fi-FI.po +6 2 build/i18n/po/lang.dtd/lang.dtd.pot +1 1 build/i18n/po/offline.properties/fi-FI.po +1 1 build/i18n/po/opac.dtd/fi-FI.po +1 1 build/i18n/po/opac.js/fi-FI.po +4 11 build/i18n/po/opac.js/opac.js.pot +1 1 build/i18n/po/patron.properties/fi-FI.po +1 1 build/i18n/po/pickup_and_return.js/fi-FI.po +1 1 build/i18n/po/pull_list.js/fi-FI.po +1 1 build/i18n/po/register.js/fi-FI.po +10 11 build/i18n/po/register.js/register.js.pot +1 1 build/i18n/po/reports.dtd/fi-FI.po +1 1 build/i18n/po/reports.js/fi-FI.po +1 1 build/i18n/po/reservation.js/fi-FI.po +2 5 build/i18n/po/reservation.js/reservation.js.pot +1 1 build/i18n/po/selfcheck.js/fi-FI.po +3 8 build/i18n/po/selfcheck.js/selfcheck.js.pot +1 1 build/i18n/po/serial.properties/fi-FI.po +6 6 build/i18n/po/tpac/tpac.pot +1 1 build/tools/make_release + +commit 175315f314d1eabf8871c75a9a2f2c22264f327b +Author: Mike Rylander +Date: Tue Nov 26 14:57:46 2013 -0500 + + Updating PO files from launchpad + + Signed-off-by: Mike Rylander + +1 1 build/i18n/po/AutoFieldWidget.js/fi-FI.po +9 9 build/i18n/po/Searcher.js/es-ES.po +1 1 build/i18n/po/Searcher.js/fi-FI.po +1 1 build/i18n/po/TranslatorPopup.js/fi-FI.po +1 1 build/i18n/po/User.js/fi-FI.po +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +13 11 build/i18n/po/admin.properties/es-ES.po +1 1 build/i18n/po/admin.properties/fi-FI.po +1 1 build/i18n/po/auth.properties/fi-FI.po +21 21 build/i18n/po/authority.js/es-ES.po +1 1 build/i18n/po/authority.js/fi-FI.po +1 1 build/i18n/po/capture.js/fi-FI.po +16 14 build/i18n/po/cat.properties/cs-CZ.po +15 13 build/i18n/po/cat.properties/de-DE.po +15 13 build/i18n/po/cat.properties/en-CA.po +15 13 build/i18n/po/cat.properties/en-GB.po +53 42 build/i18n/po/cat.properties/es-ES.po +18 15 build/i18n/po/cat.properties/fi-FI.po +15 13 build/i18n/po/cat.properties/fr-CA.po +15 13 build/i18n/po/cat.properties/hy-AM.po +15 13 build/i18n/po/cat.properties/oc-FR.po +15 13 build/i18n/po/cat.properties/pt-BR.po +15 13 build/i18n/po/cat.properties/ru-RU.po +7 13 build/i18n/po/cat.properties/tr-TR.po +27 6 build/i18n/po/circ.properties/cs-CZ.po +22 4 build/i18n/po/circ.properties/de-DE.po +27 6 build/i18n/po/circ.properties/en-CA.po +27 6 build/i18n/po/circ.properties/en-GB.po +34 13 build/i18n/po/circ.properties/es-ES.po +30 8 build/i18n/po/circ.properties/fi-FI.po +26 5 build/i18n/po/circ.properties/fr-CA.po +27 6 build/i18n/po/circ.properties/hy-AM.po +22 4 build/i18n/po/circ.properties/oc-FR.po +27 6 build/i18n/po/circ.properties/pt-BR.po +26 5 build/i18n/po/circ.properties/ru-RU.po +22 4 build/i18n/po/circ.properties/tr-TR.po +12 4 build/i18n/po/common.properties/cs-CZ.po +11 3 build/i18n/po/common.properties/de-DE.po +11 3 build/i18n/po/common.properties/en-CA.po +11 3 build/i18n/po/common.properties/en-GB.po +17 9 build/i18n/po/common.properties/es-ES.po +21 12 build/i18n/po/common.properties/fi-FI.po +11 3 build/i18n/po/common.properties/fr-CA.po +11 3 build/i18n/po/common.properties/hy-AM.po +11 3 build/i18n/po/common.properties/oc-FR.po +11 3 build/i18n/po/common.properties/pt-BR.po +11 3 build/i18n/po/common.properties/ru-RU.po +6 6 build/i18n/po/conify.js/es-ES.po +1 1 build/i18n/po/conify.js/fi-FI.po +9543 3073 build/i18n/po/db.seed/cs-CZ.po +8455 2323 build/i18n/po/db.seed/de-DE.po +8753 2722 build/i18n/po/db.seed/en-CA.po +8761 2795 build/i18n/po/db.seed/en-GB.po +8438 2405 build/i18n/po/db.seed/es-ES.po +9624 3331 build/i18n/po/db.seed/fi-FI.po +9764 3798 build/i18n/po/db.seed/fr-CA.po +9808 3842 build/i18n/po/db.seed/hy-AM.po +8480 2343 build/i18n/po/db.seed/oc-FR.po +9317 3270 build/i18n/po/db.seed/pt-BR.po +9164 3120 build/i18n/po/db.seed/ru-RU.po +7960 1826 build/i18n/po/db.seed/tr-TR.po +2679 2480 build/i18n/po/fm_IDL.dtd/cs-CZ.po +2637 2444 build/i18n/po/fm_IDL.dtd/de-DE.po +2670 2468 build/i18n/po/fm_IDL.dtd/en-CA.po +2669 2467 build/i18n/po/fm_IDL.dtd/en-GB.po +2643 2450 build/i18n/po/fm_IDL.dtd/es-ES.po +2731 2528 build/i18n/po/fm_IDL.dtd/fi-FI.po +2639 2446 build/i18n/po/fm_IDL.dtd/fr-CA.po +2670 2468 build/i18n/po/fm_IDL.dtd/hy-AM.po +2636 2443 build/i18n/po/fm_IDL.dtd/oc-FR.po +2655 2462 build/i18n/po/fm_IDL.dtd/pt-BR.po +2655 2462 build/i18n/po/fm_IDL.dtd/ru-RU.po +2634 2441 build/i18n/po/fm_IDL.dtd/tr-TR.po +270 257 build/i18n/po/ils_events.xml/cs-CZ.po +267 254 build/i18n/po/ils_events.xml/de-DE.po +269 256 build/i18n/po/ils_events.xml/en-CA.po +269 256 build/i18n/po/ils_events.xml/en-GB.po +286 270 build/i18n/po/ils_events.xml/es-ES.po +272 258 build/i18n/po/ils_events.xml/fi-FI.po +270 257 build/i18n/po/ils_events.xml/fr-CA.po +269 256 build/i18n/po/ils_events.xml/hy-AM.po +269 256 build/i18n/po/ils_events.xml/pt-BR.po +269 256 build/i18n/po/ils_events.xml/ru-RU.po +827 16 build/i18n/po/lang.dtd/ar-AR.po +900 38 build/i18n/po/lang.dtd/cs-CZ.po +853 21 build/i18n/po/lang.dtd/de-DE.po +883 30 build/i18n/po/lang.dtd/en-CA.po +882 29 build/i18n/po/lang.dtd/en-GB.po +856 30 build/i18n/po/lang.dtd/es-ES.po +1485 629 build/i18n/po/lang.dtd/fi-FI.po +871 27 build/i18n/po/lang.dtd/fr-CA.po +883 30 build/i18n/po/lang.dtd/hy-AM.po +835 18 build/i18n/po/lang.dtd/oc-FR.po +877 27 build/i18n/po/lang.dtd/pt-BR.po +877 27 build/i18n/po/lang.dtd/ru-RU.po +843 20 build/i18n/po/lang.dtd/tr-TR.po +8 4 build/i18n/po/offline.properties/cs-CZ.po +7 3 build/i18n/po/offline.properties/de-DE.po +7 3 build/i18n/po/offline.properties/en-CA.po +7 3 build/i18n/po/offline.properties/en-GB.po +59 44 build/i18n/po/offline.properties/es-ES.po +10 5 build/i18n/po/offline.properties/fi-FI.po +7 3 build/i18n/po/offline.properties/fr-CA.po +7 3 build/i18n/po/offline.properties/hy-AM.po +9 5 build/i18n/po/offline.properties/oc-FR.po +7 3 build/i18n/po/offline.properties/pt-BR.po +7 3 build/i18n/po/offline.properties/ru-RU.po +7 3 build/i18n/po/offline.properties/tr-TR.po +16 10 build/i18n/po/opac.dtd/es-ES.po +7 6 build/i18n/po/opac.dtd/fi-FI.po +6 5 build/i18n/po/opac.js/es-ES.po +1 1 build/i18n/po/opac.js/fi-FI.po +41 18 build/i18n/po/patron.properties/cs-CZ.po +38 14 build/i18n/po/patron.properties/de-DE.po +39 15 build/i18n/po/patron.properties/en-CA.po +39 15 build/i18n/po/patron.properties/en-GB.po +44 32 build/i18n/po/patron.properties/es-ES.po +44 19 build/i18n/po/patron.properties/fi-FI.po +38 14 build/i18n/po/patron.properties/fr-CA.po +39 15 build/i18n/po/patron.properties/hy-AM.po +18 9 build/i18n/po/patron.properties/oc-FR.po +38 14 build/i18n/po/patron.properties/pt-BR.po +38 14 build/i18n/po/patron.properties/ru-RU.po +23 11 build/i18n/po/patron.properties/tr-TR.po +21 20 build/i18n/po/pickup_and_return.js/es-ES.po +1 1 build/i18n/po/pickup_and_return.js/fi-FI.po +6 6 build/i18n/po/pull_list.js/es-ES.po +1 1 build/i18n/po/pull_list.js/fi-FI.po +30 23 build/i18n/po/register.js/cs-CZ.po +29 22 build/i18n/po/register.js/de-DE.po +29 22 build/i18n/po/register.js/en-CA.po +29 22 build/i18n/po/register.js/en-GB.po +36 29 build/i18n/po/register.js/es-ES.po +32 24 build/i18n/po/register.js/fi-FI.po +29 22 build/i18n/po/register.js/fr-CA.po +29 22 build/i18n/po/register.js/hy-AM.po +29 22 build/i18n/po/register.js/oc-FR.po +30 23 build/i18n/po/register.js/pt-BR.po +29 22 build/i18n/po/register.js/ru-RU.po +23 20 build/i18n/po/register.js/tr-TR.po +20 8 build/i18n/po/reports.dtd/es-ES.po +8 7 build/i18n/po/reports.dtd/fi-FI.po +1 1 build/i18n/po/reports.js/fi-FI.po +1 1 build/i18n/po/reservation.js/fi-FI.po +62 30 build/i18n/po/selfcheck.js/cs-CZ.po +41 25 build/i18n/po/selfcheck.js/de-DE.po +60 29 build/i18n/po/selfcheck.js/en-CA.po +60 29 build/i18n/po/selfcheck.js/en-GB.po +67 42 build/i18n/po/selfcheck.js/es-ES.po +63 31 build/i18n/po/selfcheck.js/fi-FI.po +60 29 build/i18n/po/selfcheck.js/fr-CA.po +60 29 build/i18n/po/selfcheck.js/hy-AM.po +44 25 build/i18n/po/selfcheck.js/oc-FR.po +60 29 build/i18n/po/selfcheck.js/pt-BR.po +40 24 build/i18n/po/selfcheck.js/ru-RU.po +25 13 build/i18n/po/serial.properties/cs-CZ.po +15 3 build/i18n/po/serial.properties/de-DE.po +15 3 build/i18n/po/serial.properties/en-CA.po +15 3 build/i18n/po/serial.properties/en-GB.po +19 7 build/i18n/po/serial.properties/es-ES.po +31 18 build/i18n/po/serial.properties/fi-FI.po +15 3 build/i18n/po/serial.properties/fr-CA.po +15 3 build/i18n/po/serial.properties/hy-AM.po +15 3 build/i18n/po/serial.properties/oc-FR.po +15 3 build/i18n/po/serial.properties/pt-BR.po +15 3 build/i18n/po/serial.properties/tr-TR.po +5 5 build/i18n/po/vandelay.dtd/es-ES.po + +commit 68e39c83414b8fbb94eedaa3df95e5097b491095 +Author: Mike Rylander +Date: Wed Nov 13 18:15:21 2013 -0500 + + Fix boolean lists; Better atom regex; Caching + + First, we didn't need to make $last_type local, and it broke explicit + grouping anyway. That's removed, and we now reset that (and a few more + like it) at calls to the top level parse() method. This introduces a + situation where a long list of booleans could cause query plan problems, + so we limit the plan depth to 40 (20 ||'d conditions). + + Second, we are smarter about finding the boundary of atoms. Previous + to this commit, and curly brace could send the parser into a tailspin + from which it would not recover. Now we use alternation instead of + a character class, which is much safer with the default multi-character + float syntax specifier. + + Third, as a catch-all, if we can't parse the remained of a query we + now simply say so (when in debug mode) and go away, instead of risking + an infinite loop. We do this via a final, unqualified "else" clause + in decompose(). + + Finally, instead of building 10+ regexp objects on each query parse, + cache them per QP subclass and reuse them. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +2 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm +117 94 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm +2 0 Open-ILS/src/support-scripts/test-scripts/query_tests.pl + +commit 3aba1ebc23c891841e72befcd6770879172909a6 +Author: Mike Rylander +Date: Tue Nov 26 12:44:41 2013 -0500 + + Push 0848 into the baseline schema + + Signed-off-by: Mike Rylander + +44 34 Open-ILS/src/sql/Pg/011.schema.authority.sql + +commit 4cdd332845de84370015c843f74bb138ae9bd21a +Author: Mike Rylander +Date: Mon Nov 25 10:14:08 2013 -0500 + + Re-apply the changes provided by 0802 for backport + + Preserve record order of subfields for authority heading extraction + + When extracting headings from authority records we currently read the + subfields of a tag in configuration order. We should, instead, read + them in record order, to preserve the desired sorting properties that + the cataloger has encoded in the record. + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +170 0 Open-ILS/src/sql/Pg/upgrade/0848.function.authority-sf-file-order-again.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0848.function.authority-sf-file-order-again.sql + +commit 0d87a3253106f3110a325c290d35ea1a62dcc872 +Author: Bill Erickson +Date: Fri Nov 22 14:55:26 2013 -0500 + + LP#1254146 gracefully handle custom trees sans entries + + Avoid references to custom tree entries when no tree entries for a + custom tree exist. Prevents: + + egweb: template error: undef error - Can't call method "org_unit" on an + undefined value at + /usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader/Util.pm line 185.\n + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +2 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm + +commit da75e94d037be0de04469b9140770a5201c1a8b5 +Author: Dan Wells +Date: Thu Oct 3 17:54:03 2013 -0400 + + Relax MFHD subfield 'a' requirement for caption/patterns + + If going by the book, every caption/pattern field would have a + subfield 'a', since the data from subfield 'i' would be moved to + 'a' if 'a' was empty. Since that is arcane, and our own wizards + used to bend this rule, let's make some minor adjustments to our + expectations: + + 1) When calculating date progression, don't expect there to be an 'a' + subfield which needs to be "carried" into. + 2) When determining whether a field is 'open-ended', check the first + availabile enum/chron subfield rather than hard-coding the check to + 'a'. + + These changes do not affect the display formatters, so strings + generated from 'a'-less caption/pattern combos are not exactly right, + but they suffice. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +5 1 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm +3 1 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Holding.pm + +commit 77256cc92f1d97484fd4e850f3942b6656582a5f +Author: Mike Rylander +Date: Wed Nov 20 10:57:42 2013 -0500 + + Pulling these into the base of 2.4 + + Signed-off-by: Mike Rylander + +196 0 Open-ILS/src/sql/Pg/version-upgrade/2.4.1-2.4.2-upgrade-db.sql +21 0 Open-ILS/src/sql/Pg/version-upgrade/2.4.2-2.4.3-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.4.1-2.4.2-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.4.2-2.4.3-upgrade-db.sql + +commit 65a6d603736a8e8e7a8b91ea3c88b192ce8460e5 +Author: Bill Erickson +Date: Fri Nov 15 17:06:53 2013 -0500 + + LP#1251774 exit and alert on multiple payments per xact + + If more than one payment for a transaction is received, exit the API + call early and return a MULTIPLE_PAYMENTS_FOR_XACT event. + + Signed-off-by: Bill Erickson + Signed-off-by: Mike Rylander + +4 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm + +commit 3c4aa090a4e177bc55158b4b7d368654b91fa1f6 +Author: Mike Rylander +Date: Fri Nov 15 16:40:36 2013 -0500 + + Enforce one-payment-per-xact-per-call + + There is no legitimate reason for a transaction to receive more than + one payment per call to open-ils.circ open-ils.circ.money.payment, + but we have seen the staff client generate such a data structure. This + leads to seemingly duplicate payments, and is bad all around. So, + we will enforce the restriction by taking only the first payment per + xact in the list of payments. + + Signed-off-by: Mike Rylander + Signed-off-by: Bill Erickson + +10 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm + +commit ccc0a8dbcef48ddd19ff94f8a72848bed11612e0 +Author: Jason Stephenson +Date: Fri Nov 8 15:02:53 2013 -0500 + + Replace erroneous calls to $e->retrieve_authority_record($rec_id). + + On lines 153 and 175 of OpenILS::Application::Cat::Authority calls + like the above should be $e->retrieve_authority_record_entry($rec_id). + This branch replaces the two misspelled calls with the proper ones. + + Signed-off-by: Jason Stephenson + + Conflicts [just whitespace]: + Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm + +4 4 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm + +commit ae6aadb3adfacf101e2d16d233a44832c971398a +Author: Jason Etheridge +Date: Thu Sep 12 12:02:15 2013 -0400 + + LP1093856 fix Fast Item Add with Z39.50 import + + The first time I tried this fix I ran afoul of + https://bugs.launchpad.net/evergreen/+bug/787561 + + But a second attempt worked. So I didn't kill + two birds with one stone, but this should take + care of 1093856. + + Signed-off-by: Jason Etheridge + Signed-off-by: Mike Rylander + +12 3 Open-ILS/xul/staff_client/server/cat/marcedit.js + +commit 441b3f949b9362573e89cdcfaf1a8c197a2ba46b +Author: Liam Whalen +Date: Sun Oct 6 22:11:56 2013 -0700 + + LP#1037171 Removed Expert Search paramters from subject links + + After performing an Expert Search, if a user visits a record and then + clicks on one of the author, subject, or series search links within + that record, then they are given the results of the Expert Search again + instead of the relevant subject or author search. + + This is happening because the Expert Search parameters are retained in + the URLs via the TT2 MACRO mkurl. In particular, the tag parameter is + used to identify an Expert Search, so if it is present in a URL, than an + Expert Search will be attempted regardless of which other paramaters are + in the URL. + + To fix this, I created two varialbes within header.tt2 above the + definition of mkurl. These variables group common URL paramters for + Expert Searches and General Search parameters together. These variables + can be used wherever mkurl is used to strip out unneeded search + paramters. + + There is a third variable that is already present within many of these + pages named stop_parms. While I initially tried to modify this + variable, I found that there are some instances where the general search + parameters should be retained while the Expert Search parameters must go. + + This commit uses these three variables togehter as input into the third + arugment of the mkurl MACRO. The third arugment specifies which + paramtes to remove from the previous URL before making a new URL based + on the pervious URL. + + I also added the query parameter to the Place Hold's hold_source_page + URL variable. I did this, so that the query terms would be preserved + once the user is done placing the hold or decides to cancle the placing + of the hold. + + As well, I used the new variables to remove Expert Search paramters + from the Advanced Search links on the results and record pages. + + Signed-off-by: Liam Whalen + Signed-off-by: Mike Rylander + +4 0 Open-ILS/src/templates/opac/parts/header.tt2 +1 1 Open-ILS/src/templates/opac/parts/record/authors.tt2 +1 1 Open-ILS/src/templates/opac/parts/record/series.tt2 +1 1 Open-ILS/src/templates/opac/parts/record/subjects.tt2 +2 2 Open-ILS/src/templates/opac/parts/result/table.tt2 +1 1 Open-ILS/src/templates/opac/parts/searchbar.tt2 +1 1 Open-ILS/src/templates/opac/results.tt2 + +commit ff1df8ea5ca2598c84f1505309b5ceeee893a9df +Author: Steven Callender +Date: Thu Nov 14 15:42:12 2013 -0500 + + LP1251424 - Fix for submit button when placing holds in staff client + + I've moved the initializing of the cur_hold_barcode variable + to within the function rather than floating outside of it. + This seemed to fix an intermittent issue where the submit + button would not become activatable when first going to the + place hold screen via the staff client. To create the hold, + ths user had to cycle through the "Place hold by patron barcode" + option and then back to "Place hold for me" option. + + It looked like behind the scenes for certain org units that + variable would not be set and the button will not open until + it at least has something. This causes it to be set on the initial + loading of the screen. + + Signed-off-by: Steven Callender + Signed-off-by: Ben Shum + +1 1 Open-ILS/web/js/ui/default/opac/staff.js + +commit 4c178f7dcd9bdb7d148edcc94e83ecb2979ce663 +Author: Garry Collum +Date: Mon Jul 22 14:30:04 2013 -0400 + + lp1012237 HOLD_ITEM_CHECKED_OUT display + + Added a definition to the HOLD_ITEM_CHECKED_OUT event in ils_events.xml. + Trying to be generic between the opac and the staff client the message + reads, "The item you have attempted to place on hold is already checked + out to the requestor." + + [LFW: I made a tiny spelling change to be consistent with other + appearances in Evergreen of the term "requestor".] + + Signed-off-by: Garry Collum + Signed-off-by: Lebbeous Fogle-Weekley + + Conflicts: + Open-ILS/src/extras/ils_events.xml + +3 4 Open-ILS/src/extras/ils_events.xml + +commit 58e051181ea229d3260d4dd1483bb359904623e5 +Author: Lebbeous Fogle-Weekley +Date: Mon Oct 14 17:28:07 2013 -0400 + + Acq: Improvements to account-matching incoming EDI messages + + The way the EDI fetcher works gives us a problem. That process iterates + over EDI accounts for which it has FTP host and credential information, + downloads documents from each of those sites, and files the messages + within those documents under the EDI account from which the login + credentials came. The problem is that in practice the exact same host + and login information is used by multiple accounts under the same + vendor, and files relating to these sub-accounts are commingled, so that + you can't make the decision about which messages should be filed under + which accounts based on the name of the document or its location. You + have to make that decision later, based on its contents. + + We are already incompletely doing this, distinguishing between + sub-accounts under which we could file our messages when the vendor + specifies the buyer's SAN next to the specific sub-account number *and* + those sub-accounts belong to different Evergreen org units. We still + need ways to distinguish in other cases. + + This will do what is natural for at least one vendor, and match the + message content against the vendacct field of the acq.edi_account table. + + *Also,* + + We were re-retrieving the working acq.edi_message row from the database + before writing it, throwing away possible changes to the object in hand + made by O::A::Acq::EDI::process_parsed_msg(). We should only do that in + the case where that function has raised an exception. + + We were doing the same kind of thing in another place actually inside + process_parsed_msg() where we set the edi_message's purchase_order field + based on the first lineitem encountered if the message itself didn't + specify a valid PO identifier. + + This supports making account-correction work for ORDRSP messages in + addition to INVOIC messages. + + We also propagate that same correction to the provider and shipper + fields of any invoices that get created from said edi_message. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +56 13 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm + +commit 53b95bb34f395848ef7da78e6b6497eb269bcd63 +Author: Jeff Godin +Date: Wed Nov 6 12:07:07 2013 -0500 + + Don't auto-logout TPAC in staff client + + Wrap the meta refresh in TPAC within a check for ctx.is_staff, so + that idle TPAC tabs will not log out when running within the staff + client. + + This is intended to resolve the primary cause of symptoms mentioned + in bug 1036318 "OPAC timeout within the client" + + Signed-off-by: Jeff Godin + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/templates/opac/parts/base.tt2 + +commit d68a509d7c7de473da9f24b7f992979ee5d320d2 +Author: Remington Steed +Date: Fri Nov 1 16:04:59 2013 -0400 + + Fix formatting in upgrade instructions + + Signed-off-by: Remington Steed + +2 4 docs/installation/server_upgrade.txt + +commit a72b5ea9ff4b332a78f93a4cffb45ad77e910246 +Author: Dan Wells +Date: Fri Nov 1 16:45:09 2013 -0400 + + Stamping 0847: improved auth overlay generation + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +94 0 Open-ILS/src/sql/Pg/upgrade/0847.function.auth_overlay_generator.sql +0 94 Open-ILS/src/sql/Pg/upgrade/XXXX.function.auth_overlay_generator.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0847.function.auth_overlay_generator.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.auth_overlay_generator.sql + +commit 0089afe08d72b777bdc7696e883795021b266d46 +Author: Mike Rylander +Date: Fri Nov 1 13:57:35 2013 -0400 + + Add indicators; Remove junk tags + + First, we were not supplying authority tag indicators when generating the + overlay template. The xml merge function does not currently transfer + indicators, but we need to do this anyway because newer MARC::Field version + balk at fields with no indicators. + + Second, PG 9.1+ adds wrapper tags to xml content that is passed to XMLELEMENT + as an array. So, we'll use XMLAGG to get around that. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +15 2 Open-ILS/src/sql/Pg/011.schema.authority.sql +94 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.auth_overlay_generator.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.auth_overlay_generator.sql + +commit e54bbbbe0c0462cbb07612f16b6c92c015ba47e4 +Author: Mike Rylander +Date: Tue Oct 29 12:15:56 2013 -0400 + + Add --refresh mode to completely rewrite linking + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +36 22 Open-ILS/src/support-scripts/authority_control_fields.pl.in + +commit cbff8b11d02118cbb0be74549eb1e2331e9b0a8f +Author: Mike Rylander +Date: Tue Oct 29 11:37:36 2013 -0400 + + Use all subfield values to link authority records to bibs + + Given an Evergreen instance with two authority records loaded, one + being a more specific than the other via a repeated subdivision subfield, + we must make sure that we use all the bib-supplied subfield values when + attempting to auto-link to the correct authority. Otherwise, the "shorter" + authority record may be selected as appropriate, and data in the bib record + would be lost. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +3 3 Open-ILS/src/support-scripts/authority_control_fields.pl.in + +commit f0e75d70147afc087af0d63a3f70163a409971c5 +Author: Galen Charlton +Date: Mon Oct 14 09:21:58 2013 -0700 + + LP#1086458: remove unecessary anonymous hashes when calling xulG.set_tab() + + This follows up on observations made by Steven Chan that + suggests that even the act of creating an anonymous hash and + passing it to a global function can cause (I assume) JavaScript + execution contexts to be leaked. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +1 1 Open-ILS/xul/staff_client/chrome/content/main/menu.js + +commit 2c03e0d8481d043f68b83894550d4a7030b08860 +Author: Galen Charlton +Date: Mon Oct 14 08:47:49 2013 -0700 + + LP#1086458: invoke new 'refresh_checkout' event + + This implements using the new custom event rather than + xulG.set_tab() to refresh a refresh of the checkout tab. It + also removes use of a callback function to request the tab + refresh in favor of a simple setTimeout(). + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +15 26 Open-ILS/xul/staff_client/server/circ/checkout.js + +commit b79032ac05dcfa7a6d955c826579a70d281f50c9 +Author: Galen Charlton +Date: Thu Sep 26 13:05:26 2013 -0700 + + LP#1086458: define custom event for refreshing the checkout page + + Using a custom event handled by a chrome event handler rather + than calling xulG.set_tab() directly avoids any possibility of + leaking objects and executation contexts from the code that's + requesting refresh of the checkout page. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +14 0 Open-ILS/xul/staff_client/chrome/content/main/menu.js + +commit 0c07c042166c8114cf38359de60ac83edcabff39 +Author: Galen Charlton +Date: Mon Oct 14 08:23:23 2013 -0700 + + LP#1086458: convert last-print information hash to JSON string before caching + + By serializing the printing message and context information to a + JSON string before caching it, we avoid inadvertantly dragging in + things like Javascript execution contexts and possibly references + to objects created by the checkout interface. This was contributing + to the staff client memory leaks observed during receipt printing. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +5 4 Open-ILS/xul/staff_client/chrome/content/util/print.js + +commit 30254da66050e4a6ba1262b62391eb016e83a72f +Author: Dan Wells +Date: Wed Oct 30 15:33:28 2013 -0400 + + Stamping 0846: overlay subfield order fix + + Respect source XML subfield order during overlay + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +83 0 Open-ILS/src/sql/Pg/upgrade/0846.function.vand-add_field.sql +0 83 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0846.function.vand-add_field.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql + +commit bcef2183a73035ef13e76a1ee19594452c224f83 +Author: Mike Rylander +Date: Fri Oct 25 12:15:25 2013 -0400 + + Respect source XML subfield order during overlay + + When adding specific subfields to a field as described by an add + or replace rule we were adding them in rule-order. Instead, they + should be added in source-XML physical order. This commit does + that. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +3 2 Open-ILS/src/sql/Pg/012.schema.vandelay.sql +83 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql + +commit 4ea0ee9e445714d24e24d20abcd44f5516f56b29 +Author: Jason Stephenson +Date: Mon Oct 21 16:37:22 2013 -0400 + + Handle Missing copy status (4) in checkin_via_barcode2 in circ.util.js. + + We treate just like available and reshelving. + + Signed-off-by: Jason Stephenson + Signed-off-by: Kathy Lussier + Signed-off-by: Dan Wells + +1 0 Open-ILS/xul/staff_client/server/circ/util.js + +commit b52dd5fce7bae16c3413ec5e79bfce11180c88e3 +Author: Mike Rylander +Date: Thu Oct 24 16:10:00 2013 -0400 + + Make sure that # can be used in auth browse + + Because we use URLs to call the SuperCat browse API, we need to + be more careful about encoding parameters. #, in particular, breaks + auth browse because it's seen as a URL fragment separator by the browser + and web server. + + Signed-off-by: Mike Rylander + Signed-off-by: Yamil Suarez + Signed-off-by: Mike Rylander + +1 1 Open-ILS/web/js/ui/default/cat/authority/list.js + +commit 3dc127fb66962e2f4bff7e84ed1b4d0c8e00308e +Author: Dan Scott +Date: Thu Oct 24 09:54:49 2013 -0400 + + RDA / TPAC: Add 264 for pubinfo graphic 880 lookups + + Per https://bugs.launchpad.net/evergreen/+bug/1243746 the publication + info in search results was coming up empty for RDA records because they + use 264 for publication info instead of 260. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +2 0 Open-ILS/src/templates/opac/parts/misc_util.tt2 + +commit ff4f67aecca40f3a8e69d35b8459b565a1d87abc +Author: Remington Steed +Date: Wed Oct 16 16:13:50 2013 -0400 + + Serials Docs: Improve format, fix typos, and update + + This commit makes several minor changes to the Serials doc files, mostly + changes in formatting or corrections of bugs/typos. This list covers + most of the changes: + + - Add row on 'receiving' to Serials interfaces comparison table + - Improve formatting of actionable items (using bold and arrows), + e.g. Click on *First Menu* -> *Next Menu* -> *Last Menu* + - Standardize formatting of form field names (using italics) + - Improve unclear wording + - Correct an outdated description of copy template 'status' field + (changed before 2.3) + - Change heading level for a subsection + + Signed-off-by: Remington Steed + +2 1 docs/serials/A-intro.txt +23 25 docs/serials/B-copy_template.txt +39 39 docs/serials/C-subscription-SCV.txt +3 3 docs/serials/D-subscription-ASCV.txt +2 2 docs/serials/E-edit_subscriptions.txt +23 23 docs/serials/F-Receiving.txt +3 3 docs/serials/H-holdings_statements.txt + +commit b8d0ec9299bf079984619b0b932361413dd94f02 +Author: Ben Ostrowsky +Date: Tue Oct 15 16:52:27 2013 -0400 + + LP#1240207: Spellchecked the docs + + Signed-off-by: Ben Ostrowsky + Signed-off-by: Remington Steed + +1 1 docs/QueryParser_Changes.txt +7 7 docs/RELEASE_NOTES_2_2.txt +1 1 docs/RELEASE_NOTES_2_2_1.txt +4 4 docs/RELEASE_NOTES_2_3.txt +2 2 docs/RELEASE_NOTES_2_4.txt +1 1 docs/RELEASE_NOTES_NEXT/README +4 4 docs/TechRef/AutoSuggest/README +1 1 docs/TechRef/Circ/custom-best-hold-selection.txt +2 2 docs/TechRef/Flattener/design.txt +1 1 docs/TechRef/JSONGrammar.xml +1 1 docs/TechRef/JSONTutorial.xml +9 9 docs/TechRef/Telephony/telephony-setup-guide.txt +2 2 docs/TechRef/notify_csv.txt +1 1 docs/acquisitions/introduction.txt +4 4 docs/acquisitions/invoices.txt +1 1 docs/acquisitions/selection_lists_po.txt +3 3 docs/acquisitions/vandelay_acquisitions_integration.txt +3 3 docs/admin/Org_Unit_Proximity_Adjustments.txt +1 1 docs/admin/SMS_messaging.txt +5 5 docs/admin/acquisitions_admin.txt +2 2 docs/admin/authorities.txt +1 1 docs/admin/booking-admin.txt +1 1 docs/admin/circulation_limit_groups.txt +1 1 docs/admin/lsa-statcat.txt +1 1 docs/admin/restrict_Z39.50_sources_by_perm_group.txt +2 2 docs/admin/staff_client-login.txt +1 1 docs/admin/template_toolkit.txt +1 1 docs/admin/user_activity_type.txt +7 7 docs/admin/workstation_admin.txt +1 1 docs/admin_initial_setup/describing_your_people.txt +6 6 docs/admin_initial_setup/designing_your_catalog.txt +2 2 docs/admin_initial_setup/migrating_patron_data.txt +1 1 docs/admin_initial_setup/ordering_materials.txt +1 1 docs/cataloging/batch_importing_MARC.txt +1 1 docs/cataloging/conjoined_items.txt +1 2 docs/cataloging/monograph_parts.txt +1 1 docs/circulation/offline_mode.txt +3 3 docs/development/intro_opensrf.txt +1 1 docs/installation/server_installation.txt +1 1 docs/installation/staff_client_installation.txt +1 1 docs/installation/system_requirements.txt +1 1 docs/opac/advanced_features.txt +1 1 docs/opac/kids_opac.txt +1 1 docs/opac/my_lists.txt +2 2 docs/serials/C-subscription-SCV.txt +2 2 docs/serials/D-subscription-ASCV.txt +1 1 docs/serials/E-edit_subscriptions.txt +1 1 docs/serials/Group_Serials_Issues_in_the_OPAC_2.2.txt +1 1 docs/serials/H-holdings_statements.txt + +commit 211dcf5aea872bfbc0c36cd3ea6ca7da9c026db9 +Author: Dan Scott +Date: Mon Oct 21 11:12:06 2013 -0400 + + Fix "elfield" typo noted by Ben Ostrowsky + + Per sylvar in IRC and in + https://bugs.launchpad.net/evergreen/+bug/1240636, "elfield" should be + "selfield" (even though the code in question is currently inside an "#if + 0" block and will never execute). + + Signed-off-by: Dan Scott + +1 1 Open-ILS/src/c-apps/oils_sql.c + +commit d6688ef320cdeda5154ed1e374237688e79e3456 +Author: Dan Wells +Date: Mon Oct 14 16:07:17 2013 -0400 + + Fix typo in acq code to allow quick PO creation + + When using 'Actions for this Record'->'View/Place Orders', the + 'Create Purchase Order' button dies due to an undefined variable, + 'filter'. + + Looking at the commit which caused the problem, it seems like this + variable should have been 'state'. Simple testing bears this out. + + Original change was part of: + LP1193095 lineitem batch actions sanity filters + + Signed-off-by: Dan Wells + Signed-off-by: Bill Erickson + +1 1 Open-ILS/web/js/ui/default/acq/common/li_table.js + +commit 69416167a5da8dd3fa01187b81af771c0fde6d52 +Author: Dan Wells +Date: Mon Oct 14 15:24:39 2013 -0400 + + Fix integrated subscription editor record field + + When trying to edit a subscription using the new 'integrated' editor, + it foolishly tries to populate an unfiltered bre dropdown selector. + This works OK in test environments, but (as expected) fails miserably + with production-size data sets. + + The end result is that the dropdown either never populates, or takes + a really long time. If the user saves before the dropdown loads, the + associated record ID is lost, and the subscription is no longer + properly associated with the record. + + To fix this, simply turn the dropdown into a disabled text input + instead, as the ability to edit this field would generally be more + harmful than it is necessary. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +2 0 Open-ILS/web/js/ui/default/serial/subscription.js + +commit d7daf48b20186aa34aba7f6c3d68aa6f5fa8f940 +Author: Bill Erickson +Date: Wed Sep 4 14:55:57 2013 -0400 + + Vandelay copy overlay call number merge + + When overlaying a copy, if the copy brings with it a new call number + which collides with an existing call number AND said copy is the only + copy linked to its (old) call number, merge the copy's (old) call + number into the (new) existing call number, i.e. the one we collided + with. + + Signed-off-by: Bill Erickson + Signed-off-by: Dan Wells + +48 9 Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm + +commit 8a190982e8b0f557e7f8f2f52e5abdf4cb95f7a0 +Author: Bill Erickson +Date: Wed Sep 18 15:38:08 2013 -0400 + + ACQ general search sort funds; display year + + * Display fiscal year next to fund code in the search fund selector. + * Sort by newest fiscal year first, followed by code + + Signed-off-by: Bill Erickson + Signed-off-by: Dan Wells + +6 1 Open-ILS/web/js/ui/default/acq/search/unified.js + +commit c79d3f9bd62ed7fc21de920d950cc11f2893fb6d +Author: Dan Wells +Date: Thu Oct 10 15:54:40 2013 -0400 + + Adding 0842 due to 2_3 backport issues + + A clean backport of 0841 was not possible due to partial schema + differences in the upgrade. While we may have planned ahead better, + add a script just for 2_3 upgraders which ends up being a no-op for + 2_4+ + + Signed-off-by: Dan Wells + Signed-off-by: Remington Steed + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +11 0 Open-ILS/src/sql/Pg/upgrade/0842.schema.redo_config_metabib_field_sequence_2_3_to_2_4.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0842.schema.redo_config_metabib_field_sequence_2_3_to_2_4.sql + +commit 9f655af1015f66e12b75a8584b03672d16272f50 +Author: Dan Wells +Date: Thu Oct 10 13:32:41 2013 -0400 + + Stamping 0841: make space in config.metabib_field sequence + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +53 0 Open-ILS/src/sql/Pg/upgrade/0841.schema.redo_config_metabib_field_sequence.sql +0 53 Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0841.schema.redo_config_metabib_field_sequence.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql + +commit d660b73c828a49c5cb7ad61aa937dba018579ef5 +Author: Dan Wells +Date: Wed Oct 9 09:38:21 2013 -0400 + + Upgrade script for config.metabib_field sequence redo + + [LFW: s/DROP FUNCTION/DROP FUNCTION IF EXISTS/] + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +53 0 Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql + +commit 38a967b159327612ddfaaf4d210d7122e2a3e692 +Author: Dan Wells +Date: Wed Oct 9 09:29:01 2013 -0400 + + Make some FK constraints on config.metabib_field.id deferrable + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +2 2 Open-ILS/src/sql/Pg/002.schema.config.sql +1 1 Open-ILS/src/sql/Pg/030.schema.metabib.sql + +commit 9b803984418b52b2649a082dc5a3c6b80315499a +Author: Robert Soulliere +Date: Thu Oct 10 13:07:43 2013 -0400 + + Documentation: Update upgrade instructions to 2.4.2 + + Signed-off-by: Robert Soulliere + +13 12 docs/installation/server_upgrade.txt + +commit 9241a6a79be141059a7b0d8f2b328d36afb2e15a +Author: Elliot V +Date: Thu Oct 10 10:03:13 2013 -0400 + + Documentation: Update links in installation instructions. + + Addresses these bugs reported in launchpad: + https://bugs.launchpad.net/evergreen/+bug/1237781 + https://bugs.launchpad.net/evergreen/+bug/1237785 + + Signed-off-by: Robert Soulliere + +4 4 docs/installation/server_installation.txt + +commit 788ccaeeab5ea5a38bd48433f69ffe8c1368fb6d +Author: Jason Stephenson +Date: Thu May 9 15:33:04 2013 -0400 + + Set config.metabib_field_id_seq to 1000 in 950.data.seed-values.sql. + + Signed-off-by: Jason Stephenson + + Boosted to 1000 as suggested by Dan Scott and seconded by Bill + Erickson. + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/950.data.seed-values.sql + +commit bb6b0992b760cf98ba7481ee704b3357cb89dba7 +Author: Jason Stephenson +Date: Tue Oct 8 15:05:14 2013 -0400 + + Stamping upgrade script for 0840 circulation column picker data. + + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +24 0 Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql +0 24 Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql + +commit 421e084dde54bf29b365a8c4646473e0e6f94a27 +Author: Garry Collum +Date: Sun Aug 4 16:10:26 2013 -0400 + + lp1193487 Circulation Policy Column Picker not saving configuration. + + The circulation policy column picker is not saving its configuration + because ui.grid_columns.conify.config.circ_matrix_matchpoint is not + defined in the config.usr_setting_type table. This updates the sql + to populate the table. + + Signed-off-by: Garry Collum + Signed-off-by: Jason Stephenson + +17 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql +24 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql + +commit bd6222b211c2a52fb907e77ea20dd2ad268d39ab +Author: Dan Wells +Date: Mon Oct 7 16:10:04 2013 -0400 + + Stamping 0838 - remove bibcn normalizers + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +17 0 Open-ILS/src/sql/Pg/upgrade/0838.data.bibcn_index_normalizers.sql +0 17 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bibcn_index_normalizers.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0838.data.bibcn_index_normalizers.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bibcn_index_normalizers.sql + +commit 2063fe5d7fe535a2ad752af373138321f4546b04 +Author: Lebbeous Fogle-Weekley +Date: Wed Oct 2 15:28:35 2013 -0400 + + The identifier|bibcn field is best served by having no normalizers applied + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/950.data.seed-values.sql +17 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bibcn_index_normalizers.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bibcn_index_normalizers.sql + +commit 958fc7cf67d38fd57f165a481f45d855e94c44f8 +Author: Lebbeous Fogle-Weekley +Date: Wed Oct 2 15:18:17 2013 -0400 + + OPAC: Make advanced search -> numeric search -> bib cn hone in on right target + + The bib call number search under the advanced search page's numeric + search pane was doing the wrong thing. By thinking the search field + desired was called 'bib_cn' where it's actually called 'bibcn', it + generated searches that just fell back to the broader search class + 'identifier'. This would often find your matches, but would also find + too many records that *shouldn't* have been matches. + + Discovered with help from Erica Rohlfs and Mike Rylander. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 + +commit b40cf110454ef5f85611dabaaa4c93e71f85cef1 +Author: Robert Soulliere +Date: Thu Oct 3 15:48:19 2013 -0400 + + Documentation: Add migrating patron data from 2.1 docs. + + Converted and added documentation from http://docs.evergreen-ils.org/2.1/html/migratingpatrons.html. + + Signed-off-by: Robert Soulliere + +228 0 docs/admin_initial_setup/migrating_patron_data.txt +2 0 docs/root.txt + create mode 100644 docs/admin_initial_setup/migrating_patron_data.txt diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm index d7235ce61a..350ac7d773 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS.pm @@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system =cut -our $VERSION = '2.4'; +our $VERSION = '2.0404'; 1; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 2888c93918..f7319a8dcc 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper; sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "HEAD"; + return "2-4-4"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index ec12489ed2..eecbfb1e04 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0848', :eg_version); -- miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.4.4', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql new file mode 100644 index 0000000000..2a4705d1cf --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql @@ -0,0 +1,445 @@ +--Upgrade Script for 2.4.3 to 2.4.4 +\set eg_version '''2.4.4''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.4.4', :eg_version); + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0838', :eg_version); + +DELETE FROM config.metabib_field_index_norm_map + WHERE field = 25 AND norm IN ( + SELECT id + FROM config.index_normalizer + WHERE func IN ('search_normalize','split_date_range') + ); + + +SELECT evergreen.upgrade_deps_block_check('0840', :eg_version); + +INSERT INTO config.usr_setting_type (name,grp,opac_visible,label,description,datatype) VALUES ( + 'ui.grid_columns.conify.config.circ_matrix_matchpoint', + 'gui', + FALSE, + oils_i18n_gettext( + 'ui.grid_columns.conify.config.circ_matrix_matchpoint', + 'Circulation Policy Configuration', + 'cust', + 'label' + ), + oils_i18n_gettext( + 'ui.grid_columns.conify.config.circ_matrix_matchpoint', + 'Circulation Policy Configuration Column Settings', + 'cust', + 'description' + ), + 'string' +); + + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0841', :eg_version); + +ALTER TABLE config.metabib_field_ts_map DROP CONSTRAINT metabib_field_ts_map_metabib_field_fkey; +ALTER TABLE config.metabib_search_alias DROP CONSTRAINT metabib_search_alias_field_fkey; +ALTER TABLE metabib.browse_entry_def_map DROP CONSTRAINT browse_entry_def_map_def_fkey; + +ALTER TABLE config.metabib_field_ts_map ADD CONSTRAINT metabib_field_ts_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE config.metabib_search_alias ADD CONSTRAINT metabib_search_alias_field_fkey FOREIGN KEY (field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE metabib.browse_entry_def_map ADD CONSTRAINT browse_entry_def_map_def_fkey FOREIGN KEY (def) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; + + +DROP FUNCTION IF EXISTS config.modify_metabib_field(source INT, target INT); +CREATE FUNCTION config.modify_metabib_field(v_source INT, target INT) RETURNS INT AS $func$ +DECLARE + f_class TEXT; + check_id INT; + target_id INT; +BEGIN + SELECT field_class INTO f_class FROM config.metabib_field WHERE id = v_source; + IF NOT FOUND THEN + RETURN 0; + END IF; + IF target IS NULL THEN + target_id = v_source + 1000; + ELSE + target_id = target; + END IF; + SELECT id FROM config.metabib_field INTO check_id WHERE id = target_id; + IF FOUND THEN + RAISE NOTICE 'Cannot bump config.metabib_field.id from % to %; the target ID already exists.', v_source, target_id; + RETURN 0; + END IF; + UPDATE config.metabib_field SET id = target_id WHERE id = v_source; + EXECUTE ' UPDATE metabib.' || f_class || '_field_entry SET field = ' || target_id || ' WHERE field = ' || v_source; + UPDATE config.metabib_field_ts_map SET metabib_field = target_id WHERE metabib_field = v_source; + UPDATE config.metabib_field_index_norm_map SET field = target_id WHERE field = v_source; + UPDATE search.relevance_adjustment SET field = target_id WHERE field = v_source; + UPDATE config.metabib_search_alias SET field = target_id WHERE field = v_source; + UPDATE metabib.browse_entry_def_map SET def = target_id WHERE def = v_source; + RETURN 1; +END; +$func$ LANGUAGE PLPGSQL; + +SELECT config.modify_metabib_field(id, NULL) + FROM config.metabib_field + WHERE id > 30; + +SELECT SETVAL('config.metabib_field_id_seq', GREATEST(1000, (SELECT MAX(id) FROM config.metabib_field))); + + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0842', :eg_version); + +-- this upgrade is only for people coming from 2_3, and is a NO-OP for those on 2_4 or later +ALTER TABLE config.metabib_field_ts_map DROP CONSTRAINT metabib_field_ts_map_metabib_field_fkey; + +ALTER TABLE config.metabib_field_ts_map ADD CONSTRAINT metabib_field_ts_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; + + +SELECT evergreen.upgrade_deps_block_check('0846', :eg_version); + +CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT, field TEXT, force_add INT ) RETURNS TEXT AS $_$ + + use MARC::Record; + use MARC::File::XML (BinaryEncoding => 'UTF-8'); + use MARC::Charset; + use strict; + + MARC::Charset->assume_unicode(1); + + my $target_xml = shift; + my $source_xml = shift; + my $field_spec = shift; + my $force_add = shift || 0; + + my $target_r = MARC::Record->new_from_xml( $target_xml ); + my $source_r = MARC::Record->new_from_xml( $source_xml ); + + return $target_xml unless ($target_r && $source_r); + + my @field_list = split(',', $field_spec); + + my %fields; + for my $f (@field_list) { + $f =~ s/^\s*//; $f =~ s/\s*$//; + if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) { + my $field = $1; + $field =~ s/\s+//; + my $sf = $2; + $sf =~ s/\s+//; + my $match = $3; + $match =~ s/^\s*//; $match =~ s/\s*$//; + $fields{$field} = { sf => [ split('', $sf) ] }; + if ($match) { + my ($msf,$mre) = split('~', $match); + if (length($msf) > 0 and length($mre) > 0) { + $msf =~ s/^\s*//; $msf =~ s/\s*$//; + $mre =~ s/^\s*//; $mre =~ s/\s*$//; + $fields{$field}{match} = { sf => $msf, re => qr/$mre/ }; + } + } + } + } + + for my $f ( keys %fields) { + if ( @{$fields{$f}{sf}} ) { + for my $from_field ($source_r->field( $f )) { + my @tos = $target_r->field( $f ); + if (!@tos) { + next if (exists($fields{$f}{match}) and !$force_add); + my @new_fields = map { $_->clone } $source_r->field( $f ); + $target_r->insert_fields_ordered( @new_fields ); + } else { + for my $to_field (@tos) { + if (exists($fields{$f}{match})) { + next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf})); + } + for my $old_sf ($from_field->subfields) { + $to_field->add_subfields( @$old_sf ) if grep(/$$old_sf[0]/,@{$fields{$f}{sf}}); + } + } + } + } + } else { + my @new_fields = map { $_->clone } $source_r->field( $f ); + $target_r->insert_fields_ordered( @new_fields ); + } + } + + $target_xml = $target_r->as_xml_record; + $target_xml =~ s/^<\?.+?\?>$//mo; + $target_xml =~ s/\n//sgo; + $target_xml =~ s/>\s+ 0 THEN + FOR bib_field IN SELECT * FROM authority.control_set_bib_field WHERE authority_field = main_entry.id LOOP + SELECT XMLELEMENT( -- XMLAGG avoids magical creation, but requires unnest subquery + name datafield, + XMLATTRIBUTES(bib_field.tag AS tag, auth_i1 AS ind1, auth_i2 AS ind2), + XMLAGG(UNNEST) + ) INTO tmp_data FROM UNNEST(XPATH('//*[local-name()="subfield"]', auth_field[1])); + replace_data := replace_data || tmp_data; + replace_rules := replace_rules || ( bib_field.tag || main_entry.sf_list || E'[0~\\)' || auth_id || '$]' ); + tmp_data = NULL; + END LOOP; + EXIT; + END IF; + END LOOP; + + SELECT XMLAGG(UNNEST) INTO tmp_data FROM UNNEST(replace_data); + + RETURN XMLELEMENT( + name record, + XMLATTRIBUTES('http://www.loc.gov/MARC21/slim' AS xmlns), + XMLELEMENT( name leader, '00881nam a2200193 4500'), + tmp_data, + XMLELEMENT( + name datafield, + XMLATTRIBUTES( '905' AS tag, ' ' AS ind1, ' ' AS ind2), + XMLELEMENT( + name subfield, + XMLATTRIBUTES('r' AS code), + ARRAY_TO_STRING(replace_rules,',') + ) + ) + )::TEXT; +END; +$f$ STABLE LANGUAGE PLPGSQL; + + +SELECT evergreen.upgrade_deps_block_check('0848', :eg_version); + +CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT, no_thesaurus BOOL ) RETURNS TEXT AS $func$ +DECLARE + acsaf authority.control_set_authority_field%ROWTYPE; + tag_used TEXT; + nfi_used TEXT; + sf TEXT; + sf_node TEXT; + tag_node TEXT; + thes_code TEXT; + cset INT; + heading_text TEXT; + tmp_text TEXT; + first_sf BOOL; + auth_id INT DEFAULT COALESCE(NULLIF(oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml), ''), '0')::INT; +BEGIN + SELECT control_set INTO cset FROM authority.record_entry WHERE id = auth_id; + + IF cset IS NULL THEN + SELECT control_set INTO cset + FROM authority.control_set_authority_field + WHERE tag IN ( SELECT UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[])) + LIMIT 1; + END IF; + + thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj'); + IF thes_code IS NULL THEN + thes_code := '|'; + ELSIF thes_code = 'z' THEN + thes_code := COALESCE( oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml), '' ); + END IF; + + heading_text := ''; + FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset AND main_entry IS NULL LOOP + tag_used := acsaf.tag; + nfi_used := acsaf.nfi; + first_sf := TRUE; + + FOR tag_node IN SELECT unnest(oils_xpath('//*[@tag="'||tag_used||'"]',marcxml)) LOOP + FOR sf_node IN SELECT unnest(oils_xpath('//*[contains("'||acsaf.sf_list||'",@code)]',tag_node)) LOOP + + tmp_text := oils_xpath_string('.', sf_node); + sf := oils_xpath_string('./@code', sf_node); + + IF first_sf AND tmp_text IS NOT NULL AND nfi_used IS NOT NULL THEN + + tmp_text := SUBSTRING( + tmp_text FROM + COALESCE( + NULLIF( + REGEXP_REPLACE( + oils_xpath_string('./@ind'||nfi_used, tag_node), + $$\D+$$, + '', + 'g' + ), + '' + )::INT, + 0 + ) + 1 + ); + + END IF; + + first_sf := FALSE; + + IF tmp_text IS NOT NULL AND tmp_text <> '' THEN + heading_text := heading_text || E'\u2021' || sf || ' ' || tmp_text; + END IF; + END LOOP; + + EXIT WHEN heading_text <> ''; + END LOOP; + + EXIT WHEN heading_text <> ''; + END LOOP; + + IF heading_text <> '' THEN + IF no_thesaurus IS TRUE THEN + heading_text := tag_used || ' ' || public.naco_normalize(heading_text); + ELSE + heading_text := tag_used || '_' || COALESCE(nfi_used,'-') || '_' || thes_code || ' ' || public.naco_normalize(heading_text); + END IF; + ELSE + heading_text := 'NOHEADING_' || thes_code || ' ' || MD5(marcxml); + END IF; + + RETURN heading_text; +END; +$func$ LANGUAGE PLPGSQL IMMUTABLE; + +CREATE OR REPLACE FUNCTION authority.simple_heading_set( marcxml TEXT ) RETURNS SETOF authority.simple_heading AS $func$ +DECLARE + res authority.simple_heading%ROWTYPE; + acsaf authority.control_set_authority_field%ROWTYPE; + tag_used TEXT; + nfi_used TEXT; + sf TEXT; + cset INT; + heading_text TEXT; + sort_text TEXT; + tmp_text TEXT; + tmp_xml TEXT; + first_sf BOOL; + auth_id INT DEFAULT oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml)::INT; +BEGIN + + res.record := auth_id; + + SELECT control_set INTO cset + FROM authority.control_set_authority_field + WHERE tag IN ( SELECT UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[]) ) + LIMIT 1; + + FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset LOOP + + res.atag := acsaf.id; + tag_used := acsaf.tag; + nfi_used := acsaf.nfi; + + FOR tmp_xml IN SELECT UNNEST(XPATH('//*[@tag="'||tag_used||'"]', marcxml::XML)) LOOP + + heading_text := public.naco_normalize( + COALESCE( + oils_xpath_string('//*[contains("'||acsaf.sf_list||'",@code)]',tmp_xml::TEXT, ' '), + '' + ) + ); + + IF nfi_used IS NOT NULL THEN + + sort_text := SUBSTRING( + heading_text FROM + COALESCE( + NULLIF( + REGEXP_REPLACE( + oils_xpath_string('./@ind'||nfi_used, tmp_xml::TEXT), + $$\D+$$, + '', + 'g' + ), + '' + )::INT, + 0 + ) + 1 + ); + + ELSE + sort_text := heading_text; + END IF; + + IF heading_text IS NOT NULL AND heading_text <> '' THEN + res.value := heading_text; + res.sort_value := sort_text; + RETURN NEXT res; + END IF; + + END LOOP; + + END LOOP; + + RETURN; +END; +$func$ LANGUAGE PLPGSQL IMMUTABLE; + + +COMMIT; + +\qecho If your site's bibcn searches are affected the issue addressed in 0838 +\qecho you may wish to reingest your bib records now. It's probably not worth +\qecho it for many sites. + + diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index 2737f47bf1..7c5d736c59 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_4_4

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 0613a13ddf..7a1b9cfd0b 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_4_4"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index e0bc1ef5df..0638a4e581 100644 --- a/Open-ILS/xul/staff_client/windowssetup.nsi +++ b/Open-ILS/xul/staff_client/windowssetup.nsi @@ -3,7 +3,7 @@ ; HM NIS Edit Wizard helper defines ; Old versions of makensis don't like this, moved to Makefile ;!define /file PRODUCT_VERSION "client/VERSION" -!define PRODUCT_TAG "Master" +!define PRODUCT_TAG "2.4" !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}" !define UI_IMAGESET "beta" ;!define UI_IMAGESET "release" diff --git a/README b/README deleted file mode 120000 index b57451acb4..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/installation/server_installation.txt \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000000..b4506022b8 --- /dev/null +++ b/README @@ -0,0 +1,535 @@ +Installing the Evergreen server +=============================== +:toc: +:numbered: + +Preamble: referenced user accounts +---------------------------------- + +In subsequent sections, we will refer to a number of different accounts, as +follows: + + * Linux user accounts: + ** The *user* Linux account is the account that you use to log onto the + Linux system as a regular user. + ** The *root* Linux account is an account that has system administrator + privileges. On Debian and Fedora you can switch to this account from + your *user* account by issuing the `su -` command and entering the + password for the *root* account when prompted. On Ubuntu you can switch + to this account from your *user* account using the `sudo su -` command + and entering the password for your *user* account when prompted. + ** The *opensrf* Linux account is an account that you create when installing + OpenSRF. You can switch to this account from the *root* account by + issuing the `su - opensrf` command. + ** The *postgres* Linux account is created automatically when you install + the PostgreSQL database server. You can switch to this account from the + *root* account by issuing the `su - postgres` command. + * PostgreSQL user accounts: + ** The *evergreen* PostgreSQL account is a superuser account that you will + create to connect to the PostgreSQL database server. + * Evergreen administrator account: + ** The *egadmin* Evergreen account is an administrator account for + Evergreen that you will use to test connectivity and configure your + Evergreen instance. + +Preamble: developer instructions +-------------------------------- + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +After running `make install`, developers also need to install the Dojo Toolkit +set of JavaScript libraries. The appropriate version of Dojo is included +in Evergreen release tarballs. Developers should install the Dojo 1.3.3 +version of Dojo by issuing the following commands as the *opensrf* Linux +account: + +[source, bash] +------------------------------------------------------------------------------ +wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz +tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz +cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/. +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + +Evergreen has a number of prerequisite packages that must be installed +before you can successfully configure, compile, and install Evergreen. + +1. Begin by installing the most recent version of OpenSRF (2.2 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/ +2. On many distributions, it is necessary to install PostgreSQL 9 from external + repositories. ++ + * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the + *root* Linux account and add the following line: ++ +[source, bash] +------------------------------------------------------------------------------ +deb http://backports.debian.org/debian-backports squeeze-backports main contrib +------------------------------------------------------------------------------ ++ + * On Ubuntu Lucid, you can use a PPA (personal package archive), which are + package sources hosted on Launchpad. The one most commonly used by Evergreen + Community members is maintained by Martin Pitt, who also maintains the + official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue + the following commands to add the PPA source: ++ +[source, bash] +------------------------------------------------------------------------------ +apt-get install python-software-properties +add-apt-repository ppa:pitti/postgresql +------------------------------------------------------------------------------ ++ + * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. ++ + * Fedora comes with PostgreSQL 9, so no additional steps are required. ++ +3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to + retrieve the new packages from the backports repository. +4. Issue the following commands as the *root* Linux account to install + prerequisites using the `Makefile.install` prerequisite installer, + substituting `debian-squeeze`, `fedora`, `ubuntu-lucid`, or + `ubuntu-precise` for below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +5. Add the libdbi-libdbd libraries to the system dynamic library path by + issuing the following commands as the *root* Linux account: ++ +[NOTE] +You should skip this step if installing on Ubuntu Precise. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ ++ +.Fedora +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ + +Configuration and compilation instructions +------------------------------------------ + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +These instructions assume that you have also installed OpenSRF under `/openils/`. +If not, please adjust PATH as needed so that the Evergreen `configure` script +can find `osrf_config`. + +Installation instructions +------------------------- + +1. Once you have configured and compiled Evergreen, issue the following + command as the *root* Linux account to install Evergreen, build the server + portion of the staff client, and copy example configuration files to + `/openils/conf`. + Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version + of the staff client that you will use to connect to the Evergreen server. ++ +[source, bash] +------------------------------------------------------------------------------ +make STAFF_CLIENT_STAMP_ID=rel_2_4_4 install +------------------------------------------------------------------------------ ++ +2. The server portion of the staff client expects `http://hostname/xul/server` + to resolve. Issue the following commands as the *root* Linux account to + create a symbolic link pointing to the `server` subdirectory of the server + portion of the staff client that we just built using the staff client ID + 'rel_name': ++ +[source, bash] +------------------------------------------------------------------------------ +cd /openils/var/web/xul +ln -sf rel_name/server server +------------------------------------------------------------------------------ + +Change ownership of the Evergreen files +--------------------------------------- + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +Configure the Apache Web server +------------------------------- + +1. Use the example configuration files in `Open-ILS/examples/apache/` (for +Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache +versions 2.4 or greater) to configure your Web server for the Evergreen +catalog, staff client, Web services, and administration interfaces. Issue the +following commands as the *root* Linux account: ++ +.Debian and Ubuntu +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/ +cp Open-ILS/examples/apache/eg_startup /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------ ++ +.Fedora +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/ +cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf +cp Open-ILS/examples/apache/eg_startup /etc/httpd/ +# Now set up SSL +mkdir /etc/httpd/ssl +cd /etc/httpd/ssl +------------------------------------------------------------------------------ ++ +2. The `openssl` command cuts a new SSL key for your Apache server. For a +production server, you should purchase a signed SSL certificate, but you can +just use a self-signed certificate and accept the warnings in the staff client +and browser during testing and development. Create an SSL key for the Apache +server by issuing the following command as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------ +openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key +------------------------------------------------------------------------------ ++ +3. As the *root* Linux account, edit the `eg.conf` file that you copied into +place. + a. To enable access to the offline upload / execute interface from any + workstation on any network, make the following change (and note that + you *must* secure this for a production instance): + * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all` + * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted` + b. (Fedora): Change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +4. Change the user for the Apache server. + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to + `export APACHE_RUN_USER=opensrf`. + * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`. + Change `User apache` to `User opensrf`. +5. Configure Apache with performance settings appropriate for Evergreen: + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/apache2.conf`: + * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`: + a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of + a request timing out unexpectedly, but increase the risk of using up + all available Apache child processes. + b. 'Optional': Change `MaxKeepAliveRequests` to `100` + c. Update the prefork configuration section to suit your environment. The + following settings apply to a busy system: ++ +[source,bash] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ ++ +6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf` + file to change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ + +Configure OpenSRF for the Evergreen application +----------------------------------------------- +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config`, described in the following section, sets the database +connection information in `opensrf.xml` for you. + +Creating the Evergreen database +------------------------------- + +By default, the `Makefile.install` prerequisite installer does not install +the PostgreSQL 9 database server required by every Evergreen system; +for production use, most libraries install the PostgreSQL database server on a +dedicated machine. You can install the packages required by Debian or Ubuntu Lucid +on the machine of your choice using the following commands as the *root* +Linux account: + +.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91 +------------------------------------------------------------------------------ + +.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91 +------------------------------------------------------------------------------ + +You can install the packages required by Fedora on the machine of your choice +using the following commands as the *root* Linux account: + +.(Fedora) Installing PostgreSQL server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server +postgresql-setup initdb +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules as the +*root* Linux account: + +.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +aptitude install gcc libxml-libxml-perl libxml-libxslt-perl +cpan Business::ISBN +cpan JSON::XS +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +cpan Rose::URI +------------------------------------------------------------------------------ + +.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN +yum install perl-Library-CallNumber-LC perl-MARC-Record perl-MARC-Charset +yum install perl-MARC-File-XML perl-UUID-Tiny +------------------------------------------------------------------------------ + +You need to create a PostgreSQL superuser to create and access the database. +Issue the following command as the *postgres* Linux account to create a new +PostgreSQL superuser named `evergreen`. When prompted, enter the new user's +password: + +[source, bash] +------------------------------------------------------------------------------ +createuser -s -P evergreen +------------------------------------------------------------------------------ + +Once you have created the *evergreen* PostgreSQL account, you also need to +create the database and schema, and configure your configuration files to point +at the database server. Issue the following command as the *root* Linux account +from inside the Evergreen source directory, replacing , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config --update-config \ + --service all --create-database --create-schema --create-offline \ + --user --password --hostname --port \ + --database --admin-user --admin-pass +------------------------------------------------------------------------------ + +This creates the database and schema and configures all of the services in +your `/openils/conf/opensrf.xml` configuration file to point to that database. +It also creates the configuration files required by the Evergreen `cgi-bin` +administration scripts, and sets the user name and password for the *egadmin* +Evergreen administrator account to your requested values. + +Creating the database on a remote server +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In a production instance of Evergreen, your PostgreSQL server should be +installed on a dedicated server. + +PostgreSQL 9.1 and later +^^^^^^^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.1 or later, simply use the `--create-database` flag on `eg_db_config`. + +Starting Evergreen +------------------ +1. As the *root* Linux account, start the `memcached` and `ejabberd` services +(if they aren't already running): ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/ejabberd start +/etc/init.d/memcached start +------------------------------------------------------------------------------ ++ +2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the +following command is only necessary if you want to force Evergreen to treat the +hostname as `localhost`; if you configured `opensrf.xml` using the real +hostname of your machine as returned by `perl -ENet::Domain 'print +Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag. ++ +[source, bash] +------------------------------------------------------------------------------ +osrf_ctl.sh -l -a start_all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_ctl.sh: command not found`, + then your environment variable `PATH` does not include the `/openils/bin` + directory; this should have been set in the *opensrf* Linux account's + `.bashrc` configuration file. To manually set the `PATH` variable, edit the + configuration file `~/.bashrc` as the *opensrf* Linux account and add the + following line: ++ +[source, bash] +------------------------------------------------------------------------------ +export PATH=$PATH:/openils/bin +------------------------------------------------------------------------------ ++ +3. As the *opensrf* Linux account, generate the Web files needed by the staff + client and catalogue and update the organization unit proximity (you need to do + this the first time you start Evergreen, and after that each time you change + the library hierarchy in `config.cgi`): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh -u +------------------------------------------------------------------------------ ++ +4. As the *root* Linux account, restart the Apache Web server: ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/apache2 restart +------------------------------------------------------------------------------ ++ +If the Apache Web server was running when you started the OpenSRF services, you +might not be able to successfully log in to the OPAC or staff client until the +Apache Web server is restarted. + +Testing connections to Evergreen +-------------------------------- + +Once you have installed and started Evergreen, test your connection to +Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following +commands to start `srfsh` and try to log onto the Evergreen server using the +*egadmin* Evergreen administrator user name and password that you set using the +`eg_db_config` command: + +[source, bash] +------------------------------------------------------------------------------ +/openils/bin/srfsh +srfsh% login +------------------------------------------------------------------------------ + +You should see a result like: + + Received Data: "250bf1518c7527a03249858687714376" + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 0.045286 + ------------------------------------ + + Received Data: { + "ilsevent":0, + "textcode":"SUCCESS", + "desc":" ", + "pid":21616, + "stacktrace":"oils_auth.c:304", + "payload":{ + "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a", + "authtime":420 + } + + } + + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 1.336568 + ------------------------------------ + +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux account, run the `settings-tester.pl` script to see + if it finds any system configuration problems. The script is found at + `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source + tree. + * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide]. + * If you have faithfully followed the entire set of installation steps + listed here, you are probably extremely close to a working system. + Gather your configuration files and log files and contact the + http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development +mailing list] for assistance before making any drastic changes to your system + configuration. + +Getting help +------------ + +Need help installing or using Evergreen? Join the mailing lists at +http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode +IRC network on the #evergreen channel. + +License +------- +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 +Unported License. To view a copy of this license, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. diff --git a/configure.ac b/configure.ac index fab6180e0c..0d5c418837 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.4.4, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.4.4]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_SUBST(prefix)