Bumping version numbers, adding Upgrade Script and Changelog
authorBill Erickson <berick@esilibrary.com>
Tue, 16 Apr 2013 19:00:53 +0000 (15:00 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 16 Apr 2013 19:00:53 +0000 (15:00 -0400)
Signed-off-by: Bill Erickson <berick@esilibrary.com>
ChangeLog
Open-ILS/src/perlmods/lib/OpenILS/Application.pm
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/version-upgrade/2.3.5-2.3.6-upgrade-db.sql [new file with mode: 0644]
Open-ILS/xul/staff_client/chrome/content/main/about.html
Open-ILS/xul/staff_client/defaults/preferences/prefs.js
Open-ILS/xul/staff_client/windowssetup.nsi
README [changed from symlink to file mode: 0644]
configure.ac

index 1f72b2c..c522ec9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,601 @@
-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 05df9a8c4f8a6ea98249fd9cc1e15b75d9489afe
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Tue Apr 16 14:47:47 2013 -0400
+
+    2.3.5 Translations Import
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+5      5       build/i18n/po/cat.properties/en-GB.po
+17     13      build/i18n/po/circ.properties/en-GB.po
+6      4       build/i18n/po/circ.properties/hy-AM.po
+9      9       build/i18n/po/conify.js/en-GB.po
+8      8       build/i18n/po/conify.js/hy-AM.po
+4      4       build/i18n/po/db.seed/cs-CZ.po
+8      8       build/i18n/po/db.seed/en-GB.po
+5      5       build/i18n/po/db.seed/hy-AM.po
+6      6       build/i18n/po/fm_IDL.dtd/en-GB.po
+24     24      build/i18n/po/fm_IDL.dtd/hy-AM.po
+18     11      build/i18n/po/ils_events.xml/en-GB.po
+7      4       build/i18n/po/ils_events.xml/hy-AM.po
+8      5       build/i18n/po/lang.dtd/en-GB.po
+42     42      build/i18n/po/lang.dtd/hy-AM.po
+17     17      build/i18n/po/offline.properties/en-GB.po
+4      4       build/i18n/po/offline.properties/hy-AM.po
+16     4       build/i18n/po/opac.dtd/en-GB.po
+7      7       build/i18n/po/patron.properties/en-GB.po
+4      4       build/i18n/po/patron.properties/hy-AM.po
+5      5       build/i18n/po/reservation.js/en-GB.po
+7      7       build/i18n/po/serial.properties/en-GB.po
+6      6       build/i18n/po/serial.properties/hy-AM.po
+
+commit 7eaaa8d6aabb0934f455d66dc938b9203944e0de
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Tue Apr 16 14:26:22 2013 -0400
+
+    Setting OpenILS.pm VERSION 2.0306
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+1      1       Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 42fd82c0aa9d4ca82ef5d6bd2b403e569b080350
+Author: Dan Scott <dscott@laurentian.ca>
+Date:   Fri Apr 5 01:53:55 2013 -0400
+
+    Prevent compiler warning about unused numtype var
+    
+    There was a dangling variable left around that was making noise in the
+    compiler. Credit to Jeff Godin for the heads-up.
+    
+    Signed-off-by: Dan Scott <dscott@laurentian.ca>
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+1      2       Open-ILS/src/c-apps/oils_sql.c
+
+commit 29304fa2b5481c73c990ff0db8c9f22f4a9ccd28
+Author: Mike Rylander <mrylander@gmail.com>
+Date:   Fri Apr 5 01:52:16 2013 -0400
+
+    Address SQL injection vulnerability in SQL ORM layer
+    
+    If the user-supplied value and the db column are both numbers
+    (jsonObject->type == JSON_NUMBER, get_primitive(field) == "number") then
+    don't quote. Otherwise, quote.
+    
+    Signed-off-by: Mike Rylander <mrylander@gmail.com>
+    Signed-off-by: Dan Scott <dscott@laurentian.ca>
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+4      18      Open-ILS/src/c-apps/oils_sql.c
+
+commit 432cab084e7dc92b10091e1a98925975bc7b360e
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Tue Apr 9 13:45:24 2013 -0400
+
+    TPAC bucket item retrieval operates in streaming mode
+    
+    TPAC bucket item retreive fleshes bib records with large blobs of MARC
+    data.  When a bucket contains a few thousand items, the size of the
+    data passed around in atomic retreival mode will exceed the typical jabber
+    max stanza size and result in a failure.  Retrieve the records in
+    streaming mode instead.
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Ben Shum <bshum@biblio.org>
+
+2      1       Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+
+commit 47da46d7875f8d93ed86775b02cfde22f038282c
+Author: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+Date:   Wed Apr 3 10:50:22 2013 -0400
+
+    Repair an issue in search filter group UI about filtering on owner OU
+    
+    What was intended to be a filter against filter groups' owner field was
+    instead turned into a filter on filter group ID.
+    
+    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander@gmail.com>
+
+1      1       Open-ILS/src/templates/conify/global/actor/search_filter_group.tt2
+
+commit 7c3f5e6c04d70d35c3e9f354b234249e183b7cff
+Author: Mike Rylander <mrylander@gmail.com>
+Date:   Tue Apr 2 09:40:07 2013 -0400
+
+    stamping upgrade script for authority validation fix
+    
+    Signed-off-by: Mike Rylander <mrylander@gmail.com>
+
+1      1       Open-ILS/src/sql/Pg/002.schema.config.sql
+84     0       Open-ILS/src/sql/Pg/upgrade/0787.schema.authority_normalize_heading.sql
+0      84      Open-ILS/src/sql/Pg/upgrade/xxxx.schema.authority_normalize_heading.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0787.schema.authority_normalize_heading.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.schema.authority_normalize_heading.sql
+
+commit 28743041b8ef121e200fcf2ba4ec03a49d26b608
+Author: Steven Callender <stevecallender@esilibrary.com>
+Date:   Fri Jun 15 13:27:33 2012 -0400
+
+    Avoid problems when auth recs are missing the 901c
+    
+    Fixed the authority.normalize_heading function to better handle
+    INT's when there is no 901 present. Now we look for the best-fit
+    control set instead of throwing a db-level error.
+    
+    Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
+    Signed-off-by: Mike Rylander <mrylander@gmail.com>
+
+1      1       Open-ILS/src/sql/Pg/011.schema.authority.sql
+84     0       Open-ILS/src/sql/Pg/upgrade/xxxx.schema.authority_normalize_heading.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.schema.authority_normalize_heading.sql
+
+commit 78103475da805ca9e59d7c94e531fdcc7b43260e
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 27 16:26:28 2013 -0400
+
+    LP 1160522 2.3 tpac search modifier query append
+    
+    Append search modifiers (e.g. limit to available) to the end of the
+    tpac search query to avoid SQL generation issues with 2.3 series
+    query parser.
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Ben Shum <bshum@biblio.org>
+
+5      4       Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+
+commit 32da2a9d0e78c1348cfd9b490f3100168c50b73c
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Fri Mar 29 13:36:17 2013 -0400
+
+    LP 1126545 repair staff 'return to results' tpac link
+    
+    Strip the extra "/" from the URL created by the "return to results"
+    button in the staff client TPAC view.  Havin the extra "/" in place
+    prevents the next/previous links from functioning.
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Jason Etheridge <jason@esilibrary.com>
+    Signed-off-by: Ben Shum <bshum@biblio.org>
+
+1      1       Open-ILS/web/js/ui/default/opac/staff.js
+
+commit cee7bab642ba1ff99110d933387fa33701d23d3f
+Author: Dan Wells <dbw2@calvin.edu>
+Date:   Fri Mar 15 14:47:53 2013 -0400
+
+    Allow access to public hold notes via hold "blob"
+    
+    If a hold note is marked as "public", it seems reasonable that it
+    should be visible to anyone who can see that hold, regardless of
+    who created the note.
+    
+    Signed-off-by: Dan Wells <dbw2@calvin.edu>
+    Signed-off-by: Kyle Tomita <ktomita@catalystitservices.com>
+
+4      4       Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit 3116f06be0cdf05cd3073e9ac56dac69eecaa3ef
+Author: Dan Wells <dbw2@calvin.edu>
+Date:   Fri Mar 15 14:42:24 2013 -0400
+
+    Fix reversed logic for hold "blob" notes
+    
+    Hold notes (at least at the data level) allow for both staff and
+    "private" notes to be attached. This code intended to show "private"
+    notes to the hold owner and staff notes to staff, but had the logic
+    reversed.
+    
+    Signed-off-by: Dan Wells <dbw2@calvin.edu>
+    Signed-off-by: Kyle Tomita <ktomita@catalystitservices.com>
+
+3      3       Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit 0552b0aca01c60e50b8ccc0528f793dc383d1fd2
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Mon Mar 25 15:19:14 2013 -0400
+
+    tpac : honor page locale in record detail copy grid
+    
+    The query used to load the record detail copy grid now uses the same
+    locale value set as the default for all cstore-editor calls.  This
+    solves the issue where copy location names, statuses, etc. are not
+    properly translated.
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
+    Signed-off-by: Mike Rylander <mrylander@gmail.com>
+
+1      0       Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+
+commit e930d2a8a534ce6cc1917b1b1374685b8480679b
+Author: Mike Rylander <mrylander@gmail.com>
+Date:   Fri Mar 22 10:40:59 2013 -0400
+
+    More authority fixed-field cleanup
+    
+    Even with the efforts by many to add and harmonize the authority fixed-field
+    setup, and maintain functionality, there were some missing bits.  This commit
+    should take care of those by realigning the remaining field names and allwowing
+    those fields to be saved properly.
+    
+    Signed-off-by: Mike Rylander <mrylander@gmail.com>
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+1      1       Open-ILS/web/js/dojo/MARC/FixedFields.js
+18     18      Open-ILS/xul/staff_client/server/cat/marcedit.xul
+
+commit a71c156facd55ad3f8135ac4758cbf591aec11dd
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 27 10:18:00 2013 -0400
+
+    LP 1134331 Back-port 2.2.3 and 2.2.4 upgrade scripts
+    
+    Sites upgrading from versions < 2.2.4 may need these.
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Ben Shum <bshum@biblio.org>
+
+519    0       Open-ILS/src/sql/Pg/version-upgrade/2.2.2-2.2.3-upgrade-db.sql
+33     0       Open-ILS/src/sql/Pg/version-upgrade/2.2.3-2.2.4-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.2.2-2.2.3-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.2.3-2.2.4-upgrade-db.sql
+
+commit acd15d1afc42e3c4ccfa140297543121b4eefc4f
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 16:42:10 2013 -0400
+
+    LP 1150458 DB upgrade stamping
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+1      1       Open-ILS/src/sql/Pg/002.schema.config.sql
+39     0       Open-ILS/src/sql/Pg/upgrade/0784.schema.axis_authority_tags_refs_aggregate.sql
+0      39      Open-ILS/src/sql/Pg/upgrade/XXXX.function.axis_authority_tags_refs_aggregate
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0784.schema.axis_authority_tags_refs_aggregate.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.axis_authority_tags_refs_aggregate
+
+commit 2cd7d4866f5bc960b46a1486247fb1b3b40cee47
+Author: Steven Callender <stevecallender@esilibrary.com>
+Date:   Thu Mar 7 09:28:08 2013 -0500
+
+    Changed the way authority tags were being pulled to specifically use an aggregate array.
+    
+    There appears to have been a change in postgres at some point between 9.0 and 9.1
+    to the aggregate method. Because of this, postgres was not returning the proper
+    results when pulling tags for authorities. This change will force postgres to do
+    a proper aggregate array call and return the correct results.
+    
+    Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+21     19      Open-ILS/src/sql/Pg/011.schema.authority.sql
+39     0       Open-ILS/src/sql/Pg/upgrade/XXXX.function.axis_authority_tags_refs_aggregate
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.axis_authority_tags_refs_aggregate
+
+commit 4f0b43e7b510710f8180a913271e987a4864cf66
+Author: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+Date:   Wed Mar 20 13:58:09 2013 -0400
+
+    DB upgrade script for 2.2.7
+    
+    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+
+481    0       Open-ILS/src/sql/Pg/version-upgrade/2.2.6-2.2.7-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.2.6-2.2.7-upgrade-db.sql
+
+commit e632e3b751ef46530a0abbbe4357c5ef164ed742
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 10:21:22 2013 -0400
+
+    2.3.4 -> 2.3.5 DB upgrade script
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+
+619    0       Open-ILS/src/sql/Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.4-2.3.5-upgrade-db.sql
+
+commit 0e7d2183c1919990051b53500c1a37b78c6690cf
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 09:21:46 2013 -0400
+
+    2.3.5 Translations repair Finnish Last-Translator
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+
+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 49b85c1d1380380fb3d42034ba353cadf791b5f8
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 09:15:45 2013 -0400
+
+    2.3.5 Translations newpot
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+
+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 ca43fa77ea5c0970aeef7b3f7e0f110aad253a1a
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 09:12:17 2013 -0400
+
+    2.3.5 Translations Import
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
+
+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 f69422430e6ac9660378456a72752aff75d0d9f3
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 11:35:30 2013 -0400
+
+    Placeholder DB upgrade for 2.3.4
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Ben Shum <bshum@biblio.org>
+
+5      0       Open-ILS/src/sql/Pg/version-upgrade/2.3.3-2.3.4-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.3-2.3.4-upgrade-db.sql
+
+commit 8e5d2afb29ab5213a09f3f6892dbedca067fc79c
+Author: Bill Erickson <berick@esilibrary.com>
+Date:   Wed Mar 20 11:35:17 2013 -0400
+
+    Placeholder DB upgrade for 2.2.6
+    
+    Signed-off-by: Bill Erickson <berick@esilibrary.com>
+    Signed-off-by: Ben Shum <bshum@biblio.org>
+
+5      0       Open-ILS/src/sql/Pg/version-upgrade/2.2.5-2.2.6-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.2.5-2.2.6-upgrade-db.sql
index cd4dbbf..3efe40c 100644 (file)
@@ -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-6";
 }
 
 __PACKAGE__->register_method(
index 343776d..9bb9f0d 100644 (file)
@@ -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 ('0787', :eg_version); -- callender/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.6', :eg_version);
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.3.5-2.3.6-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.3.5-2.3.6-upgrade-db.sql
new file mode 100644 (file)
index 0000000..70fada7
--- /dev/null
@@ -0,0 +1,124 @@
+--Upgrade Script for 2.3.5 to 2.3.6
+\set eg_version '''2.3.6'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.6', :eg_version);
+-- Evergreen DB patch XXXX.function.axis_authority_tags_refs_aggregate.sql
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0784', :eg_version);
+
+CREATE OR REPLACE FUNCTION authority.axis_authority_tags_refs(a TEXT) RETURNS INT[] AS $$
+    SELECT ARRAY_AGG(y) from (
+       SELECT  unnest(ARRAY_CAT(
+                 ARRAY[a.field],
+                 (SELECT ARRAY_ACCUM(x.id) FROM authority.control_set_authority_field x WHERE x.main_entry = a.field)
+             )) y
+       FROM  authority.browse_axis_authority_field_map a
+       WHERE axis = $1) x;
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION authority.btag_authority_tags_refs(btag TEXT) RETURNS INT[] AS $$
+    SELECT ARRAY_AGG(y) from (
+        SELECT  unnest(ARRAY_CAT(
+                    ARRAY[a.authority_field],
+                    (SELECT ARRAY_ACCUM(x.id) FROM authority.control_set_authority_field x WHERE x.main_entry = a.authority_field)
+                )) y
+      FROM  authority.control_set_bib_field a
+      WHERE a.tag = $1) x
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION authority.atag_authority_tags_refs(atag TEXT) RETURNS INT[] AS $$
+    SELECT ARRAY_AGG(y) from (
+        SELECT  unnest(ARRAY_CAT(
+                    ARRAY[a.id],
+                    (SELECT ARRAY_ACCUM(x.id) FROM authority.control_set_authority_field x WHERE x.main_entry = a.id)
+                )) y
+      FROM  authority.control_set_authority_field a
+      WHERE a.tag = $1) x
+$$ LANGUAGE SQL;
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0787');
+
+CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT, no_thesaurus BOOL ) RETURNS TEXT AS $func$
+DECLARE
+    acsaf           authority.control_set_authority_field%ROWTYPE;
+    tag_used        TEXT;
+    nfi_used        TEXT;
+    sf              TEXT;
+    thes_code       TEXT;
+    cset            INT;
+    heading_text    TEXT;
+    tmp_text        TEXT;
+    first_sf        BOOL;
+    auth_id         INT DEFAULT COALESCE(NULLIF(oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml), ''), '0')::INT;
+BEGIN
+    SELECT control_set INTO cset FROM authority.record_entry WHERE id = auth_id;
+
+    IF cset IS NULL THEN
+        SELECT  control_set INTO cset
+          FROM  authority.control_set_authority_field
+          WHERE tag IN ( SELECT  UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[]))
+          LIMIT 1;
+    END IF;
+
+    thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj');
+    IF thes_code IS NULL THEN
+        thes_code := '|';
+    ELSIF thes_code = 'z' THEN
+        thes_code := COALESCE( oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml), '' );
+    END IF;
+
+    heading_text := '';
+    FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset AND main_entry IS NULL LOOP
+        tag_used := acsaf.tag;
+        nfi_used := acsaf.nfi;
+        first_sf := TRUE;
+        FOR sf IN SELECT * FROM regexp_split_to_table(acsaf.sf_list,'') LOOP
+            tmp_text := oils_xpath_string('//*[@tag="'||tag_used||'"]/*[@code="'||sf||'"]', marcxml);
+
+            IF first_sf AND tmp_text IS NOT NULL AND nfi_used IS NOT NULL THEN
+
+                tmp_text := SUBSTRING(
+                    tmp_text FROM
+                    COALESCE(
+                        NULLIF(
+                            REGEXP_REPLACE(
+                                oils_xpath_string('//*[@tag="'||tag_used||'"]/@ind'||nfi_used, marcxml),
+                                $$\D+$$,
+                                '',
+                                'g'
+                            ),
+                            ''
+                        )::INT,
+                        0
+                    ) + 1
+                );
+
+            END IF;
+
+            first_sf := FALSE;
+
+            IF tmp_text IS NOT NULL AND tmp_text <> '' THEN
+                heading_text := heading_text || E'\u2021' || sf || ' ' || tmp_text;
+            END IF;
+        END LOOP;
+        EXIT WHEN heading_text <> '';
+    END LOOP;
+
+    IF heading_text <> '' THEN
+        IF no_thesaurus IS TRUE THEN
+            heading_text := tag_used || ' ' || public.naco_normalize(heading_text);
+        ELSE
+            heading_text := tag_used || '_' || COALESCE(nfi_used,'-') || '_' || thes_code || ' ' || public.naco_normalize(heading_text);
+        END IF;
+    ELSE
+        heading_text := 'NOHEADING_' || thes_code || ' ' || MD5(marcxml);
+    END IF;
+        RETURN heading_text;
+END;
+$func$ LANGUAGE PLPGSQL IMMUTABLE;
+
+COMMIT;
index 2737f47..4ae0671 100644 (file)
@@ -1,7 +1,7 @@
 <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
 <h1 style="text-decoration: underline">Evergreen</h1>
 <p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_3_6</p>
 <h2>What is Evergreen?</h2>
 <blockquote>
 <p>
index 6352b6e..499184d 100644 (file)
@@ -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_6");
 pref("open-ils.repository.author","$Author$");
 pref("open-ils.repository.revision","$Revision$");
 pref("open-ils.repository.date","$Date$");
index e0bc1ef..e7e96bb 100644 (file)
@@ -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 (symlink)
index b57451acb41c034e7227f89004b1c6bd4babbf04..0000000000000000000000000000000000000000
--- 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 (file)
index 0000000000000000000000000000000000000000..7f94d2cad9ff8b8397126fe0360e90790754e922
--- /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 <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+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_6 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]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+   StartServers           20
+   MinSpareServers         5
+   MaxSpareServers        15
+   MaxClients            150
+   MaxRequestsPerChild 10000
+</IfModule>
+------------------------------------------------------------------------------
++
+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 <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+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 <user> --password <password> --hostname <hostname> --port <port> \
+       --database <dbname> --admin-user <admin-user> --admin-pass <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=<dbname> -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 <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+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.
index 89e64f6..2aa7214 100644 (file)
@@ -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.6, open-ils-dev@list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.3.6])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_PREFIX_DEFAULT([/openils/])