[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_10_2 created. d3a1a68702a2dcb8e62260e84e96e9175cca570c
Evergreen Git
git at git.evergreen-ils.org
Thu Apr 28 14:38:21 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, tags/rel_2_10_2 has been created
at d3a1a68702a2dcb8e62260e84e96e9175cca570c (commit)
- Log -----------------------------------------------------------------
commit d3a1a68702a2dcb8e62260e84e96e9175cca570c
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 28 13:57:40 2016 -0400
update upgrade instructions for 2.10.2
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 1266901..e4026ef 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -8,7 +8,7 @@ Software Prerequisites
* **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
is 9.1.
- * **Linux**: Evergreen 2.10.1 has been tested on Debian Jessie (8.0),
+ * **Linux**: Evergreen 2.10.2 has been tested on Debian Jessie (8.0),
Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
Ubuntu Precise Pangolin (12.04), and Fedora.
If you are running an older version of these distributions, you may want
@@ -44,12 +44,12 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the *opensrf* user, download and extract Evergreen 2.10.1:
+. As the *opensrf* user, download and extract Evergreen 2.10.2:
+
[source, bash]
-----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.10.1.tar.gz
-tar xzf Evergreen-ILS-2.10.1.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.10.2.tar.gz
+tar xzf Evergreen-ILS-2.10.2.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
+cd /home/opensrf/Evergreen-ILS-2.10.2
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -84,7 +84,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
+cd /home/opensrf/Evergreen-ILS-2.10.2
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -95,8 +95,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
-make STAFF_CLIENT_STAMP_ID=rel_2_10_1 install
+cd /home/opensrf/Evergreen-ILS-2.10.2
+make STAFF_CLIENT_STAMP_ID=rel_2_10_2 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -112,7 +112,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_10_1/server server
+ln -sf rel_2_10_2/server server
----------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -132,7 +132,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
+cd /home/opensrf/Evergreen-ILS-2.10.2
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -156,21 +156,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.10.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.10.2/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.10.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.10.2/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.10.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.10.2/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -193,7 +193,7 @@ anything goes wrong during the upgrade.
=============
Evergreen provides incremental upgrade scripts that allow you to upgrade
from one minor version to the next until you have the current version of
-the schema. For example, if you want to upgrade from 2.5.1 to 2.10.1, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.10.2, you
would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
@@ -216,13 +216,14 @@ would run the following upgrade scripts:
- 2.9.2-2.9.3-upgrade-db.sql
- 2.9.3-2.10.0-upgrade-db.sql
- 2.10.0-2.10.1-upgrade-db.sql
+- 2.10.1-2.10.2-upgrade-db.sql
Note that you do *not* want to run additional 2.5 scripts to upgrade to the
newest version of 2.5, since currently there is no automated way to upgrade
from 2.5.4+ to 2.6. Only upgrade as far as necessary to reach the major
version upgrade script (in this example, as far as 2.5.3).
-To upgrade across multiple major versions (e.g. from 2.3.0 to 2.10.1), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.10.2), use
the same logic to utilize the provided major version upgrade scripts. For
example:
@@ -240,7 +241,7 @@ example:
- 2.8.4-2.9.0-upgrade-db.sql
- (run all incremental scripts from 2.9.0 to 2.9.3)
- 2.9.3-2.10.0-upgrade-db.sql
-- (run all incremental scripts from 2.10.0 to 2.10.1)
+- (run all incremental scripts from 2.10.0 to 2.10.2)
=============
[CAUTION]
@@ -254,8 +255,8 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.0/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.10.0-2.10.1-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.10.2/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/2.10.1-2.10.2-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
commit 09ce291173258bfcd296e213183fb044b841405d
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 28 13:22:32 2016 -0400
Bumping version numbers and adding Changelog
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..8e3fe90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,859 @@
-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 6448ccefe958d50a2c2dcf8e0b130f29b68c1ad4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 13:15:42 2016 -0400
+
+ 2.10.1 to 2.10.2 schema upgrade script
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+54 0 Open-ILS/src/sql/Pg/version-upgrade/2.10.1-2.10.2-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.1-2.10.2-upgrade-db.sql
+
+commit 3420c4733abc05b57e4f75a7d2e17d17a8de33e1
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 12:26:19 2016 -0400
+
+ updates to the 2.10.2 release notes
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+13 3 docs/RELEASE_NOTES_2_10.adoc
+
+commit 42d0847d431a1d57d3757cda779b2959aa89e5f9
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Thu Apr 28 09:27:16 2016 -0400
+
+ Adding 2.10.2 point release notes
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+57 0 docs/RELEASE_NOTES_2_10.adoc
+
+commit 7a3b89d1f9cd6299275bdf3a3df73c8d838bbedc
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 12:21:50 2016 -0400
+
+ update release notes for 2.9.4
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+6 1 docs/RELEASE_NOTES_2_9.txt
+
+commit 7773be463aa34344ea6e59ab33dfa43707a4932d
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Thu Apr 28 08:47:05 2016 -0400
+
+ Adding 2.9.4 release notes
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+29 0 docs/RELEASE_NOTES_2_9.txt
+
+commit 07a6e3f2cb1a74bca1cec136c61507d300088c72
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 12:20:45 2016 -0400
+
+ updates to 2.8.8 release notes
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+3 1 docs/RELEASE_NOTES_2_8.txt
+
+commit 3858d51553d9d66f3f9941322dc005f4743f40a0
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Thu Apr 28 08:35:43 2016 -0400
+
+ Point release notes for the 2.8.8 release
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+11 0 docs/RELEASE_NOTES_2_8.txt
+
+commit 063ac67fad399b6993abca66ede7b9d498356785
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Mar 25 16:46:24 2016 -0400
+
+ LP#1562153: fix case where changing sort order to relevance can fail
+
+ This patch fixes a cause where sending a 'sort' CGI parameter
+ with the empty string as value (which specifies relevance sorting)
+ fails to override a previously-set sort order.
+
+ To test:
+
+ [1] Do a public catalog search starting from the advanced search form,
+ e.g., keyword = "cats"
+ [2] Change the sort order to (say) Title A-Z from the results page.
+ [3] Note that the query string changes to "sort(titlesort) cats" and
+ that the results are re-sorted
+ [4] Attempt to change the sort order to relevance.
+ [5] This time, the sort order does not change ... and it should have.
+ [6] Apply the patch and repeat steps 1-5. This time, the sort order
+ should be successfully changed.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+5 2 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+
+commit cb5684cc8da7aa4259a0a2fc6a0ea57b50cf7222
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Mar 25 16:44:15 2016 -0400
+
+ LP#1562153: add regression test
+
+ This patch adds a regression test for successfully
+ overrding the sort order in a query from a 'sort' CGI
+ parameter.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+12 1 Open-ILS/src/perlmods/t/19-OpenILS-WWW-EGCatLoader.t
+
+commit 12e9b3225eed12a763b45de7c20797674c9dcdad
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Mar 30 13:29:10 2016 -0400
+
+ LP#1563531: add libpcre3/libpcre3-dev deps for Jessie
+
+ This patch adds libpcre3 and libpcre3-dev to the list
+ of packages installed when installing Evergreen on Debian
+ Jessie. Evergreen's direct dependency on libpcre3 is new in 2.10
+ (see bug 1468422); it happens that libpcre3 and libpcre3-dev
+ are installed on Wheezy by virtue of a different dependency
+ chain.
+
+ To test
+ -------
+ [1] On a fresh Debian Jessie netinstall, follow the OpenSRF
+ and Evergreen installation instructions. Verify that with
+ this patch in place, Evergreen's "configure" step succeeds.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+2 0 Open-ILS/src/extras/install/Makefile.debian-jessie
+
+commit f81ec9ce061fe093498ed3902fb6b8b4fd6fe1d3
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Thu Apr 28 11:54:28 2016 -0400
+
+ LP#1568195: Stamping upgrade script
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+36 0 Open-ILS/src/sql/Pg/upgrade/0978.schema.make_ous_batch_retrieve_func_nonvariadic.sql
+0 36 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.make_ous_batch_retrieve_func_nonvariadic.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0978.schema.make_ous_batch_retrieve_func_nonvariadic.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.make_ous_batch_retrieve_func_nonvariadic.sql
+
+commit 904ad79f0a7d114454d08b2822f955e10bc7bf73
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Apr 8 21:46:35 2016 -0400
+
+ LP#1568195: fix retrieving big OUS batches
+
+ This patch fixes a regression introduced in LP#1501471
+ where the Library Settings Editor could fail to retrieve
+ the values of org unit settings if more than 99 were
+ requested at a time.
+
+ To test
+ -------
+ [1] Open the XUL library settings editor and ensure that
+ no search filters are in effect. Note that values
+ are not displayed for any of the OU settings, and that
+ the Pg log contains error messages like this:
+
+ "ERROR: cannot pass more than 100 arguments to a function"
+
+ [2] Apply the patch.
+ [3] Repeat step one, and verify that values are now retrieved
+ for all of the OU settings that have values set.
+ [4] Verify that the pgTAP tests in live_t/aous_batch.pg pass.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+7 1 Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+2 2 Open-ILS/src/sql/Pg/020.schema.functions.sql
+3 3 Open-ILS/src/sql/Pg/live_t/aous_batch.pg
+36 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.make_ous_batch_retrieve_func_nonvariadic.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.make_ous_batch_retrieve_func_nonvariadic.sql
+
+commit c86b93b9c3a2e49934072b2bab8388c81dfe8cf7
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 11:31:20 2016 -0400
+
+ LP#1569884: stamp schema update
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+8 0 Open-ILS/src/sql/Pg/upgrade/0977.schema.allow_parts_to_be_recreated.sql
+0 8 Open-ILS/src/sql/XXXX.schema.allow_parts_to_be_recreated.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0977.schema.allow_parts_to_be_recreated.sql
+ delete mode 100644 Open-ILS/src/sql/XXXX.schema.allow_parts_to_be_recreated.sql
+
+commit aee25ed4af15e12830fbabc5acdb783f9fb77d80
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 11:27:11 2016 -0400
+
+ LP#1569884: fix schema update script
+
+ CREATE INDEX cannot run concurrently in a transaction
+ block period, at least as of 9.4.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/XXXX.schema.allow_parts_to_be_recreated.sql
+
+commit 9c734be41407263ce3ce77a822302edcf05fb199
+Author: Jason Stephenson <jstephenson at mvlcstaff.org>
+Date: Wed Apr 27 15:43:31 2016 -0400
+
+ LP#1569884 Fix two problems in previous commit.
+
+ The CREATE TABLE biblio.monograph_part statement in
+ 010.schema.biblio.sql ended up with a trailing comma.
+
+ The CREATE UNIQUE INDEX on biblio.monograph_part cannot be done
+ CONCURRENTLY at DB creation time, apparently. At least not on
+ PostgreSQL 9.3.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2 2 Open-ILS/src/sql/Pg/010.schema.biblio.sql
+
+commit 5e82acab0c48c2fc08299608ce2043dc595b2288
+Author: Steven Callender <stevecallender at esilibrary.com>
+Date: Wed Apr 27 12:05:48 2016 -0400
+
+ LP#1569884 Updated base schema with monograph parts index.
+
+ Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/Pg/010.schema.biblio.sql
+
+commit 12d9fa7cc810fc87e619ab3ecd9ba70ec1238355
+Author: Steven Callender <stevecallender at esilibrary.com>
+Date: Wed Apr 13 11:15:27 2016 -0400
+
+ LP#1569884 Allow deleted monograph parts to be recreated.
+
+ Changed the constraint on the biblio.monograph_part table to allow for a
+ monograph part to be created if a duplicate deleted version is found.
+
+ To test:
+
+ [1] Add a monograph part to a bib.
+ [2] Delete that monograph part.
+ [3] Attempt to add a monograph part to the same bib using
+ the same part label. Without the patches installed, this
+ will fail; upon applying the database update, this operation
+ should succeed.
+
+ Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+8 0 Open-ILS/src/sql/XXXX.schema.allow_parts_to_be_recreated.sql
+ create mode 100644 Open-ILS/src/sql/XXXX.schema.allow_parts_to_be_recreated.sql
+
+commit 5edce038cd5965261d725afee4c2dbb9e24f36e4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Apr 28 11:20:29 2016 -0400
+
+ LP#1569884: add regression test
+
+ This pgTAP test verifies that if you logically delete a monograph part,
+ you can subsequently add a new one with the same label as that of the
+ deleted one.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+52 0 Open-ILS/src/sql/Pg/t/regress/lp1569884_readd_deleted_bmp.sql
+ create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp1569884_readd_deleted_bmp.sql
+
+commit 5b63792c560afb0e29fb33f048c76f5ba3440608
+Author: Jason Stephenson <jason at sigio.com>
+Date: Sat Mar 26 20:16:34 2016 -0400
+
+ LP 1562426: Renumber Perl live_t tests.
+
+ We had some overlap in numbers at the beginning of test file names.
+ The OCD in me think this should be straightened out. This branch
+ renumbers the duplicates starting with 10-.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+0 36 Open-ILS/src/perlmods/live_t/10-lp1481036-future-backdate.t
+0 38 Open-ILS/src/perlmods/live_t/10-lp1484989_dont_close_fined_xacts.t
+0 43 Open-ILS/src/perlmods/live_t/11-lp1240119-safe-token-activity.t
+36 0 Open-ILS/src/perlmods/live_t/11-lp1481036-future-backdate.t
+38 0 Open-ILS/src/perlmods/live_t/12-lp1484989_dont_close_fined_xacts.t
+0 252 Open-ILS/src/perlmods/live_t/12-lp1499123_csp_ignore_proximity.t
+0 173 Open-ILS/src/perlmods/live_t/12-lp1533329-opt-in.t
+0 88 Open-ILS/src/perlmods/live_t/13-acq-invoicing.t
+43 0 Open-ILS/src/perlmods/live_t/13-lp1240119-safe-token-activity.t
+252 0 Open-ILS/src/perlmods/live_t/14-lp1499123_csp_ignore_proximity.t
+173 0 Open-ILS/src/perlmods/live_t/15-lp1533329-opt-in.t
+88 0 Open-ILS/src/perlmods/live_t/16-acq-invoicing.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/10-lp1481036-future-backdate.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/10-lp1484989_dont_close_fined_xacts.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/11-lp1240119-safe-token-activity.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/11-lp1481036-future-backdate.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/12-lp1484989_dont_close_fined_xacts.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/12-lp1499123_csp_ignore_proximity.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/12-lp1533329-opt-in.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/13-acq-invoicing.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/13-lp1240119-safe-token-activity.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/14-lp1499123_csp_ignore_proximity.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/15-lp1533329-opt-in.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/16-acq-invoicing.t
+
+commit aabe6f8d397873e07734cb0642f92c0f053514a2
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Apr 27 10:35:49 2016 -0400
+
+ LP#1564079 Stamping upgrade script
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+13 0 Open-ILS/src/sql/Pg/upgrade/0976.schema.fix_circ_history_copy_ref.sql
+0 14 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_circ_history_copy_ref.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0976.schema.fix_circ_history_copy_ref.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_circ_history_copy_ref.sql
+
+commit 9a87f5241b722336ba194a9146fdd79a38474f91
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Mar 30 17:57:59 2016 -0400
+
+ LP#1564079 Checkout history skips nonexistent items
+
+ Modify the user checkout history migration process
+ (2.9.3-2.10.0-upgrade-db.sql and 0960.schema.decouple_co_history.sql) to
+ avoid inserting history rows for circulations whose copies do not
+ exist in the database.
+
+ For reference, this is a rare condition that cannot be recreated in a
+ modern EG system short of modifying constraints.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8 0 Open-ILS/src/sql/Pg/upgrade/0960.schema.decouple_co_history.sql
+8 0 Open-ILS/src/sql/Pg/version-upgrade/2.9.3-2.10.0-upgrade-db.sql
+
+commit 95def1984b4ccded97a0657e8196d4d4e95e96d7
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Mar 30 17:49:26 2016 -0400
+
+ LP#1564079 Checkout history handles serials
+
+ Remove the target_copy foreign key constraint on action.usr_circ_history
+ so that it does not prevent creation of rows from circulation's that
+ link to serial.unit objects. Similar to action.circulation, the foreign
+ key constraint is enforced via a evergreen.fake_fkey_tgr trigger
+ instead.
+
+ This modifies the 2.9.3-2.10.0-upgrade-db.sql and 0960 upgrade scripts,
+ since without this change, the scripts may fail.
+
+ A separate upgrade script is added to drop the constraint for those who
+ have already successfully run the the 2.9.3-2.10.0-upgrade-db.sql script
+ (i.e. those who don't use serials). For simplicity, the
+ evergreen.fake_fkey_tgr trigger is only applied in this separate upgrade
+ script (in addition to the base schema, of course).
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 2 Open-ILS/src/sql/Pg/090.schema.action.sql
+1 2 Open-ILS/src/sql/Pg/upgrade/0960.schema.decouple_co_history.sql
+14 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_circ_history_copy_ref.sql
+1 2 Open-ILS/src/sql/Pg/version-upgrade/2.9.3-2.10.0-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_circ_history_copy_ref.sql
+
+commit f49bdab6743fbcf44492b0e6ce2a35721b9c8195
+Author: Angela Kilsdonk <akilsdonk at esilibrary.com>
+Date: Wed Apr 20 14:42:09 2016 -0400
+
+ Docs: image fix
+
+ Signed-off-by: Angela Kilsdonk <akilsdonk at esilibrary.com>
+
+1 1 docs/acquisitions/selection_lists_po.txt
+
+commit 369634e325d38a5b52b43d716057f1fbbcd6b37c
+Author: Angela Kilsdonk <akilsdonk at esilibrary.com>
+Date: Wed Apr 20 14:23:02 2016 -0400
+
+ Docs: Paid PO Lineitems
+
+ Signed-off-by: Angela Kilsdonk <akilsdonk at esilibrary.com>
+
+7 0 docs/acquisitions/selection_lists_po.txt
+- - docs/media/2.10_Lineitem_Paid.PNG
+ create mode 100644 docs/media/2.10_Lineitem_Paid.PNG
+
+commit 2b99495d4843a1009150ce5e06db7f0bb30fb358
+Author: Angela Kilsdonk <akilsdonk at esilibrary.com>
+Date: Wed Apr 20 11:04:45 2016 -0400
+
+ Docs: Funds disencumbered when invoice is closed
+
+ Signed-off-by: Angela Kilsdonk <akilsdonk at esilibrary.com>
+
+2 2 docs/acquisitions/invoices.txt
+
+commit 532fa7423bb0e3cceffe264b2f698407dc955208
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Mar 18 10:34:40 2016 -0400
+
+ LP#1559121: remove Debian Squeeze support
+
+ Now that Debian Squeeze's LTS (long-term support) period
+ has ended, Evergreen no longer offers community support
+ for that distribution. This patch removes references
+ to Squeeze from the installation scripts and documentation.
+
+ To test:
+
+ [1] Verify that Debian Squeeze is no longer referenced in
+ the installation documentation.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+ Conflicts:
+ docs/installation/server_upgrade.txt
+
+1 7 Open-ILS/src/extras/Makefile.install
+0 133 Open-ILS/src/extras/install/Makefile.debian-squeeze
+5 13 docs/installation/server_installation.txt
+1 2 docs/installation/server_upgrade.txt
+ delete mode 100644 Open-ILS/src/extras/install/Makefile.debian-squeeze
+
+commit 525798bdb17e3e1f3970530506b2184a67451cf1
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Fri Apr 22 16:51:20 2016 -0400
+
+ Docs: clean up formatting & typos in using_the_public_access_catalog.txt
+
+ Thanks to Anna Goben for these fixes.
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+7 7 docs/opac/using_the_public_access_catalog.txt
+
+commit c3bab41e8906265ce8333458e59d53030702a869
+Author: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+Date: Thu Apr 21 20:02:21 2016 -0700
+
+ Docs: Screenshots and step by step instructions added to Self Check section
+
+ Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+
+79 11 docs/circulation/self_check.txt
+- - docs/media/self-check-admin-login.png
+- - docs/media/self_check_check_out_1.png
+- - docs/media/self_check_check_out_1b.png
+- - docs/media/self_check_check_out_2.png
+- - docs/media/self_check_check_out_3.png
+- - docs/media/self_check_check_out_4.png
+- - docs/media/self_check_check_out_5.png
+- - docs/media/self_check_check_out_6.png
+- - docs/media/self_check_error_1.png
+- - docs/media/self_check_view_fines_1.png
+- - docs/media/self_check_view_fines_2.png
+- - docs/media/self_check_view_holds_1.png
+- - docs/media/self_check_view_holds_2.png
+- - docs/media/self_check_view_items_out_1.png
+- - docs/media/self_check_view_items_out_2.png
+ create mode 100644 docs/media/self-check-admin-login.png
+ create mode 100644 docs/media/self_check_check_out_1.png
+ create mode 100644 docs/media/self_check_check_out_1b.png
+ create mode 100644 docs/media/self_check_check_out_2.png
+ create mode 100644 docs/media/self_check_check_out_3.png
+ create mode 100644 docs/media/self_check_check_out_4.png
+ create mode 100644 docs/media/self_check_check_out_5.png
+ create mode 100644 docs/media/self_check_check_out_6.png
+ create mode 100644 docs/media/self_check_error_1.png
+ create mode 100644 docs/media/self_check_view_fines_1.png
+ create mode 100644 docs/media/self_check_view_fines_2.png
+ create mode 100644 docs/media/self_check_view_holds_1.png
+ create mode 100644 docs/media/self_check_view_holds_2.png
+ create mode 100644 docs/media/self_check_view_items_out_1.png
+ create mode 100644 docs/media/self_check_view_items_out_2.png
+
+commit bb2b028a7d54e2663590ffc939e4bda71c8eedb4
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Apr 21 23:29:42 2016 -0400
+
+ LP#1573372: Opt-in test broken because it uses bail-out.
+
+ Use skip instead!
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+115 116 Open-ILS/src/perlmods/live_t/12-lp1533329-opt-in.t
+
+commit a25d07d529a178b3a948676e747d9a0e79056e2e
+Author: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+Date: Thu Apr 21 15:36:36 2016 -0700
+
+ Docs: New changes to new patron registration duplicate search.
+
+ Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+
+17 0 docs/circulation/circulation_patron_records.txt
+- - docs/media/patron-reg-duplicate-search-1.png
+- - docs/media/patron-reg-duplicate-search-2.png
+ create mode 100644 docs/media/patron-reg-duplicate-search-1.png
+ create mode 100644 docs/media/patron-reg-duplicate-search-2.png
+
+commit 9d99d22ecce50461a81a1249d1f35529b9a910af
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Apr 21 23:00:09 2016 -0400
+
+ LP#1573364: Use a timezone in the future backdate checkin test.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 Open-ILS/src/perlmods/live_t/10-lp1481036-future-backdate.t
+
+commit e0e72f96524b5e6e6853bc838efc660c62f6c960
+Author: Anna Goben <AGoben at library.in.gov>
+Date: Thu Apr 21 22:58:14 2016 -0400
+
+ Docs: Exclude Electronic Resources
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+- - docs/media/catalogue-3.png
+17 0 docs/opac/using_the_public_access_catalog.txt
+
+commit 30983acd969d485d6819488309ffbb1e51745de7
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Thu Apr 21 15:22:58 2016 -0700
+
+ Docs: Updated attributions.txt
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+16 12 docs/attributions.txt
+
+commit ebc113dbe0ad2e1b3e0c602136165584090a128d
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Wed Apr 20 16:20:16 2016 -0400
+
+ Docs: resized image
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+- - docs/media/catalogue-8a.png
+
+commit c4022c8b20672674b5a83a657b9c3d62ef92fa82
+Author: Debbie Luchenbill <debbie at mobiusconsortium.org>
+Date: Wed Apr 20 16:17:55 2016 -0400
+
+ Docs: Expanded information about item record view in OPAC
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+16 0 docs/opac/using_the_public_access_catalog.txt
+
+commit 00b53dd5e9bc4f7a76a68bb62316d3f25ffa6558
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Wed Apr 20 15:58:12 2016 -0400
+
+ Docs: resized image
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+- - docs/media/catalogue-8.png
+
+commit 7cae49fe7bca8fee489a08ed6b0289c8d6ba32bd
+Author: Debbie Luchenbill <debbie at mobiusconsortium.org>
+Date: Wed Apr 20 15:07:51 2016 -0400
+
+ Docs: added tip on using hold counts in renewals
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+2 0 docs/circulation/circulating_items.txt
+
+commit 386a8e5de983c4ce0b11282f90ac76e59c06b0ce
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Fri Apr 15 11:58:16 2016 -0400
+
+ Docs: small syntax fix circulation/circulation_patron_records.txt
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+13 13 docs/circulation/circulation_patron_records.txt
+
+commit 1ba6c15a1f094f0a5268825d7a0a4246e137485f
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Fri Apr 15 11:53:56 2016 -0400
+
+ Docs: small syntax fix in cataloging/authorities.txt
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+2 2 docs/cataloging/authorities.txt
+
+commit 6c02ebd7f1431bf2ff4f824a3591178941e4ee71
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Tue Apr 12 22:36:12 2016 -0400
+
+ Docs: small fix for circulation_patron_records_web_client.txt & root.txt
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+2 2 docs/circulation/circulation_patron_records_web_client.txt
+0 5 docs/root.txt
+
+commit 1fb0cfdf37ce64bed20a08f178fd786910e4b84c
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Tue Apr 12 22:33:43 2016 -0400
+
+ Docs: small fix for lsa-barcode_completion.txt & root.txt
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+1 1 docs/admin/lsa-barcode_completion.txt
+3 3 docs/root.txt
+
+commit c8bf2978ac1f3579aac8b6803f4bade9d94c2baf
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Thu Apr 7 13:51:14 2016 -0400
+
+ Docs: update root.txt to include 2.10 release notes
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+1 1 docs/root.txt
+
+commit cca3c338ec75162ada984ab46cac37541d7c9a2e
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Tue Apr 5 19:13:03 2016 -0400
+
+ Docs: typo fix in authentication_proxy.txt
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+2 2 docs/admin/authentication_proxy.txt
+
+commit 736aa4d9261f717fc7a9b37219ab1c7e1a044c45
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Sat Apr 2 18:11:12 2016 -0400
+
+ LP#1564685 Prevent linked address edit on reload
+
+ Prevent editing of linked addresses when a user is loaded after the
+ clone operation.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+19 0 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit f25e0567bda92cc0e635cd427bd27ceb4328c957
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Thu Mar 31 20:35:00 2016 -0400
+
+ LP#1564685 Avoid referencing out-of-scope stat cats
+
+ Fixes a bug in the patron editor where out-of-scope stat cats would be
+ incorrectly bundled in the patron save operation, resulting in a
+ server-side error on save. In short, ignore out-of-scope stat cat
+ entries for patrons in the editor.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+13 0 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit d2dcd6ba6fe6ddfd086e6e8f05e95544c7a05c9f
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 28 16:10:10 2016 -0400
+
+ LP#1564685 Prevent edit of linked addresses
+
+ Do not allow a cloned user to modify a linked address. Only the address
+ owner should be able to do that.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+18 8 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+
+commit 1464aa082ea93da70a7809a42f44d2bf0f9a028f
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 28 16:00:18 2016 -0400
+
+ LP#1564685 New Address button is always accessible
+
+ The New Address button in the patron editor is now always accessible,
+ regardless of the existence of any addresses.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+5 5 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+
+commit 13b61f30ec24a660b1d638da1d37ddd2973a923e
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 28 15:57:26 2016 -0400
+
+ LP#1564685 Repair patron editor checkboxes sizing
+
+ Fix the checkbox HTML markup to prevent huge checkboxes in the patron
+ editor.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+50 6 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+
+commit 140be17c673bec818e37363959a90ad247b0404e
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 28 15:48:29 2016 -0400
+
+ LP#1564685 Required-field org settings overlay defaults
+
+ An org setting requiring a value for a field in the patron editor means
+ the field is required, even if it's not required by default. IOW, fix
+ the code that was supposed to do that already.
+
+ Of note, county and state can now both be marked as required by org
+ settings in the patron editor.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+17 7 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit 6ec8bd4c16eb2bed8a4c59856f5ee17137ce853f
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 28 15:30:37 2016 -0400
+
+ LP#1564685 Allow delete of all patron addresses
+
+ If the org setting ui.patron.registration.require_address is not true,
+ allow all addresses to be removed from a patron's account.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2 0 Open-ILS/src/templates/staff/circ/patron/register.tt2
+8 0 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit 50153a8d3392eb75304fed54323f3664040e5c8f
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Mar 28 15:22:52 2016 -0400
+
+ LP#1564685 Alert and stop on invalid fields
+
+ Display an alert message and prevent save or save+clone when invalid
+ values exist in the patron edit form.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2 0 Open-ILS/src/templates/staff/circ/patron/index.tt2
+2 0 Open-ILS/src/templates/staff/circ/patron/register.tt2
+20 11 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit 68eacf38e0bb967e2683146b3b314e39f87ccd0a
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Mar 23 22:13:44 2016 -0400
+
+ LP#1564685 Allow barcode as username despite regex
+
+ Allow a patron's barcode to be considered a valid username in the patron
+ editor even in the presence of an 'opac.username_regex' org setting
+ value that does not match the barcode.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+25 2 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit a802095aff2b6c300045fb7a6ef181bcb5f15903
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Mar 23 21:21:12 2016 -0400
+
+ LP#1564685 Avoid dupe usrname warning on matching patron
+
+ Do not treat usernames as duplicates when they belong to the patron
+ being edited.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+12 0 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+
+commit fba80e28dc490157cf2d06aa4cdfe6787064ef3e
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Thu Mar 31 08:08:03 2016 -0400
+
+ LP1564378: Silence Hash Init Warning
+
+ A trivial change to silence a lot of noise (if your libraries
+ use extending grace periods.)
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+
+commit b6f977f633b478e401874c898727a97acc31ba16
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Tue Mar 22 11:50:58 2016 -0400
+
+ LP#1373601: Consider relevant characters before using word-boundary checks
+
+ To perform unanchored phrase limits, we make sure that the phrase supplied
+ by the user does not end in the middle of a word by bounding the condition
+ with word-boundary bracket expresssions. However, if the phrase starts
+ or ends with a non-word character (that is, something other than numbers,
+ letters, or the underscore) then the word-boundary expression won't match.
+ The effect of this is to cause phrase searches starting or ending in
+ punctuation to fail when the user would not expect them to.
+
+ To address this, we now test the phrase for word-iness at the front and
+ back before applying word-boundary bracket expressions.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+11 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..0c955d4 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
sub ils_version {
# version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
# For branches, format is "x-y"
- return "HEAD";
+ return "2-10-2";
}
__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 fc8f13e..607abca 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0978', :eg_version); -- gmcharlt/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.10.2', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
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 7b2b3f5..ea36130 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 @@
<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/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_10_2</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..7eb1281 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/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_10_2");
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 a954357..07050a7 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.10"
!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 b57451a..0000000
--- 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 0000000..a4361df
--- /dev/null
+++ b/README
@@ -0,0 +1,712 @@
+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/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they
+can proceed with the `./configure` step.
+
+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
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
+ Ubuntu Precise Pangolin (12.04), and Fedora.
+ If you are running an older version of these distributions, you may want
+ to upgrade before upgrading Evergreen. For instructions on upgrading these
+ distributions, visit the Debian, Ubuntu or Fedora websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
+
+
+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.4.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * Debian Wheezy and Jessie Ubuntu Precise and Trusty comes with
+ PostgreSQL 9.1+, so no additional steps are required.
+ * Fedora 19 and 20 come with PostgreSQL 9.2+, 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-jessie`, `debian-wheezy`, `fedora`,
+ `ubuntu-trusty`, 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, Trusty or Debian Jessie. The ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[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
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retriving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Optional: Extra steps for browser-based staff client
+----------------------------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+[NOTE]
+You make skip the subsection `Install dependencies for browser-based staff client'
+if you are installing on either Debian Jessie or Ubuntu Trusty and you have
+installed the `Optional: Developer Additions' described above. You will still
+need to do the steps in `Install files for browser-based staff client' below.
+
+Install dependencies for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Node.js. For more information see also:
+ https://github.com/joyent/node/wiki/installation[Node.js Installation]
++
+[source,sh]
+------------------------------------------------------------------------------
+# Go to a temporary directory
+cd /tmp
+
+# Clone the code and checkout the necessary version
+git clone https://github.com/joyent/node.git
+cd node
+git checkout -b v0.10.28 v0.10.28
+
+# set -j to the number of CPU cores on the server + 1
+./configure && make -j2 && sudo make install
+
+# update packages
+% sudo npm update
+------------------------------------------------------------------------------
++
+2. Install Grunt CLI
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g grunt-cli
+------------------------------------------------------------------------------
++
+3. Install Bower
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g bower
+------------------------------------------------------------------------------
+
+Install files for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+ for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install # fetch Grunt dependencies
+bower install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+grunt all
+------------------------------------------------------------------------------
+
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+ command as the *root* Linux account to install Evergreen, build the server
+ portion of the staff client, and copy example configuration files to
+ `/openils/conf`.
+ Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+ of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_10_2 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
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, 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/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+1. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy and Ubuntu Precise
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty and Debian Jessie
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+2. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+3. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+ a. To enable access to the offline upload / execute interface from any
+ workstation on any network, make the following change (and note that
+ you *must* secure this for a production instance):
+ * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+ * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+ b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+4. Change the user for the Apache server.
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+ * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+ Change `User apache` to `User opensrf`.
+5. Configure Apache with performance settings appropriate for Evergreen:
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/apache2.conf`:
+ * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`:
+ a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of
+ a request timing out unexpectedly, but increase the risk of using up
+ all available Apache child processes.
+ b. 'Optional': Change `MaxKeepAliveRequests` to `100`
+ c. (Debian Wheezy, Ubuntu Precise, and Fedora) 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>
+------------------------------------------------------------------------------
+ d. (Ubuntu Trusty, Debian Jessie) As the *root* user, edit
+ /etc/apache2/mods-available/mpm_prefork.conf to match the above values.
+ Then, also as the *root* user, enable the mpm_prefork module by doing:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+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 Wheezy and Ubuntu Precise): 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
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+8. (Ubuntu): As the *root* Linux account, enable Apache to write
+ to the lock directory; this is currently necessary because Apache
+ is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
++
+9. Learn more about additional Apache options in the following sections:
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in the following section, sets the database
+connection information in `opensrf.xml` for you.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system. To install Postgres server packages,
+use the make target 'postgres-server-<OSTYPE>'. Choose the most appropriate
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty)
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+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
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host all all ::1/128 md5
+host all all 127.0.0.1/32 md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect. For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+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 --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.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+ ** If you receive the error message `bash: osrf_control: 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 org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <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
+ ------------------------------------
+[[install-troubleshooting-1]]
+If this does not work, it's time to do some troubleshooting.
+
+ * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+ if it finds any system configuration problems. The script is found at
+ `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+ tree.
+ * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+ * If you have faithfully followed the entire set of installation steps
+ listed here, you are probably extremely close to a working system.
+ Gather your configuration files and log files and contact the
+ http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development
+mailing list] for assistance before making any drastic changes to your system
+ configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 74e6b3b..a52618b 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 at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.10.2, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.10.2])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
commit 6448ccefe958d50a2c2dcf8e0b130f29b68c1ad4
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 28 13:15:42 2016 -0400
2.10.1 to 2.10.2 schema upgrade script
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.10.1-2.10.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.10.1-2.10.2-upgrade-db.sql
new file mode 100644
index 0000000..535b1a8
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.10.1-2.10.2-upgrade-db.sql
@@ -0,0 +1,54 @@
+--Upgrade Script for 2.10.1 to 2.10.2
+\set eg_version '''2.10.2'''
+BEGIN;
+
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.10.2', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('0976', :eg_version);
+
+ALTER TABLE action.usr_circ_history
+ DROP CONSTRAINT IF EXISTS usr_circ_history_target_copy_fkey;
+
+CREATE TRIGGER action_usr_circ_history_target_copy_trig
+ AFTER INSERT OR UPDATE ON action.usr_circ_history
+ FOR EACH ROW EXECUTE PROCEDURE evergreen.fake_fkey_tgr('target_copy');
+
+SELECT evergreen.upgrade_deps_block_check('0977', :eg_version); -- Callender/Dyrcona/gmcharlt
+
+ALTER TABLE biblio.monograph_part DROP CONSTRAINT "record_label_unique";
+CREATE UNIQUE INDEX record_label_unique_idx ON biblio.monograph_part (record, label) WHERE deleted = FALSE;
+
+SELECT evergreen.upgrade_deps_block_check('0978', :eg_version);
+
+-- note: it is not necessary to explicitly drop the previous VARIADIC
+-- version of this stored procedure; create or replace function...
+-- suffices.
+CREATE OR REPLACE FUNCTION actor.org_unit_ancestor_setting_batch( org_id INT, setting_names TEXT[] ) RETURNS SETOF actor.org_unit_setting AS $$
+DECLARE
+ setting RECORD;
+ setting_name TEXT;
+ cur_org INT;
+BEGIN
+ FOREACH setting_name IN ARRAY setting_names
+ LOOP
+ cur_org := org_id;
+ LOOP
+ SELECT INTO setting * FROM actor.org_unit_setting WHERE org_unit = cur_org AND name = setting_name;
+ IF FOUND THEN
+ RETURN NEXT setting;
+ EXIT;
+ END IF;
+ SELECT INTO cur_org parent_ou FROM actor.org_unit WHERE id = cur_org;
+ EXIT WHEN cur_org IS NULL;
+ END LOOP;
+ END LOOP;
+ RETURN;
+END;
+$$ LANGUAGE plpgsql STABLE;
+
+COMMENT ON FUNCTION actor.org_unit_ancestor_setting_batch( INT, TEXT[] ) IS $$
+For each setting name passed, search "up" the org_unit tree until
+we find the first occurrence of an org_unit_setting with the given name.
+$$;
+
+COMMIT;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list