From 5738d35d882c392f2cbe479d3333ef52df3ff2e1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 20 Mar 2013 09:43:37 -0400 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Bill Erickson --- ChangeLog | 1393 +++++++++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql | 619 +++++++++ .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- Open-ILS/xul/staff_client/windowssetup.nsi | 2 +- README | 550 +++++++- configure.ac | 4 +- 9 files changed, 2565 insertions(+), 10 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..5b70024bd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1390 @@ -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 2536539714eebcccc58d2dfb6997160cc91a94b2 +Author: Bill Erickson +Date: Wed Mar 20 09:43:06 2013 -0400 + + Setting OpenILS.pm VERSION 2.0305 + + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit fccf63aa4c38042e815530d101e120957e213ffa +Author: Bill Erickson +Date: Wed Mar 20 09:21:46 2013 -0400 + + 2.3.5 Translations repair Finnish Last-Translator + + Signed-off-by: Bill Erickson + +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 +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +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 +1 1 build/i18n/po/capture.js/fi-FI.po +1 1 build/i18n/po/cat.properties/fi-FI.po +1 1 build/i18n/po/circ.properties/fi-FI.po +1 1 build/i18n/po/common.properties/fi-FI.po +1 1 build/i18n/po/conify.js/fi-FI.po +1 1 build/i18n/po/db.seed/fi-FI.po +1 1 build/i18n/po/fm_IDL.dtd/fi-FI.po +1 1 build/i18n/po/ils_events.xml/fi-FI.po +1 1 build/i18n/po/lang.dtd/fi-FI.po +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 +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 +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 +1 1 build/i18n/po/selfcheck.js/fi-FI.po +1 1 build/i18n/po/serial.properties/fi-FI.po + +commit 02dc7d23617d3ebf5cb69b58232d5ca1a34130a9 +Author: Bill Erickson +Date: Wed Mar 20 09:15:45 2013 -0400 + + 2.3.5 Translations newpot + + Signed-off-by: Bill Erickson + +1 7 build/i18n/po/acq.js/acq.js.pot +1 13 build/i18n/po/circ.properties/circ.properties.pot +1 5 build/i18n/po/common.properties/common.properties.pot +717 717 build/i18n/po/db.seed/db.seed.pot +10 10 build/i18n/po/ils_events.xml/ils_events.xml.pot +1 74 build/i18n/po/lang.dtd/lang.dtd.pot +1 1 build/i18n/po/multiclass_search_help.html/multiclass_search_help.html.pot +1 15 build/i18n/po/offline.properties/offline.properties.pot +5 5 build/i18n/po/patron.properties/patron.properties.pot +74 328 build/i18n/po/tpac/tpac.pot + +commit 4e150b839dafbb5c44a3ee77f91b1346b6abcb7e +Author: Bill Erickson +Date: Wed Mar 20 09:12:17 2013 -0400 + + 2.3.5 Translations Import + + Signed-off-by: Bill Erickson + +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 +3 3 build/i18n/po/XULTermLoader.js/cs-CZ.po +3 3 build/i18n/po/XULTermLoader.js/de-DE.po +3 3 build/i18n/po/XULTermLoader.js/en-CA.po +3 3 build/i18n/po/XULTermLoader.js/en-GB.po +3 3 build/i18n/po/XULTermLoader.js/es-ES.po +4 4 build/i18n/po/XULTermLoader.js/fi-FI.po +3 3 build/i18n/po/XULTermLoader.js/fr-CA.po +3 3 build/i18n/po/XULTermLoader.js/hy-AM.po +3 3 build/i18n/po/XULTermLoader.js/oc-FR.po +3 3 build/i18n/po/XULTermLoader.js/pt-BR.po +3 3 build/i18n/po/XULTermLoader.js/ru-RU.po +3 3 build/i18n/po/XULTermLoader.js/tr-TR.po +1 1 build/i18n/po/admin.properties/fi-FI.po +5 5 build/i18n/po/admin.properties/ru-RU.po +1 1 build/i18n/po/auth.properties/fi-FI.po +7 7 build/i18n/po/authority.js/fi-FI.po +102 0 build/i18n/po/authority.js/ru-RU.po +3 3 build/i18n/po/capture.js/cs-CZ.po +3 3 build/i18n/po/capture.js/de-DE.po +3 3 build/i18n/po/capture.js/en-CA.po +3 3 build/i18n/po/capture.js/en-GB.po +3 3 build/i18n/po/capture.js/es-ES.po +6 6 build/i18n/po/capture.js/fi-FI.po +3 3 build/i18n/po/capture.js/fr-CA.po +3 3 build/i18n/po/capture.js/hy-AM.po +3 3 build/i18n/po/capture.js/oc-FR.po +3 3 build/i18n/po/capture.js/pt-BR.po +3 3 build/i18n/po/capture.js/ru-RU.po +83 83 build/i18n/po/cat.properties/fi-FI.po +4 4 build/i18n/po/cat.properties/pt-BR.po +15 6 build/i18n/po/circ.properties/cs-CZ.po +10 4 build/i18n/po/circ.properties/de-DE.po +14 5 build/i18n/po/circ.properties/en-CA.po +14 5 build/i18n/po/circ.properties/en-GB.po +15 6 build/i18n/po/circ.properties/es-ES.po +69 58 build/i18n/po/circ.properties/fi-FI.po +14 5 build/i18n/po/circ.properties/fr-CA.po +14 5 build/i18n/po/circ.properties/hy-AM.po +10 4 build/i18n/po/circ.properties/oc-FR.po +21 10 build/i18n/po/circ.properties/pt-BR.po +15 6 build/i18n/po/circ.properties/ru-RU.po +10 4 build/i18n/po/circ.properties/tr-TR.po +17 17 build/i18n/po/common.properties/fi-FI.po +5 5 build/i18n/po/common.properties/pt-BR.po +11 11 build/i18n/po/conify.dtd/fi-FI.po +26 6 build/i18n/po/conify.js/cs-CZ.po +25 5 build/i18n/po/conify.js/de-DE.po +26 6 build/i18n/po/conify.js/en-CA.po +26 6 build/i18n/po/conify.js/en-GB.po +26 6 build/i18n/po/conify.js/es-ES.po +37 16 build/i18n/po/conify.js/fi-FI.po +26 6 build/i18n/po/conify.js/fr-CA.po +26 6 build/i18n/po/conify.js/hy-AM.po +25 5 build/i18n/po/conify.js/oc-FR.po +26 6 build/i18n/po/conify.js/pt-BR.po +26 6 build/i18n/po/conify.js/ru-RU.po +25 5 build/i18n/po/conify.js/tr-TR.po +799 786 build/i18n/po/db.seed/cs-CZ.po +794 781 build/i18n/po/db.seed/de-DE.po +798 785 build/i18n/po/db.seed/en-CA.po +798 785 build/i18n/po/db.seed/en-GB.po +794 781 build/i18n/po/db.seed/es-ES.po +830 815 build/i18n/po/db.seed/fi-FI.po +800 787 build/i18n/po/db.seed/fr-CA.po +803 790 build/i18n/po/db.seed/hy-AM.po +796 783 build/i18n/po/db.seed/oc-FR.po +817 804 build/i18n/po/db.seed/pt-BR.po +798 785 build/i18n/po/db.seed/ru-RU.po +794 781 build/i18n/po/db.seed/tr-TR.po +2805 2471 build/i18n/po/fm_IDL.dtd/cs-CZ.po +2782 2448 build/i18n/po/fm_IDL.dtd/de-DE.po +2797 2463 build/i18n/po/fm_IDL.dtd/en-CA.po +2795 2461 build/i18n/po/fm_IDL.dtd/en-GB.po +2782 2448 build/i18n/po/fm_IDL.dtd/es-ES.po +2905 2573 build/i18n/po/fm_IDL.dtd/fi-FI.po +2782 2448 build/i18n/po/fm_IDL.dtd/fr-CA.po +2798 2464 build/i18n/po/fm_IDL.dtd/hy-AM.po +2780 2446 build/i18n/po/fm_IDL.dtd/oc-FR.po +2793 2459 build/i18n/po/fm_IDL.dtd/pt-BR.po +2793 2459 build/i18n/po/fm_IDL.dtd/ru-RU.po +2780 2446 build/i18n/po/fm_IDL.dtd/tr-TR.po +131 102 build/i18n/po/ils_events.xml/cs-CZ.po +113 97 build/i18n/po/ils_events.xml/de-DE.po +128 103 build/i18n/po/ils_events.xml/en-CA.po +128 103 build/i18n/po/ils_events.xml/en-GB.po +113 97 build/i18n/po/ils_events.xml/es-ES.po +150 117 build/i18n/po/ils_events.xml/fi-FI.po +126 101 build/i18n/po/ils_events.xml/fr-CA.po +132 103 build/i18n/po/ils_events.xml/hy-AM.po +116 97 build/i18n/po/ils_events.xml/pt-BR.po +114 95 build/i18n/po/ils_events.xml/ru-RU.po +179 17 build/i18n/po/lang.dtd/ar-AR.po +196 35 build/i18n/po/lang.dtd/cs-CZ.po +185 20 build/i18n/po/lang.dtd/de-DE.po +194 33 build/i18n/po/lang.dtd/en-CA.po +192 27 build/i18n/po/lang.dtd/en-GB.po +179 17 build/i18n/po/lang.dtd/es-ES.po +375 206 build/i18n/po/lang.dtd/fi-FI.po +192 27 build/i18n/po/lang.dtd/fr-CA.po +195 34 build/i18n/po/lang.dtd/hy-AM.po +185 20 build/i18n/po/lang.dtd/oc-FR.po +183 18 build/i18n/po/lang.dtd/pt-BR.po +183 18 build/i18n/po/lang.dtd/ru-RU.po +179 17 build/i18n/po/lang.dtd/tr-TR.po +13 5 build/i18n/po/offline.properties/cs-CZ.po +11 3 build/i18n/po/offline.properties/de-DE.po +11 3 build/i18n/po/offline.properties/en-CA.po +11 3 build/i18n/po/offline.properties/en-GB.po +11 3 build/i18n/po/offline.properties/es-ES.po +38 30 build/i18n/po/offline.properties/fi-FI.po +11 3 build/i18n/po/offline.properties/fr-CA.po +12 4 build/i18n/po/offline.properties/hy-AM.po +11 3 build/i18n/po/offline.properties/oc-FR.po +11 3 build/i18n/po/offline.properties/pt-BR.po +11 3 build/i18n/po/offline.properties/ru-RU.po +11 3 build/i18n/po/offline.properties/tr-TR.po +18 9 build/i18n/po/opac.dtd/cs-CZ.po +14 8 build/i18n/po/opac.dtd/de-DE.po +12 6 build/i18n/po/opac.dtd/en-CA.po +12 6 build/i18n/po/opac.dtd/en-GB.po +14 8 build/i18n/po/opac.dtd/es-ES.po +31 22 build/i18n/po/opac.dtd/fi-FI.po +14 8 build/i18n/po/opac.dtd/fr-CA.po +5 4 build/i18n/po/opac.dtd/he-IL.po +16 7 build/i18n/po/opac.dtd/hy-AM.po +5 4 build/i18n/po/opac.dtd/oc-FR.po +27 8 build/i18n/po/opac.dtd/pt-BR.po +13 7 build/i18n/po/opac.dtd/ru-RU.po +5 4 build/i18n/po/opac.dtd/tr-TR.po +3 3 build/i18n/po/opac.js/cs-CZ.po +3 3 build/i18n/po/opac.js/de-DE.po +3 3 build/i18n/po/opac.js/en-CA.po +3 3 build/i18n/po/opac.js/en-GB.po +3 3 build/i18n/po/opac.js/es-ES.po +8 8 build/i18n/po/opac.js/fi-FI.po +3 3 build/i18n/po/opac.js/fr-CA.po +3 3 build/i18n/po/opac.js/hy-AM.po +3 3 build/i18n/po/opac.js/oc-FR.po +3 3 build/i18n/po/opac.js/pt-BR.po +3 3 build/i18n/po/opac.js/ru-RU.po +3 3 build/i18n/po/opac.js/sv-SE.po +3 3 build/i18n/po/opac.js/tr-TR.po +7 3 build/i18n/po/patron.properties/cs-CZ.po +7 3 build/i18n/po/patron.properties/de-DE.po +7 3 build/i18n/po/patron.properties/en-CA.po +7 3 build/i18n/po/patron.properties/en-GB.po +7 3 build/i18n/po/patron.properties/es-ES.po +56 52 build/i18n/po/patron.properties/fi-FI.po +7 3 build/i18n/po/patron.properties/fr-CA.po +7 3 build/i18n/po/patron.properties/hy-AM.po +7 3 build/i18n/po/patron.properties/oc-FR.po +7 3 build/i18n/po/patron.properties/pt-BR.po +7 3 build/i18n/po/patron.properties/ru-RU.po +7 3 build/i18n/po/patron.properties/tr-TR.po +1 1 build/i18n/po/pickup_and_return.js/fi-FI.po +1 1 build/i18n/po/pull_list.js/fi-FI.po +13 13 build/i18n/po/register.js/cs-CZ.po +13 13 build/i18n/po/register.js/de-DE.po +13 13 build/i18n/po/register.js/en-CA.po +13 13 build/i18n/po/register.js/en-GB.po +13 13 build/i18n/po/register.js/es-ES.po +14 14 build/i18n/po/register.js/fi-FI.po +13 13 build/i18n/po/register.js/fr-CA.po +13 13 build/i18n/po/register.js/hy-AM.po +13 13 build/i18n/po/register.js/oc-FR.po +13 13 build/i18n/po/register.js/pt-BR.po +13 13 build/i18n/po/register.js/ru-RU.po +13 13 build/i18n/po/register.js/tr-TR.po +25 25 build/i18n/po/reports.dtd/fi-FI.po +1 1 build/i18n/po/reports.js/fi-FI.po +3 3 build/i18n/po/reservation.js/cs-CZ.po +3 3 build/i18n/po/reservation.js/de-DE.po +3 3 build/i18n/po/reservation.js/en-CA.po +3 3 build/i18n/po/reservation.js/en-GB.po +3 3 build/i18n/po/reservation.js/es-ES.po +4 4 build/i18n/po/reservation.js/fi-FI.po +4 4 build/i18n/po/reservation.js/fr-CA.po +3 3 build/i18n/po/reservation.js/hy-AM.po +3 3 build/i18n/po/reservation.js/oc-FR.po +3 3 build/i18n/po/reservation.js/pt-BR.po +3 3 build/i18n/po/reservation.js/ru-RU.po +3 3 build/i18n/po/selfcheck.js/cs-CZ.po +3 3 build/i18n/po/selfcheck.js/de-DE.po +3 3 build/i18n/po/selfcheck.js/en-CA.po +3 3 build/i18n/po/selfcheck.js/en-GB.po +3 3 build/i18n/po/selfcheck.js/es-ES.po +7 7 build/i18n/po/selfcheck.js/fi-FI.po +3 3 build/i18n/po/selfcheck.js/fr-CA.po +3 3 build/i18n/po/selfcheck.js/hy-AM.po +3 3 build/i18n/po/selfcheck.js/oc-FR.po +3 3 build/i18n/po/selfcheck.js/pt-BR.po +3 3 build/i18n/po/selfcheck.js/ru-RU.po +15 3 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 +15 3 build/i18n/po/serial.properties/es-ES.po +53 40 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 +19 7 build/i18n/po/serial.properties/pt-BR.po +15 3 build/i18n/po/serial.properties/tr-TR.po + create mode 100644 build/i18n/po/authority.js/ru-RU.po + +commit 474b8eba894ba71a9b2c44e4845ae67043841006 +Author: Bill Erickson +Date: Fri Mar 15 09:24:45 2013 -0400 + + LP 1155611 - prevent unnecessary load of fm_IDL.xml + + Ensure fm_IDL.xml is loaded only when IDL2js has not been loaded. + + Modified for 2.3 and before to avoid using Object.keys(), which is not + supported in all browsers, but is needed by JSPAC. + + Signed-off-by: Bill Erickson + Signed-off-by: Lebbeous Fogle-Weekley + +8 1 Open-ILS/web/js/dojo/fieldmapper/IDL.js + +commit c74b5477c475008e0f33746872f176b1fa8e77af +Author: Thomas Berezansky +Date: Thu Aug 2 12:10:26 2012 -0400 + + Update make_release script for Linux 64 building + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + Signed-off-by: Bill Erickson + +10 5 build/tools/make_release + +commit 61f211011b5d4b63176f114c9bf36a79d1e7e8ac +Author: Thomas Berezansky +Date: Thu Aug 2 10:20:54 2012 -0400 + + Add 64 bit Linux Client building + + Also re-labels most of the 32 bit client as such. The update channel was + left as just "lin" instead of "lin32" for compatibility reasons. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + Signed-off-by: Bill Erickson + +16 5 Open-ILS/updates/manualupdate.html +31 11 Open-ILS/xul/staff_client/Makefile.am +35 11 Open-ILS/xul/staff_client/external/make_updates.sh + +commit 43a502b0c4600471d1dabce4d27e4510a786eafd +Author: Bill Erickson +Date: Fri Aug 3 15:08:51 2012 -0400 + + SIP re-login fetches correct auth session + + After a login session expires and the SIP server logs in again to + acquire a new authtoken, be sure to use the new authtoken when fetching + the new session object. Otherwise, the login_session is left undef and + you may see errors like this when checking in items: + + Can't call method "ws_ou" on an undefined value at + /usr/local/share/perl/5.10.1/OpenILS/SIP/Transaction/Checkin.pm line 77. + + Incidentally, the checkin code is the only code that references + $sip_handler->{login_session}. And the problem listed above only occurs + when the login session expires just prior to a checkin call. In any + other scenario, the login_session would ultimately get repaired. + + Signed-off-by: Bill Erickson + Signed-off-by: Galen Charlton + +3 1 Open-ILS/src/perlmods/lib/OpenILS/SIP.pm + +commit bc2253d3ead2b967ce73d93c690b5d81eea36f48 +Author: Pasi Kallinen +Date: Wed Jan 2 12:50:53 2013 +0200 + + Fix some typos + + Except for the typo in staff client's multiclass_search_help.html, + the rest are in comments. + + Signed-off-by: Pasi Kallinen + Signed-off-by: Galen Charlton + +2 2 Open-ILS/examples/apache/startup.pl +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm +1 1 Open-ILS/web/js/ui/default/acq/financial/claim_voucher.js +1 1 Open-ILS/xul/staff_client/chrome/content/util/print.js +1 1 Open-ILS/xul/staff_client/server/locale/en-US/multiclass_search_help.html + +commit 905c8c4ae211c250abf6a9473120edd3da8ea062 +Author: Jeff Godin +Date: Thu Mar 14 14:15:28 2013 -0400 + + Fix detection of empty Syndetics AC data elements + + Due to a change in how the vendor responds to requests for data + elements which are not present for a requested title, we need to + change how we detect "empty" data elements in the "data_exists" + function. + + First, we check for the new "No Data Available" title element, then + we check for the previously-used value of "error". + + This change resolves the symptom where the catalog would display + tabs for "Author Notes", "Excerpt", "Table of Contents", on every + record in the catalog, even when clicking each tab would show that + the content was not present / available. + + Signed-off-by: Jeff Godin + Signed-off-by: Ben Shum + +1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent/Syndetic.pm + +commit 95c7c7da42edb6f5a3f9ec0c6aedd9f84e0f46cb +Author: Jason Etheridge +Date: Fri Jun 22 12:41:20 2012 -0400 + + fix typo preventing transit abort error dialogs + + Signed-off-by: Jason Etheridge + Signed-off-by: Galen Charlton + +3 3 Open-ILS/xul/staff_client/server/circ/util.js + +commit 9ec354a62cb6bfaeb9713edfcd8a721e4ca93ab3 +Author: Ben Shum +Date: Fri Feb 22 00:46:17 2013 -0500 + + LP1054322 - libparent-perl not needed for Ubuntu Precise + + The newer version of Perl 5.14 which comes with Ubuntu Precise already + contains the contents of libparent-perl, which is now an obsolete package. + + Remove this dependency from the extra debs installed for Debian and Ubuntu + but then add to the extras for Debian Squeeze and create a new extras just + for Ubuntu Lucid so that it continues to be installed on those systems and + not on Ubuntu Precise. + + Signed-off-by: Ben Shum + Signed-off-by: Galen Charlton + +9 2 Open-ILS/src/extras/Makefile.install + +commit aed4f16f43b06999c71e8194d1b958142c2950cb +Author: Ben Shum +Date: Thu Mar 14 17:40:04 2013 -0400 + + LP1103068 - Show titles and authors for pre-cat items + + As noted in LP1103068, TPAC does not currently show anything when viewing a + pre-cataloged item in the my account summary of items checked out. + + If the call number is -1 (pre-cat), then show the dummy title and dummy author + values, which fields are hopefully relevant as long as staff were good to put + something meaningful in those during creation of the pre-cat. + + Also, wrap the title in a check for attrs.title. + + Signed-off-by: Ben Shum + Signed-off-by: Michael Peters + +7 1 Open-ILS/src/templates/opac/myopac/circs.tt2 + +commit 6548e26e4af3c40abbbaaf461b7a28372f9f1037 +Author: Ben Shum +Date: Fri Mar 15 01:04:06 2013 -0400 + + LP1116258 - Hide download circ history if none to be found + + As noted in LP1116258, if there is no circ history for a patron, but they + click on the Download CSV button, it leads them to unhappy server errors. + + So, hide the Download CSV button unless the number of circs > 0. + + Signed-off-by: Ben Shum + Signed-off-by: Pasi Kallinen + +2 0 Open-ILS/src/templates/opac/myopac/circ_history.tt2 + +commit 34748feae085d378c005f3fc95b4fbe8be3b4f8b +Author: Galen Charlton +Date: Thu Jan 10 12:27:30 2013 -0500 + + LP#791881: make it possible to save copy location translations + + TranslatorPopup requires that the i18n fieldmapper class be loaded. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +1 1 Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml + +commit 130a6c2cf0ef89bb1d0db40131eca699ab5752c6 +Author: Michael Peters +Date: Fri Mar 15 09:57:55 2013 -0400 + + Fix spelling error of "Successfully" in ils_events.xml + + LP#1155495 "card transaction was processed successfuly" is + spelled incorrectly. This corrects that misspelling. + + Signed-off-by: Michael Peters + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/extras/ils_events.xml + +commit 01b9658f6a78049fb399db03b48a64ab22d9c44a +Author: Michael Peters +Date: Fri Mar 15 09:47:26 2013 -0400 + + Use a consistent spelling of "Pickup" throughout the code + + LP#1155494 In myopac/holds.tt2 the text "PickUp Location" is + used, and everywhere else it's "Pickup Location". + Pick one spelling and stick to it. + + Signed-off-by: Michael Peters + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/templates/opac/myopac/holds.tt2 + +commit c2a99daeb62fd82308e0170bb29c139820be6a42 +Author: Dan Scott +Date: Fri Mar 15 10:22:13 2013 -0400 + + Wrap upgrade script for use ID as TCN value fix + + Signed-off-by: Dan Scott + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +112 0 Open-ILS/src/sql/Pg/upgrade/0783.schema.enforce_use_id_for_tcn.sql +0 98 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0783.schema.enforce_use_id_for_tcn.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql + +commit 7bbabd3bc2e0c42ea7f2a7cbcfe2a477f13fab53 +Author: Galen Charlton +Date: Thu Mar 14 17:17:54 2013 -0400 + + LP#1155329: better enforce cat.bib.use_id_for_tcn + + Restore previous behavior to the maintain_901() trigger + function so that bib records that are loaded without + explicitly setting the TCN have it set to the bib ID + when the cat.bib.use_id_for_tcn global flag is set, rather + than 'AUTOGENERATED-xxx'. + + Signed-off-by: Galen Charlton + Signed-off-by: Dan Scott + +1 0 Open-ILS/src/sql/Pg/002.functions.config.sql +98 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql + +commit 9e26fb37dba7ce1fb5e549b5e46d0924d8a0009a +Author: Lebbeous Fogle-Weekley +Date: Tue Dec 11 16:58:33 2012 -0500 + + Serials: printing routing slips fails with Javascript error + + The symptom (an error in the Javascript console about dijit.form.Button + and an empty page for routing slips that you try to print at batch + recieve) may or may not be affected by whether you're in a production + environment with the pre-built dojo 1.3.3 package installed or a + development environment without it. + + This simple fix makes the problem go away in any case. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Ben Shum + +1 0 Open-ILS/web/js/ui/default/serial/print_routing_list_users.js + +commit 653d4b18e9281b1fb9dafcd4fe0842b9452ca80a +Author: Dan Wells +Date: Thu Feb 28 15:32:07 2013 -0500 + + Fix holding lib for certain distribution svrs + + On a serial virtual record (svr), the holding lib is expected to be + just an ID. In one logic branch, Search/Serial.pm was attaching the + entire aou object, and we should instead attach just the ID of this + object. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm + +commit d1b2c6ab95aaba16712ef10a563895862f23c36c +Author: Ben Shum +Date: Tue Mar 12 17:22:36 2013 -0400 + + Stamping upgrade for inactive barcode retrieval + + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +89 0 Open-ILS/src/sql/Pg/upgrade/0770.function.allow_inactive_barcode_retrieve.sql +0 83 Open-ILS/src/sql/Pg/upgrade/XXXX.function.allow_inactive_barcode_retrieve.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0770.function.allow_inactive_barcode_retrieve.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.allow_inactive_barcode_retrieve.sql + +commit 238f54e2c99cd0216dc14f17d7a1894fc9c31307 +Author: Michael Peters +Date: Tue Mar 12 16:14:23 2013 -0400 + + LP#1154235 Allow inactive patron barcode to be loaded + + This addresses LP#1154235 by modifying the evergreen.get_barcodes + function to allow users to retrieve patrons in barcode retrieve + who have inactive barcodes. + + This returns to functionality in versions prior to around 2.2.x + series. + + End result is staff receiving an alert that the patron was + accessed with an invalid barcode. + + Signed-off-by: Michael Peters + Signed-off-by: Ben Shum + +2 1 Open-ILS/src/sql/Pg/020.schema.functions.sql +83 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.allow_inactive_barcode_retrieve.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.allow_inactive_barcode_retrieve.sql + +commit f74a13ac587cd4e6fdf9ca321882e448dfa765cc +Author: Thomas Berezansky +Date: Mon Mar 11 15:09:51 2013 -0400 + + Escape barcode completion button labels + + Some characters piss off the XML parser. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + +1 1 Open-ILS/xul/staff_client/chrome/content/main/menu.js + +commit e63f10e8cae413188af0055b6b80ea42ea901225 +Author: Dan Scott +Date: Fri Mar 8 22:41:08 2013 -0500 + + Show OPAC-invisible copies in TPAC in staff context + + We were not calling the staff variation of the copy count method; thus, + the record details template was skipping the copy table in the event + that all copies for a given record were marked as OPAC-invisible via + either copy visibility or shelving location visibility. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +7 3 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm + +commit 826e5ddaba5fcbba77b857002bf03ba895fb191b +Author: Dan Wells +Date: Thu Feb 28 14:49:16 2013 -0500 + + Don't populate the MFHD menu with distributions + + If a distribution has no legacy record, it shouldn't get a menu + entry in the MFHD menus. A magic id of '-1' is used to indicate + this case, so we need to check for that when populating + mfhdDetails via the TPAC. + + Also, entryNum must be an int, not a string, because it is + incremented prior to display. Removing the quotes solves this + display issue. + + Signed-off-by: Dan Wells + Signed-off-by: Ben Shum + +3 1 Open-ILS/src/templates/opac/parts/js.tt2 + +commit 2b1ba191e443fae1f18dbeeee23ea2445a83a61d +Author: Bill Erickson +Date: Wed Nov 21 10:12:39 2012 -0500 + + extract PO name from picklist upload + + If a PO name is encoded in a lineitem (via provider attribute + definition), extract that PO name when creating a new purchase order + from lineitems that were previously only linked to a selection list. + This allows staff to create selection lists first, then orders second, + while retaining the encoded purchase order name. + + Signed-off-by: Bill Erickson + Signed-off-by: Mike Rylander + +4 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm + +commit 0cbff297cc45f057105a9779e96bd1cc427a6c6b +Author: Mike Rylander +Date: Mon Mar 11 16:22:38 2013 -0400 + + Stamping upgrade for serials harmonization + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +38 0 Open-ILS/src/sql/Pg/upgrade/0767.schema.serials-holding-code-test-improved.sql +0 38 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serials-holding-code-test-improved.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0767.schema.serials-holding-code-test-improved.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serials-holding-code-test-improved.sql + +commit 302e1bc0f09ea24b7c9449c33cb13acc86e417a0 +Author: Lebbeous Fogle-Weekley +Date: Tue Oct 23 12:25:18 2012 -0400 + + Fix divergence of stock serials schema and upgraded schema + + And additionally make a function used in a constraint on + serial.issuance.holding_code a little bit smarter. + + These issues were reported to me by Galen Charlton. + + The upgrade script included here will set serial.issuance.holding_code + to NULL in cases where the value doesn't validate, but in those cases + there is no part of Evergreen that could have made use of the data + anyway, and the data is just plain bad. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Mike Rylander + +19 0 Open-ILS/src/sql/Pg/000.functions.general.sql +3 1 Open-ILS/src/sql/Pg/210.schema.serials.sql +38 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serials-holding-code-test-improved.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serials-holding-code-test-improved.sql + +commit 9a082a5f6d66c96a057015e9207882ca94e53814 +Author: Steven Callender +Date: Thu Oct 4 09:17:29 2012 -0400 + + Exclude copies that have been deleted from showing up on the browse holds shelf list. + + If an item had been deleted while it had a status of On Holds Shelf, it would permanently show up on + the browse holds list. This will exclude deleted copies from the results. + + Signed-off-by: Steven Callender + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit 8df82a97fca4f5191c6f42266cc4f68a07b7a293 +Author: Mike Rylander +Date: Mon Mar 11 15:41:00 2013 -0400 + + Stamping upgrade script for null SVF attribute value fix + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +104 0 Open-ILS/src/sql/Pg/upgrade/0766.function.handle_null_svf_during_import.sql +0 104 Open-ILS/src/sql/Pg/upgrade/XXXX.handle_null_svf_during_import.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0766.function.handle_null_svf_during_import.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.handle_null_svf_during_import.sql + +commit b95f53c867b24b509ac6b00f376c198c663b5bdd +Author: Galen Charlton +Date: Tue Feb 5 13:12:02 2013 -0500 + + LP#1116509: prevent null SVF attribute value from breaking record import + + Fix problem where a record could fail to be staged for import + with the following error: + + ERROR: query string argument of EXECUTE is null + CONTEXT: PL/pgSQL function "extract_rec_attrs" line 72 at EXECUTE statement + SQL function "extract_rec_attrs" statement 1 + + This error would be triggered if at least one SVF attribute has a normalization + function defined that is applied to a null value during record import. + + Patch is based on a suggestion by Bob Wicksall. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/012.schema.vandelay.sql +104 0 Open-ILS/src/sql/Pg/upgrade/XXXX.handle_null_svf_during_import.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.handle_null_svf_during_import.sql + +commit 7fcc5ca48abcbddaf12e223f7cb82bb252cdbca4 +Author: Mike Rylander +Date: Mon Mar 11 13:40:46 2013 -0400 + + Reify required authority fixed field names + + Adam (and Art, by way of Adam's patch) added a goodly pile of fixed + field definitions that were lacking previously. The change in this + commit simply changes the label of two (008/11 and 008/15) to those + in use by other parts of the code. In particular, internally, we call + the field holding a thesaurus code value "Subj" and use that name during + ingest of authority records. Therefore, that should not change. This + required a subsequent change to the label of another, to SubjUse. + + I've included a duplication in the backend-only (probably deprecated) + version of this mapping to allow the front-end labels to work. + + Signed-off-by: Mike Rylander + +10 0 Open-ILS/src/javascript/backend/catalog/fixed_fields.js +2 2 Open-ILS/web/js/dojo/MARC/FixedFields.js + +commit c7d4529d10bab47a5c2af1729715425fdec8194a +Author: Galen Charlton +Date: Wed Dec 5 12:23:04 2012 -0500 + + lp1040381: match up Subj and SubjUse fixed labels + + Update the labels used in the fixed field editor for + authority records to match OCLC's labels specified at + + http://www.oclc.org/support/documentation/worldcat/authorities/authformat/default.htm + + This is consistent with commit's e675b854 change to the + OCLC labels, and also fixes a problem where changing the + 008/11 and 008/15 was not reflected in the fixed field boxes. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +4 4 Open-ILS/xul/staff_client/server/cat/marcedit.xul + +commit 03a6c39b3a99312818a091e74989be2836788dc1 +Author: Adam Bowling +Date: Fri Oct 26 10:59:54 2012 -0400 + + Add fixed fields missing from previous configuration, namely for MAP and SER record types. Incoporate previous changes for AUT record types from 1040381. + + Signed-off-by: Adam Bowling + Signed-off-by: Mike Rylander + +1513 1368 Open-ILS/web/js/dojo/MARC/FixedFields.js + +commit 191c7ce898c7974c55e2c08ef2af58d525f0d5c3 +Author: Mark Cooper +Date: Fri Oct 12 16:18:28 2012 -0700 + + LP#867691: Authority match sets are not working + + Authority match sets are not supported so hide the option for now. + It's confusing having it there. + + Signed-off-by: Mark Cooper + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/templates/conify/global/vandelay/match_set.tt2 + +commit c7b3c1cc6e78b37c4de1fadb92e6cb4320fa65d9 +Author: Ben Shum +Date: Thu Mar 7 01:48:46 2013 -0500 + + Stamping upgrade for LOC z39.50 target seed data + + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +19 0 Open-ILS/src/sql/Pg/upgrade/0764.data.loc_z39_settings.sql +0 18 Open-ILS/src/sql/Pg/upgrade/XXXX.data.loc_z39_settings.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0764.data.loc_z39_settings.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.loc_z39_settings.sql + +commit a3a7f12c626fd999a2ca0ab8f8dcec28a23dca0a +Author: Bill Erickson +Date: Wed Mar 6 13:54:35 2013 -0500 + + Upgrade script for LP#1105225: LOC z39.50 seed data + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +18 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.loc_z39_settings.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.loc_z39_settings.sql + +commit d5443cc9a595e0c10b090b860290b1d0155db4c9 +Author: Galen Charlton +Date: Fri Jan 25 11:35:27 2013 -0500 + + LP#1105225: update LOC z39.50 target seed data + + This patch updates the seed data from the target list at + http://www.loc.gov/z3950/lcserver.html#addr. It also changes the + structure attribute for the 'lccn' search attribute to wordlist, + which means that LCCNs can be searched without having to enter + the leading spaces. + + Signed-off-by: Galen Charlton + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +2 2 Open-ILS/src/sql/Pg/950.data.seed-values.sql + +commit c3f771a5f9f52ae549938bc4c7616f494621ea01 +Author: Mark Cooper +Date: Wed Oct 10 23:20:02 2012 -0700 + + LP#1022582: MARC Exporter includes deleted copies in holdings export + + Added check to filter out callnumbers/copies if deleted. + + Signed-off-by: Mark Cooper + Signed-off-by: Bill Erickson + +3 2 Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm +3 3 Open-ILS/src/support-scripts/marc_export.in + +commit cce462bbe7db73038a44769d914863caff43f2b0 +Author: Jason Stephenson +Date: Mon Mar 4 14:10:16 2013 -0500 + + Remove dependency on libreadline5-dev from Debian and Ubuntu. + + libreadline5-dev is old and superseded by libreadline-dev. + + Also OpenSRF installs libreadline-dev, so we should not have to + install it from Evergreen's Makefile.install. + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +0 1 Open-ILS/src/extras/Makefile.install + +commit 38227e733c4765b3dfdf77cb183851d7fca04a2e +Author: Ben Shum +Date: Wed Feb 27 22:37:31 2013 -0500 + + LP#1086458: move up event listeners in place_hold.js + + The preceding two functions need the event listeners to be defined before + use. Move up to prevent errors. + + Signed-off-by: Ben Shum + Signed-off-by: Galen Charlton + +2 1 Open-ILS/xul/staff_client/server/patron/place_hold.js + +commit b2abed9d5be75ab5c50e76f22ac379c5aef71919 +Author: Galen Charlton +Date: Wed Feb 20 15:00:55 2013 -0500 + + LP#1086458: fix typo + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +2 2 Open-ILS/xul/staff_client/server/patron/info_group.js + +commit c0b97feeca7d81e901ec801b649f4bdafc8459d5 +Author: Galen Charlton +Date: Wed Jan 30 11:38:33 2013 -0500 + + LP#1086458: add destructor to caption binding + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +6 0 Open-ILS/xul/staff_client/chrome/content/main/bindings.xml + +commit 5623ee46d455d6c2f0fd86d7bfc21cfa14154443 +Author: Galen Charlton +Date: Wed Jan 30 11:24:21 2013 -0500 + + LP#1086458: add destructor to messagecatalog + + Based on patch by Jason Etheridge. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +12 0 Open-ILS/xul/staff_client/chrome/content/main/bindings.xml + +commit c1e101f3ea503aafc9b644cf732de705301af2d9 +Author: Galen Charlton +Date: Wed Jan 30 10:59:10 2013 -0500 + + LP#1086458: clean up event listener functions + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +4 1 Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js + +commit b33e783ed76fbb15e96385e9ec4ab606b443b410 +Author: Jason Etheridge +Date: Thu Jan 24 17:30:26 2013 -0500 + + move EventListenerList out of global_util.js + + So that we can more easily pull it into main.xul (which we also do here) + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +1 0 Open-ILS/xul/staff_client/Makefile.am +37 0 Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js +0 37 Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js +1 0 Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul +1 0 Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul +1 0 Open-ILS/xul/staff_client/chrome/content/main/main.xul +1 0 Open-ILS/xul/staff_client/chrome/content/util/shell.html +1 0 Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul +1 0 Open-ILS/xul/staff_client/server/admin/printer_settings.xul +1 0 Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml +2 0 Open-ILS/xul/staff_client/server/index.xhtml + create mode 100644 Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js + +commit e2bf0d302dcf53d50ed99715b5d6bce53d7512b8 +Author: Galen Charlton +Date: Thu Jan 24 15:25:47 2013 -0500 + + LP#1086458: remove references to windows during cleanup + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +6 0 Open-ILS/xul/staff_client/server/patron/display.js + +commit e3a51440a154089dd3e1d702aa22603cd187ead1 +Author: Galen Charlton +Date: Thu Jan 24 15:16:52 2013 -0500 + + LP#1086458: clear util.list lists and trees during cleanup + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +1 0 Open-ILS/xul/staff_client/server/patron/bill2.js +2 0 Open-ILS/xul/staff_client/server/patron/bill_details.js +2 0 Open-ILS/xul/staff_client/server/patron/bill_history.js +1 0 Open-ILS/xul/staff_client/server/patron/hold_details.js +1 0 Open-ILS/xul/staff_client/server/patron/holds.js +1 0 Open-ILS/xul/staff_client/server/patron/info_group.js +2 0 Open-ILS/xul/staff_client/server/patron/items.js +1 0 Open-ILS/xul/staff_client/server/patron/search_result.js +1 0 Open-ILS/xul/staff_client/server/patron/staged.js +2 0 Open-ILS/xul/staff_client/server/patron/standing_penalties.js +8 2 Open-ILS/xul/staff_client/server/patron/summary.js + +commit b3112a156b57a0ded171a30d257d1fc479e33e31 +Author: Galen Charlton +Date: Thu Jan 24 13:07:05 2013 -0500 + + LP#1086458: add missing cleanup call + + Thanks to Jason Etheridge for the catch. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +1 0 Open-ILS/xul/staff_client/server/circ/checkout.js + +commit 5d5791f0b21a8d6fdee057e65a8749748f9afad9 +Author: Galen Charlton +Date: Sat Jan 19 00:46:32 2013 -0500 + + LP#1086458: clean up after event listeners in circ/patron interface + + Upon window unload, now removes event listeners, both ones explicitly + created by the page JavsScript as well as ones created by + util.list, util.controller, and persist_helper(). + + The same approach of defining cleanup fnctions used by unload + events can be applied to the rest of the staff client, but + this patch focuses on circulation first. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +8 1 Open-ILS/xul/staff_client/server/circ/checkout.js +13 0 Open-ILS/xul/staff_client/server/circ/checkout.xul +1 0 Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +13 1 Open-ILS/xul/staff_client/server/patron/barcode_entry.xul +25 13 Open-ILS/xul/staff_client/server/patron/bill2.js +1 0 Open-ILS/xul/staff_client/server/patron/bill2.xul +1 0 Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul +1 0 Open-ILS/xul/staff_client/server/patron/bill_check_info.xul +15 3 Open-ILS/xul/staff_client/server/patron/bill_details.js +1 0 Open-ILS/xul/staff_client/server/patron/bill_details.xul +19 5 Open-ILS/xul/staff_client/server/patron/bill_history.js +1 0 Open-ILS/xul/staff_client/server/patron/bill_history.xul +13 1 Open-ILS/xul/staff_client/server/patron/bill_wizard.js +1 0 Open-ILS/xul/staff_client/server/patron/bill_wizard.xul +23 16 Open-ILS/xul/staff_client/server/patron/display.js +11 0 Open-ILS/xul/staff_client/server/patron/display.xul +11 0 Open-ILS/xul/staff_client/server/patron/display_horiz.xul +17 6 Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js +1 0 Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul +13 2 Open-ILS/xul/staff_client/server/patron/hold_cancel.js +1 0 Open-ILS/xul/staff_client/server/patron/hold_cancel.xul +8 0 Open-ILS/xul/staff_client/server/patron/hold_details.js +1 0 Open-ILS/xul/staff_client/server/patron/hold_details.xul +9 1 Open-ILS/xul/staff_client/server/patron/holds.js +11 0 Open-ILS/xul/staff_client/server/patron/holds.xul +10 0 Open-ILS/xul/staff_client/server/patron/info_group.js +1 0 Open-ILS/xul/staff_client/server/patron/info_group.xul +15 2 Open-ILS/xul/staff_client/server/patron/info_notes.xul +1 0 Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul +1 0 Open-ILS/xul/staff_client/server/patron/info_surveys.xul +6 0 Open-ILS/xul/staff_client/server/patron/items.js +11 0 Open-ILS/xul/staff_client/server/patron/items.xul +17 6 Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js +1 0 Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul +17 8 Open-ILS/xul/staff_client/server/patron/place_hold.js +1 0 Open-ILS/xul/staff_client/server/patron/place_hold.xul +11 4 Open-ILS/xul/staff_client/server/patron/search_form.js +11 0 Open-ILS/xul/staff_client/server/patron/search_form.xul +11 0 Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul +26 18 Open-ILS/xul/staff_client/server/patron/search_result.js +11 0 Open-ILS/xul/staff_client/server/patron/search_result.xul +15 4 Open-ILS/xul/staff_client/server/patron/staged.js +1 0 Open-ILS/xul/staff_client/server/patron/staged.xul +17 5 Open-ILS/xul/staff_client/server/patron/standing_penalties.js +1 0 Open-ILS/xul/staff_client/server/patron/standing_penalties.xul +10 1 Open-ILS/xul/staff_client/server/patron/summary.js +13 1 Open-ILS/xul/staff_client/server/patron/summary.xul +1 0 Open-ILS/xul/staff_client/server/patron/user_buckets.xul + +commit abbd9181ac45f3461f71cfe9d2896e3d24693804 +Author: Galen Charlton +Date: Thu Jan 24 12:27:34 2013 -0500 + + LP#1086458: add more event listener tracking + + util.list and util.controller now have cleanup() + methods that can be invoked to unregister the event + listeners they create. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +7 1 Open-ILS/xul/staff_client/chrome/content/util/controller.js +55 25 Open-ILS/xul/staff_client/chrome/content/util/list.js + +commit 70f7c8a9671a9c62552aac4ee216cac24b545ed4 +Author: Galen Charlton +Date: Thu Jan 24 12:02:57 2013 -0500 + + LP#1086458: add way to clean up persist_helper event listeners + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +13 4 Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js + +commit f8be2b0a1d71ee8b7d565eb7b838bd58e87a3569 +Author: Galen Charlton +Date: Thu Jan 24 11:56:30 2013 -0500 + + LP#1086458: add class to manage event listeners + + EventListenerList allows one to maintain a list + of event listeners, then remove them all when it's + time to clean up a window. + + Usage is: + + var list = new EventListenerList(); + // attach an event listener + list.add(node, 'command', function(ev) { alert('BOO!'); }, false); + ... + // get rid of them + list.removeAll(); + + Based on an idea by Jason Etheridge. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +37 0 Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js + +commit accd12854102132b2a9b6e03c53512d0fbdd190d +Author: Dan Wells +Date: Wed Jan 16 15:05:17 2013 -0500 + + TPAC: Don't display serial headers without content + + Currently, the TPAC serial display code will print a section + header, then see if there is any content to show. This causes + headers to show up when they are unnecessary or unwanted. + + Now, we only show the header if we have content needing heading. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +20 17 Open-ILS/src/templates/opac/parts/record/issues-mfhd.tt2 + +commit 7f4aba5baa21a93b73b0463fd192f4a41f6f4745 +Author: Thomas Berezansky +Date: Fri Aug 24 10:48:39 2012 -0400 + + Remove broken error message + + Checkout fills related hold causes an empty array sometimes, so don't throw + out errors for that. + + Also, the original error would itself fail, throwing an error that would + then fail as well, likely due to a copy/paste issue. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + +2 1 Open-ILS/xul/staff_client/server/admin/transit_list.js + +commit ad40c1f5403079c9794af3fbfe807b7d7e5b8484 +Author: Ben Shum +Date: Wed Feb 27 21:15:06 2013 -0500 + + Stamping upgrade script for Bib Merge Ignore Deleted Call Numbers + + Signed-off-by: Ben Shum + +264 0 Open-ILS/src/sql/Pg/upgrade/0761.function.merge_record_assets_deleted_call_numbers.sql +0 264 Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_deleted_call_numbers.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0761.function.merge_record_assets_deleted_call_numbers.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_deleted_call_numbers.sql + +commit 2219d7ad39de636d40e88a1022a59df671692e39 +Author: Steven Callender +Date: Fri Nov 2 16:20:32 2012 -0400 + + Changed bib merge to ignore deleted call numbers. + + The asset.merge_record_assets function was not checking for deleted call numbers + and merging items onto deleted call numbers that of course causes issues. + + Signed-off-by: Steve Callender + Signed-off-by: Ben Shum + +2 1 Open-ILS/src/sql/Pg/999.functions.global.sql +264 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_deleted_call_numbers.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_deleted_call_numbers.sql + +commit 7d1590dcb51a21b8f4f25ffcd570fe04cdc3c272 +Author: Bill Erickson +Date: Tue Feb 26 14:33:58 2013 -0500 + + Repair clear holds shelf transaction timeout + + Initiate our cstore transaction after making the initial, potentially + long-running call to collect the clear-shelf holds to process. + Otherwise, the cstore transaction may time out while waiting on the + holds retrieval to complete. + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +3 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit 196d532844f38d4d32a9a399b7241c3eb21ad16d +Author: Jason Etheridge +Date: Wed Jan 30 14:10:19 2013 -0500 + + set title during receipt/slip printing + + This is to workaround a bug in CUPS where long window titles will + cause the print job to fail. + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +2 2 Open-ILS/xul/staff_client/chrome/content/util/print.js + +commit e2232d2f62588f8062d66824a5027e1c0b8a718f +Author: Mike Rylander +Date: Fri Feb 8 10:15:39 2013 -0500 + + Speed up sorted-related-holds query + + In several interfaces, we use a server side method which gathers statistics + about a hold: related holds, it's position in the (approximate) queue, the + estimated wait time, etc. Within this method is a relatively complicated + json_query that returns the list of related, (FIFO-ish) sorted holds -- ones + that could be filled by a copy which could fill the hold in question. This + commit restructures that query so as to make it faster when the list of + related holds is large, by removing duplicate (cartesian product, actually) + hold ids that were being fed into an INNER JOIN clause. + + Testing shows a speed increase of 4x for related-hold queue of around 675 + holds [~2s -> ~0.5s] on a relatively large Evergreen installation, + appropriately tuned. The speed improvement gets larger with longer queues. + There is no observed decrease in speed for smaller queue sizes. + + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +11 10 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit 4fec929171a336504044b5df2d6b93abd2d8896c +Author: Bill Erickson +Date: Thu Feb 21 11:54:54 2013 -0500 + + Translations import / newpot : 2.3.4 + + Signed-off-by: Bill Erickson + Signed-off-by: Lebbeous Fogle-Weekley + +6 6 build/i18n/po/circ.properties/cs-CZ.po +6 6 build/i18n/po/circ.properties/en-CA.po +6 6 build/i18n/po/circ.properties/hy-AM.po +4 4 build/i18n/po/common.properties/en-CA.po +4 4 build/i18n/po/common.properties/hy-AM.po +8 8 build/i18n/po/conify.js/de-DE.po +122 122 build/i18n/po/db.seed/cs-CZ.po +127 127 build/i18n/po/db.seed/de-DE.po +122 122 build/i18n/po/db.seed/en-CA.po +122 122 build/i18n/po/db.seed/en-GB.po +122 122 build/i18n/po/db.seed/es-ES.po +123 123 build/i18n/po/db.seed/fi-FI.po +122 122 build/i18n/po/db.seed/fr-CA.po +122 122 build/i18n/po/db.seed/hy-AM.po +122 122 build/i18n/po/db.seed/oc-FR.po +122 122 build/i18n/po/db.seed/pt-BR.po +122 122 build/i18n/po/db.seed/ru-RU.po +122 122 build/i18n/po/db.seed/tr-TR.po +4 4 build/i18n/po/fm_IDL.dtd/cs-CZ.po +4 4 build/i18n/po/fm_IDL.dtd/en-CA.po +4 4 build/i18n/po/fm_IDL.dtd/hy-AM.po +6 6 build/i18n/po/lang.dtd/cs-CZ.po +25 15 build/i18n/po/lang.dtd/en-CA.po +5 5 build/i18n/po/lang.dtd/fr-CA.po +26 15 build/i18n/po/lang.dtd/hy-AM.po +7 7 build/i18n/po/offline.properties/en-CA.po +7 7 build/i18n/po/offline.properties/hy-AM.po +6 6 build/i18n/po/opac.dtd/de-DE.po +4 4 build/i18n/po/patron.properties/en-CA.po +4 4 build/i18n/po/patron.properties/hy-AM.po + +commit b5a2c972c5c740ba6b9334d51891143ca7b43083 +Author: Jason Stephenson +Date: Fri Nov 9 15:06:04 2012 -0500 + + Stop requiring unneeded/absent RPC::XML::Method + + It's not a thing in recent versions of RPC::XML + + Signed-off-by: Jason Stephenson + +0 1 Open-ILS/src/perlmods/Build.PL +0 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm + +commit 08bfd668c583b54940843eb1fffa447e9a328c02 +Author: Lebbeous Fogle-Weekley +Date: Mon Oct 22 18:42:55 2012 -0400 + + In XML-RPC Gateway, substitute __ for - in method names + + Dashes have never actually been valid in XML-RPC method names, and some + clients (like newer versions of Perl's RPC::XML) enforce this rule on + their clients. This way we give XML-RPC clients a way they can still reach + our methods. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Jason Stephenson + +5 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm + +commit aea8c6080435020cc5c8100467d51967aeef11bf +Author: Lebbeous Fogle-Weekley +Date: Mon Oct 22 18:19:03 2012 -0400 + + Stop requiring unneeded/absent RPC::XML::Function + + It's not a thing in recent versions of RPC::XML + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Jason Stephenson + Signed-off-by: Dan Scott + + Conflicts: + Open-ILS/src/extras/Makefile.install + + Conflicts: + Open-ILS/src/extras/Makefile.install + +2 4 Open-ILS/src/extras/Makefile.install +0 1 Open-ILS/src/perlmods/Build.PL +0 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm + +commit 365c38187593411214b1ea26aa7ffa1b61f79ae3 +Author: Lebbeous Fogle-Weekley +Date: Wed Feb 13 10:34:17 2013 -0500 + + Serials: change more carp() to croak() to avoid infinite loops + + This addresses a problem very similar to that in LP #1075167, where + certain loops never end because problems with the data elicited calls to + carp(), which fills up log, but never gives our loops notice to end. + + Visible symptoms include 1) a greate volume of log spew and 2) an + open-ils.serial drone that ties up a CPU. + + The fault lies maybe in our loops rather than in the MFHD + package, but this fixes the problem fastest, and should not have + undesirable side-effects. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index cd4dbbf9c0..7bc8c92439 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/; 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-3-5"; } __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 764c4f63cf..60a1a3fe96 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -88,6 +88,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 ('0783', :eg_version); -- gmcharlt/dbs +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.5', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql new file mode 100644 index 0000000000..1f3626825b --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql @@ -0,0 +1,619 @@ +--Upgrade Script for 2.3.4 to 2.3.5 +\set eg_version '''2.3.5''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.5', :eg_version); +-- Evergreen DB patch XXXX.function.merge_record_assets_deleted_call_numbers.sql +-- + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0761', :eg_version); + +CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$ +DECLARE + moved_objects INT := 0; + source_cn asset.call_number%ROWTYPE; + target_cn asset.call_number%ROWTYPE; + metarec metabib.metarecord%ROWTYPE; + hold action.hold_request%ROWTYPE; + ser_rec serial.record_entry%ROWTYPE; + ser_sub serial.subscription%ROWTYPE; + acq_lineitem acq.lineitem%ROWTYPE; + acq_request acq.user_request%ROWTYPE; + booking booking.resource_type%ROWTYPE; + source_part biblio.monograph_part%ROWTYPE; + target_part biblio.monograph_part%ROWTYPE; + multi_home biblio.peer_bib_copy_map%ROWTYPE; + uri_count INT := 0; + counter INT := 0; + uri_datafield TEXT; + uri_text TEXT := ''; +BEGIN + + -- move any 856 entries on records that have at least one MARC-mapped URI entry + SELECT INTO uri_count COUNT(*) + FROM asset.uri_call_number_map m + JOIN asset.call_number cn ON (m.call_number = cn.id) + WHERE cn.record = source_record; + + IF uri_count > 0 THEN + + -- This returns more nodes than you might expect: + -- 7 instead of 1 for an 856 with $u $y $9 + SELECT COUNT(*) INTO counter + FROM oils_xpath_table( + 'id', + 'marc', + 'biblio.record_entry', + '//*[@tag="856"]', + 'id=' || source_record + ) as t(i int,c text); + + FOR i IN 1 .. counter LOOP + SELECT '' || + array_to_string( + array_accum( + '' || + regexp_replace( + regexp_replace( + regexp_replace(data,'&','&','g'), + '>', '>', 'g' + ), + '<', '<', 'g' + ) || '' + ), '' + ) || '' INTO uri_datafield + FROM oils_xpath_table( + 'id', + 'marc', + 'biblio.record_entry', + '//*[@tag="856"][position()=' || i || ']/@ind1|' || + '//*[@tag="856"][position()=' || i || ']/@ind2|' || + '//*[@tag="856"][position()=' || i || ']/*/@code|' || + '//*[@tag="856"][position()=' || i || ']/*[@code]', + 'id=' || source_record + ) as t(id int,ind1 text, ind2 text,subfield text,data text); + + -- As most of the results will be NULL, protect against NULLifying + -- the valid content that we do generate + uri_text := uri_text || COALESCE(uri_datafield, ''); + END LOOP; + + IF uri_text <> '' THEN + UPDATE biblio.record_entry + SET marc = regexp_replace(marc,'(]*record>)', uri_text || E'\\1') + WHERE id = target_record; + END IF; + + END IF; + + -- Find and move metarecords to the target record + SELECT INTO metarec * + FROM metabib.metarecord + WHERE master_record = source_record; + + IF FOUND THEN + UPDATE metabib.metarecord + SET master_record = target_record, + mods = NULL + WHERE id = metarec.id; + + moved_objects := moved_objects + 1; + END IF; + + -- Find call numbers attached to the source ... + FOR source_cn IN SELECT * FROM asset.call_number WHERE record = source_record LOOP + + SELECT INTO target_cn * + FROM asset.call_number + WHERE label = source_cn.label + AND owning_lib = source_cn.owning_lib + AND record = target_record + AND NOT deleted; + + -- ... and if there's a conflicting one on the target ... + IF FOUND THEN + + -- ... move the copies to that, and ... + UPDATE asset.copy + SET call_number = target_cn.id + WHERE call_number = source_cn.id; + + -- ... move V holds to the move-target call number + FOR hold IN SELECT * FROM action.hold_request WHERE target = source_cn.id AND hold_type = 'V' LOOP + + UPDATE action.hold_request + SET target = target_cn.id + WHERE id = hold.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- ... if not ... + ELSE + -- ... just move the call number to the target record + UPDATE asset.call_number + SET record = target_record + WHERE id = source_cn.id; + END IF; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find T holds targeting the source record ... + FOR hold IN SELECT * FROM action.hold_request WHERE target = source_record AND hold_type = 'T' LOOP + + -- ... and move them to the target record + UPDATE action.hold_request + SET target = target_record + WHERE id = hold.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find serial records targeting the source record ... + FOR ser_rec IN SELECT * FROM serial.record_entry WHERE record = source_record LOOP + -- ... and move them to the target record + UPDATE serial.record_entry + SET record = target_record + WHERE id = ser_rec.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find serial subscriptions targeting the source record ... + FOR ser_sub IN SELECT * FROM serial.subscription WHERE record_entry = source_record LOOP + -- ... and move them to the target record + UPDATE serial.subscription + SET record_entry = target_record + WHERE id = ser_sub.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find booking resource types targeting the source record ... + FOR booking IN SELECT * FROM booking.resource_type WHERE record = source_record LOOP + -- ... and move them to the target record + UPDATE booking.resource_type + SET record = target_record + WHERE id = booking.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find acq lineitems targeting the source record ... + FOR acq_lineitem IN SELECT * FROM acq.lineitem WHERE eg_bib_id = source_record LOOP + -- ... and move them to the target record + UPDATE acq.lineitem + SET eg_bib_id = target_record + WHERE id = acq_lineitem.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find acq user purchase requests targeting the source record ... + FOR acq_request IN SELECT * FROM acq.user_request WHERE eg_bib = source_record LOOP + -- ... and move them to the target record + UPDATE acq.user_request + SET eg_bib = target_record + WHERE id = acq_request.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find parts attached to the source ... + FOR source_part IN SELECT * FROM biblio.monograph_part WHERE record = source_record LOOP + + SELECT INTO target_part * + FROM biblio.monograph_part + WHERE label = source_part.label + AND record = target_record; + + -- ... and if there's a conflicting one on the target ... + IF FOUND THEN + + -- ... move the copy-part maps to that, and ... + UPDATE asset.copy_part_map + SET part = target_part.id + WHERE part = source_part.id; + + -- ... move P holds to the move-target part + FOR hold IN SELECT * FROM action.hold_request WHERE target = source_part.id AND hold_type = 'P' LOOP + + UPDATE action.hold_request + SET target = target_part.id + WHERE id = hold.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- ... if not ... + ELSE + -- ... just move the part to the target record + UPDATE biblio.monograph_part + SET record = target_record + WHERE id = source_part.id; + END IF; + + moved_objects := moved_objects + 1; + END LOOP; + + -- Find multi_home items attached to the source ... + FOR multi_home IN SELECT * FROM biblio.peer_bib_copy_map WHERE peer_record = source_record LOOP + -- ... and move them to the target record + UPDATE biblio.peer_bib_copy_map + SET peer_record = target_record + WHERE id = multi_home.id; + + moved_objects := moved_objects + 1; + END LOOP; + + -- And delete mappings where the item's home bib was merged with the peer bib + DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = ( + SELECT (SELECT record FROM asset.call_number WHERE id = call_number) + FROM asset.copy WHERE id = target_copy + ); + + -- Finally, "delete" the source record + DELETE FROM biblio.record_entry WHERE id = source_record; + + -- That's all, folks! + RETURN moved_objects; +END; +$func$ LANGUAGE plpgsql; + + +SELECT evergreen.upgrade_deps_block_check('0764', :eg_version); + +UPDATE config.z3950_source + SET host = 'lx2.loc.gov', port = 210, db = 'LCDB' + WHERE name = 'loc' + AND host = 'z3950.loc.gov' + AND port = 7090 + AND db = 'Voyager'; + +UPDATE config.z3950_attr + SET format = 6 + WHERE source = 'loc' + AND name = 'lccn' + AND format = 1; + + +-- Evergreen DB patch XXXX.handle_null_svf_during_import.sql +-- +-- Prevent applying a normalization function to a null SVF +-- attribute value from breaking record import. +-- + + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0766', :eg_version); + +CREATE OR REPLACE FUNCTION vandelay.extract_rec_attrs ( xml TEXT, attr_defs TEXT[]) RETURNS hstore AS $_$ +DECLARE + transformed_xml TEXT; + prev_xfrm TEXT; + normalizer RECORD; + xfrm config.xml_transform%ROWTYPE; + attr_value TEXT; + new_attrs HSTORE := ''::HSTORE; + attr_def config.record_attr_definition%ROWTYPE; +BEGIN + + FOR attr_def IN SELECT * FROM config.record_attr_definition WHERE name IN (SELECT * FROM UNNEST(attr_defs)) ORDER BY format LOOP + + IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection + SELECT ARRAY_TO_STRING(ARRAY_ACCUM(x.value), COALESCE(attr_def.joiner,' ')) INTO attr_value + FROM vandelay.flatten_marc(xml) AS x + WHERE x.tag LIKE attr_def.tag + AND CASE + WHEN attr_def.sf_list IS NOT NULL + THEN POSITION(x.subfield IN attr_def.sf_list) > 0 + ELSE TRUE + END + GROUP BY x.tag + ORDER BY x.tag + LIMIT 1; + + ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field + attr_value := vandelay.marc21_extract_fixed_field(xml, attr_def.fixed_field); + + ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression + + SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format; + + -- See if we can skip the XSLT ... it's expensive + IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN + -- Can't skip the transform + IF xfrm.xslt <> '---' THEN + transformed_xml := oils_xslt_process(xml,xfrm.xslt); + ELSE + transformed_xml := xml; + END IF; + + prev_xfrm := xfrm.name; + END IF; + + IF xfrm.name IS NULL THEN + -- just grab the marcxml (empty) transform + SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1; + prev_xfrm := xfrm.name; + END IF; + + attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]); + + ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map + SELECT m.value::TEXT INTO attr_value + FROM vandelay.marc21_physical_characteristics(xml) v + JOIN config.marc21_physical_characteristic_value_map m ON (m.id = v.value) + WHERE v.subfield = attr_def.phys_char_sf + LIMIT 1; -- Just in case ... + + END IF; + + -- apply index normalizers to attr_value + FOR normalizer IN + SELECT n.func AS func, + n.param_count AS param_count, + m.params AS params + FROM config.index_normalizer n + JOIN config.record_attr_index_norm_map m ON (m.norm = n.id) + WHERE attr = attr_def.name + ORDER BY m.pos LOOP + EXECUTE 'SELECT ' || normalizer.func || '(' || + quote_nullable( attr_value ) || + CASE + WHEN normalizer.param_count > 0 + THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'') + ELSE '' + END || + ')' INTO attr_value; + + END LOOP; + + -- Add the new value to the hstore + new_attrs := new_attrs || hstore( attr_def.name, attr_value ); + + END LOOP; + + RETURN new_attrs; +END; +$_$ LANGUAGE PLPGSQL; + + + +SELECT evergreen.upgrade_deps_block_check('0767', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.could_be_serial_holding_code(TEXT) RETURNS BOOL AS $$ + use JSON::XS; + use MARC::Field; + + eval { + my $holding_code = (new JSON::XS)->decode(shift); + new MARC::Field('999', @$holding_code); + }; + return 0 if $@; + # verify that subfield labels are exactly one character long + foreach (keys %{ { @$holding_code } }) { + return 0 if length($_) != 1; + } + return 1; +$$ LANGUAGE PLPERLU; + +COMMENT ON FUNCTION evergreen.could_be_serial_holding_code(TEXT) IS + 'Return true if parameter is valid JSON representing an array that at minimu +m doesn''t make MARC::Field balk and only has subfield labels exactly one character long. Otherwise false.'; + + +-- This UPDATE throws away data, but only bad data that makes things break +-- anyway. +UPDATE serial.issuance + SET holding_code = NULL + WHERE NOT could_be_serial_holding_code(holding_code); + +ALTER TABLE serial.issuance + DROP CONSTRAINT IF EXISTS issuance_holding_code_check; + +ALTER TABLE serial.issuance + ADD CHECK (holding_code IS NULL OR could_be_serial_holding_code(holding_code)); + + +SELECT evergreen.upgrade_deps_block_check('0770', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.get_barcodes(select_ou INT, type TEXT, in_barcode TEXT) RETURNS SETOF evergreen.barcode_set AS $$ +DECLARE + cur_barcode TEXT; + barcode_len INT; + completion_len INT; + asset_barcodes TEXT[]; + actor_barcodes TEXT[]; + do_asset BOOL = false; + do_serial BOOL = false; + do_booking BOOL = false; + do_actor BOOL = false; + completion_set config.barcode_completion%ROWTYPE; +BEGIN + + IF position('asset' in type) > 0 THEN + do_asset = true; + END IF; + IF position('serial' in type) > 0 THEN + do_serial = true; + END IF; + IF position('booking' in type) > 0 THEN + do_booking = true; + END IF; + IF do_asset OR do_serial OR do_booking THEN + asset_barcodes = asset_barcodes || in_barcode; + END IF; + IF position('actor' in type) > 0 THEN + do_actor = true; + actor_barcodes = actor_barcodes || in_barcode; + END IF; + + barcode_len := length(in_barcode); + + FOR completion_set IN + SELECT * FROM config.barcode_completion + WHERE active + AND org_unit IN (SELECT aou.id FROM actor.org_unit_ancestors(select_ou) aou) + LOOP + IF completion_set.prefix IS NULL THEN + completion_set.prefix := ''; + END IF; + IF completion_set.suffix IS NULL THEN + completion_set.suffix := ''; + END IF; + IF completion_set.length = 0 OR completion_set.padding IS NULL OR length(completion_set.padding) = 0 THEN + cur_barcode = completion_set.prefix || in_barcode || completion_set.suffix; + ELSE + completion_len = completion_set.length - length(completion_set.prefix) - length(completion_set.suffix); + IF completion_len >= barcode_len THEN + IF completion_set.padding_end THEN + cur_barcode = rpad(in_barcode, completion_len, completion_set.padding); + ELSE + cur_barcode = lpad(in_barcode, completion_len, completion_set.padding); + END IF; + cur_barcode = completion_set.prefix || cur_barcode || completion_set.suffix; + END IF; + END IF; + IF completion_set.actor THEN + actor_barcodes = actor_barcodes || cur_barcode; + END IF; + IF completion_set.asset THEN + asset_barcodes = asset_barcodes || cur_barcode; + END IF; + END LOOP; + + IF do_asset AND do_serial THEN + RETURN QUERY SELECT 'asset'::TEXT, id, barcode FROM ONLY asset.copy WHERE barcode = ANY(asset_barcodes) AND deleted = false; + RETURN QUERY SELECT 'serial'::TEXT, id, barcode FROM serial.unit WHERE barcode = ANY(asset_barcodes) AND deleted = false; + ELSIF do_asset THEN + RETURN QUERY SELECT 'asset'::TEXT, id, barcode FROM asset.copy WHERE barcode = ANY(asset_barcodes) AND deleted = false; + ELSIF do_serial THEN + RETURN QUERY SELECT 'serial'::TEXT, id, barcode FROM serial.unit WHERE barcode = ANY(asset_barcodes) AND deleted = false; + END IF; + IF do_booking THEN + RETURN QUERY SELECT 'booking'::TEXT, id::BIGINT, barcode FROM booking.resource WHERE barcode = ANY(asset_barcodes); + END IF; + IF do_actor THEN + RETURN QUERY SELECT 'actor'::TEXT, c.usr::BIGINT, c.barcode FROM actor.card c JOIN actor.usr u ON c.usr = u.id WHERE + ((c.barcode = ANY(actor_barcodes) AND c.active) OR c.barcode = in_barcode) AND NOT u.deleted ORDER BY usr; + END IF; + RETURN; +END; +$$ LANGUAGE plpgsql; + +-- Evergreen DB patch 0783.schema.enforce_use_id_for_tcn.sql +-- +-- Sets the TCN value in the biblio.record_entry row to bib ID, +-- if the appropriate setting is in place +-- + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0783', :eg_version); + +-- FIXME: add/check SQL statements to perform the upgrade +CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$ +use strict; +use MARC::Record; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); +use MARC::Charset; +use Encode; +use Unicode::Normalize; + +MARC::Charset->assume_unicode(1); + +my $schema = $_TD->{table_schema}; +my $marc = MARC::Record->new_from_xml($_TD->{new}{marc}); + +my @old901s = $marc->field('901'); +$marc->delete_fields(@old901s); + +if ($schema eq 'biblio') { + my $tcn_value = $_TD->{new}{tcn_value}; + + # Set TCN value to record ID? + my $id_as_tcn = spi_exec_query(" + SELECT enabled + FROM config.global_flag + WHERE name = 'cat.bib.use_id_for_tcn' + "); + if (($id_as_tcn->{processed}) && $id_as_tcn->{rows}[0]->{enabled} eq 't') { + $tcn_value = $_TD->{new}{id}; + $_TD->{new}{tcn_value} = $tcn_value; + } + + my $new_901 = MARC::Field->new("901", " ", " ", + "a" => $tcn_value, + "b" => $_TD->{new}{tcn_source}, + "c" => $_TD->{new}{id}, + "t" => $schema + ); + + if ($_TD->{new}{owner}) { + $new_901->add_subfields("o" => $_TD->{new}{owner}); + } + + if ($_TD->{new}{share_depth}) { + $new_901->add_subfields("d" => $_TD->{new}{share_depth}); + } + + $marc->append_fields($new_901); +} elsif ($schema eq 'authority') { + my $new_901 = MARC::Field->new("901", " ", " ", + "c" => $_TD->{new}{id}, + "t" => $schema, + ); + $marc->append_fields($new_901); +} elsif ($schema eq 'serial') { + my $new_901 = MARC::Field->new("901", " ", " ", + "c" => $_TD->{new}{id}, + "t" => $schema, + "o" => $_TD->{new}{owning_lib}, + ); + + if ($_TD->{new}{record}) { + $new_901->add_subfields("r" => $_TD->{new}{record}); + } + + $marc->append_fields($new_901); +} else { + my $new_901 = MARC::Field->new("901", " ", " ", + "c" => $_TD->{new}{id}, + "t" => $schema, + ); + $marc->append_fields($new_901); +} + +my $xml = $marc->as_xml_record(); +$xml =~ s/\n//sgo; +$xml =~ s/^<\?xml.+\?\s*>//go; +$xml =~ s/>\s+entityize() +# to avoid having to set PERL5LIB for PostgreSQL as well + +# If we are going to convert non-ASCII characters to XML entities, +# we had better be dealing with a UTF8 string to begin with +$xml = decode_utf8($xml); + +$xml = NFC($xml); + +# Convert raw ampersands to entities +$xml =~ s/&(?!\S+;)/&/gso; + +# Convert Unicode characters to entities +$xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe; + +$xml =~ s/[\x00-\x1f]//go; +$_TD->{new}{marc} = $xml; + +return "MODIFY"; +$func$ LANGUAGE PLPERLU; + + +COMMIT; 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..a1f22bf561 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_3_5

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 6352b6e04e..04ab4c181d 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_3_5"); 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..e7e96bb1ed 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.3" !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..99aaca7117 --- /dev/null +++ b/README @@ -0,0 +1,549 @@ +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.1 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php +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] +------------------------------------------------------------------------------ +./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +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_3_5 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/` 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/startup.pl /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------ ++ +.Fedora +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/ +cp Open-ILS/examples/apache/startup.pl /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. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable + access to the offline upload / execute interface from any workstation on + any network - note that you must secure this for a production instance) + 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.pl`, 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 +------------------------------------------------------------------------------ + +.(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 +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan 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.pl --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.pl`. + +For PostgreSQL 9.0 +^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.0, you can either: + + * Install the PostgreSQL contrib modules on the machine on which you + are installing the Evergreen code, and use the `--create-database` + option from that machine, or + * Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your + PostgreSQL server and invoke it as the *postgres* Linux account: ++ +[source, bash] +------------------------------------------------------------------------------ +psql -vdb_name= -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql +------------------------------------------------------------------------------ + +Then you can issue the `eg_db_config.pl` command as above _without_ the +`--create-database` argument to create your schema and configure your +configuration files. + +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.pl` 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 acccount, 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://open-ils.org/listserv.php[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/listserv.php 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 89e64f6829..6d82f7f51c 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.3.5, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.3.5]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/]) -- 2.11.0