[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. 2445e37d2d0ee7c80e8530523216a3e2e5e3892c

Wed Aug 21 17:49:15 EDT 2019

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, rel_3_2 has been updated
       via  2445e37d2d0ee7c80e8530523216a3e2e5e3892c (commit)
       via  12509aed2270c0e529dec05902726235537c40a9 (commit)
      from  04c8eb5ffb9ab5ad03c0938096fbe5c757eb01f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2445e37d2d0ee7c80e8530523216a3e2e5e3892c
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Apr 18 18:12:19 2018 -0400

    Update upgrade instructions
    
    Genericize version numbers, plus a few minor tweaks.
    
    Eventually we probably need to start building the docs from tags, and
    let the main branch use real placeholders.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc
index d395f3baf5..bef8c2fe7a 100644
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -7,7 +7,7 @@ Software Prerequisites
 ~~~~~~~~~~~~~~~~~~~~~~
 
   * **PostgreSQL**: The minimum supported version is 9.4.
-  * **Linux**: Evergreen 2.12.0 has been tested on Debian Stretch (9.0),
+  * **Linux**: Evergreen 3.X.X has been tested on Debian Stretch (9.0),
     Debian Jessie (8.0), Ubuntu Xenial Xerus (16.04),and Ubuntu Trusty Tahr (14.04).
     If you are running an older version of these distributions, you may want
     to upgrade before upgrading Evergreen. For instructions on upgrading these
@@ -42,12 +42,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.12.0:
+. As the *opensrf* user, download and extract Evergreen 3.X.X:
 +
 [source, bash]
 -----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.12.0.tar.gz
-tar xzf Evergreen-ILS-2.12.0.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.X.X.tar.gz
+tar xzf Evergreen-ILS-3.X.X.tar.gz
 -----------------------------------------------
 +
 [NOTE]
@@ -57,7 +57,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
 +
 [source, bash]
 ---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.X.X
 ---------------------------------------------
 +
 On the next command, replace `[distribution]` with one of these values for your
@@ -81,7 +81,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.X.X
 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
 make
 ------------------------------------------------------------
@@ -92,7 +92,7 @@ These instructions assume that you have also installed OpenSRF under /openils/.
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.X.X
 make install
 ------------------------------------------------------------
 +
@@ -103,8 +103,8 @@ can supply `STAFF_CLIENT_STAMP` during the `make install` step like this:
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
-make STAFF_CLIENT_STAMP_ID=rel_2_12_rc install
+cd /home/opensrf/Evergreen-ILS-3.X.X
+make STAFF_CLIENT_STAMP_ID=rel_3_x_x install
 ------------------------------------------------------------
 +
 . As the *root* user, change all files to be owned by the opensrf user and group:
@@ -121,7 +121,7 @@ chown -R opensrf:opensrf /openils
 ------------------------------------------------------------
 cd /openils/var/web/xul/
 rm server
-ln -sf rel_2_12_rc/server server
+ln -sf rel_3_x_x/server server
 ------------------------------------------------------------
 +
 . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -141,7 +141,7 @@ Copying these configuration files will remove any customizations you have made t
 +
 [source, bash]
 -------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0
+cd /home/opensrf/Evergreen-ILS-3.X.X
 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
 --create-offline --database evergreen --host localhost --user evergreen --password evergreen
 -------------------------------------------------------------------------
@@ -165,21 +165,21 @@ The diff command can be used to show the differences between the distribution ve
 +
 [source, bash]
 ----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-3.X.X/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.12.0/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-3.X.X/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.12.0/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
 ----------------------------------------------------------
 
 Upgrade the Evergreen database schema
@@ -202,28 +202,13 @@ 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.12.0, you
+the schema. For example, if you want to upgrade from 2.9.0 to 2.11.0, you
 would run the following upgrade scripts:
 
-- 2.5.1-2.5.2-upgrade-db.sql
-- 2.5.2-2.5.3-upgrade-db.sql
-- 2.5.3-2.6.0-upgrade-db.sql (this is a major version upgrade)
-- 2.6.2-2.6.3-upgrade-db.sql
-- 2.6.3-2.7.0-upgrade-db.sql (this is a major version upgrade)
-- 2.7.0-2.7.1-upgrade-db.sql
-- 2.7.1-2.7.2-upgrade-db.sql
-- 2.7.2-2.7.3-upgrade-db.sql
-- 2.7.3-2.7.4-upgrade-db.sql
-- 2.7.4-2.8.0-upgrade-db.sql (this is a major version upgrade)
-- 2.8.0-2.8.1-upgrade-db.sql
-- 2.8.1-2.8.2-upgrade-db.sql
-- 2.8.2-2.8.3-upgrade-db.sql
-- 2.8.3-2.8.4-upgrade-db.sql
-- 2.8.4-2.9.0-upgrade-db.sql (this is a major version upgrade)
 - 2.9.0-2.9.1-upgrade-db.sql
 - 2.9.1-2.9.2-upgrade-db.sql
 - 2.9.2-2.9.3-upgrade-db.sql
-- 2.9.3-2.10.0-upgrade-db.sql
+- 2.9.3-2.10.0-upgrade-db.sql (this is a major version upgrade)
 - 2.10.0-2.10.1-upgrade-db.sql
 - 2.10.1-2.10.2-upgrade-db.sql
 - 2.10.2-2.10.3-upgrade-db.sql
@@ -232,38 +217,11 @@ would run the following upgrade scripts:
 - 2.10.5-2.10.6-upgrade-db.sql
 - 2.10.6-2.10.7-upgrade-db.sql
 - 2.10.7-2.11.0-upgrade-db.sql (this is a major version upgrade)
-- 2.11.0-2.11.1-upgrade-db.sql
-- 2.11.1-2.11.2-upgrade-db.sql
-- 2.11.2-2.11.3-upgrade-db.sql
-- 2.11.3-2.12.0-upgrade-db.sql (this is a major version upgrade)
 
-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.12.0), use
-the same logic to utilize the provided major version upgrade scripts. For
-example:
-
-- 2.3-2.4.0-upgrade-db.sql
-- 2.3-2.4-supplemental.sh
-- (run all incremental scripts from 2.4.0 to 2.4.3)
-- 2.4.3-2.5.0-upgrade-db.sql
-- (run all incremental scripts from 2.5.0 to 2.5.3)
-- 2.5.3-2.6.0-upgrade-db.sql
-- (run all incremental scripts from 2.6.0 to 2.6.3)
-- 2.6.3-2.7.0-upgrade-db.sql
-- (run all incremental scripts from 2.7.0 to 2.7.4)
-- 2.7.4-2.8.0-upgrade-db.sql
-- (run all incremental scripts from 2.8.0 to 2.8.4)
-- 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.7)
-- 2.10.7-2.11.0-upgrade-db.sql
-- (run all incremental scripts from 2.11.0 to 2.11.3)
-- 2.11.3-2.12.0-upgrade-db.sql
+Note that you do *not* necessarily want to run additional upgrade scripts to
+upgrade to the newest version, since currently there is no automated way, for
+example to upgrade from 2.9.4+ to 2.10. Only upgrade as far as necessary to
+reach the major version upgrade script (in this example, as far as 2.9.3).
 
 =============
 
@@ -278,8 +236,8 @@ as a user with the ability to connect to the database server.
 
 [source, bash]
 ----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.11.3-2.12.0-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/3.X.W-3.X.X-upgrade-db.sql evergreen
 ----------------------------------------------------------
 
 [TIP]

commit 12509aed2270c0e529dec05902726235537c40a9
Author: Dan Scott <dan at coffeecode.net>
Date:   Thu Apr 11 23:17:10 2019 -0400

    Docs: fix uneven lengths of code delimiter blocks
    
    The lengths of the starting and ending sets of hyphens are supposed to be the
    same. Asciidoc tools like asciidoctor can be less forgiving than the original
    asciidoc processor, with less than hilarious results.
    
    It would probably make sense to try to standardize on something like 60 hyphens
    to easily flag this problem for deviations from the norm, but for now here's
    the result of running the docs through asciidoctor and manually adjusting the
    output.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/docs/admin/booking-admin.adoc b/docs/admin/booking-admin.adoc
index 6dd77844e9..d7c90639b2 100644
--- a/docs/admin/booking-admin.adoc
+++ b/docs/admin/booking-admin.adoc
@@ -48,7 +48,7 @@ image::media/booking-create-bookable-1.png[]
 ** sec(s), min(s)
 ** s, m, h
 ** 00:00:30, 00:01:00, 01:00:00
-===================================================================
+====================================================================
 
 * Fine Amount - The amount that will be charged at each Fine Interval.
 * Owning Library - The home library of the resource.
diff --git a/docs/cataloging/batch_importing_MARC.adoc b/docs/cataloging/batch_importing_MARC.adoc
index c1c776db56..1ed8feaa06 100644
--- a/docs/cataloging/batch_importing_MARC.adoc
+++ b/docs/cataloging/batch_importing_MARC.adoc
@@ -270,7 +270,7 @@ If you are overlaying existing items which already have stat cats
 attached to them, the overlay process will keep those values unless the
 incoming items contain updated values for matching categories.
 |Status ||
-|==================
+|=============================
 
 
 Import Records
diff --git a/docs/circulation/basic_holds.adoc b/docs/circulation/basic_holds.adoc
index 8e1e48015a..a9098bebad 100644
--- a/docs/circulation/basic_holds.adoc
+++ b/docs/circulation/basic_holds.adoc
@@ -15,7 +15,7 @@ Evergreen has different levels of holds. Library staff can place holds at all le
 |Parts        |P              |Patron wants a particular part of title (e.g. volume or disk number)    | Staff or patron selects part on the create/edit hold screen when setting holds notification options.   |Patron or staff  |Holdings with identical parts attached to a single MARC (title) record.
 |Volume       |V              |Patron or staff want any title associated with a particular call number | In the staff client, click on _Volume Hold_ under _Holdable?_ |Staff only |Holdings attached to a single call number (volume)
 |Copy         |C              |Patron or staff want a specific copy of an item |In the staff client, click on _Copy Hold_ under _Holdable?_ |Staff only |A specific copy (barcode)
-|===============================
+|==============================
 
 
 Title Level Hold
diff --git a/docs/circulation/circulating_items_web_client.adoc b/docs/circulation/circulating_items_web_client.adoc
index 65ee0c9408..c559857ca0 100644
--- a/docs/circulation/circulating_items_web_client.adoc
+++ b/docs/circulation/circulating_items_web_client.adoc
@@ -182,7 +182,7 @@ These options may be selected simultaneously. The selected option is displayed i
 
 image::media/checkin_options_web_client.png[]
 
-====================================================
+===================================================
   
 Renewal and Editing the Item's Due Date
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -256,7 +256,7 @@ Lost Item Billing
 - Marking an item Lost will automatically bill the patron the replacement cost of the item as recorded in the price field in the item record, and a processing fee as determined by your local policy. If the lost item has overdue charges, the overdue charges may be voided or retained based on local policy.
 - A lost-then-returned item will disappear from the Items Out screen only when all bills linked to this particular circulation have been resolved. Bills may include replacement charges, processing fees, and manual charges added to the existing bills. 
 - The replacement fee and processing fee for lost-then-returned items may be voided if set by local policy. Overdue fines may be reinstated on lost-then-returned items if set by local policy.
-==========================
+========================
 
 Refunds for Lost Items
 ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc
index 1983804ca3..d395f3baf5 100644
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -118,21 +118,21 @@ chown -R opensrf:opensrf /openils
   As the *opensrf* user, update the server symlink in /openils/var/web/xul/:
 +
 [source, bash]
------------------------------------------------------------
+------------------------------------------------------------
 cd /openils/var/web/xul/
 rm server
 ln -sf rel_2_12_rc/server server
-----------------------------------------------------------
+------------------------------------------------------------
 +
 . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
   new example files (/openils/conf/opensrf_core.xml.example and
   /openils/conf/opensrf.xml). The _-b_ option creates a backup copy of the old file.
 +
 [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
-----------------------------------------------------------
+------------------------------------------------------------
 +
 [CAUTION]
 Copying these configuration files will remove any customizations you have made to them. Remember to redo your customizations after copying them.
@@ -323,7 +323,7 @@ srfsh% login username password
 You should see a result like:
 +
 [source, bash]
-------------------------------------------------------
+--------------------------------------------------------------
 Received Data: "250bf1518c7527a03249858687714376"
     ------------------------------------
     Request Completed Successfully
@@ -347,7 +347,7 @@ Received Data: "250bf1518c7527a03249858687714376"
     Request Completed Successfully
     Request Time in seconds: 1.336568
     ------------------------------------
-----------------------------------------------------------
+--------------------------------------------------------------
 +
 If this does not work, it's time to do some <<install-troubleshooting-1,troubleshooting>>.
 +
diff --git a/docs/reports/reporter_add_data_source.adoc b/docs/reports/reporter_add_data_source.adoc
index ea99f646d4..10c3835943 100644
--- a/docs/reports/reporter_add_data_source.adoc
+++ b/docs/reports/reporter_add_data_source.adoc
@@ -79,7 +79,7 @@ Here's an example of a view created to incorporate some locally defined user
 statistical categories:
 
 .example view for reports
-----------
+------------------------------------------------------------
 create view extend_reporter.patronstats as
 select u.id, 
 grp.name as "ptype",
@@ -108,7 +108,7 @@ left join actor.stat_cat_entry_usr_map gr
 left join actor.stat_cat_entry_usr_map ag 
     on (u.id = ag.target_usr and ag.stat_cat = 1) 
 where u.active = 't' and u.deleted <> 't';
------------
+------------------------------------------------------------
 
 Add a new class to fm_IDL.xml for your data source
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,7 +161,7 @@ The following example is a class definition for the example view that was create
 in the previous section.
 
 .example class definition for reports
-----------
+------------------------------------------------------------
 <class id="erpstats" controller="open-ils.reporter-store" 
 oils_obj:fieldmapper="extend_reporter::patronstats" 
 oils_persist:tablename="extend_reporter.patronstats" oils_persist:readonly="true" 
@@ -191,7 +191,7 @@ reporter:label="Patron Statistics" reporter:core="true">
   <link field="home_lib_id" reltype="has_a" key="id" map="" class="aou"/>
 </links>
 </class>
----------
+------------------------------------------------------------
 
 NOTE: _fm_IDL.xml_ is used by other core Evergreen DAO services, including cstore 
 and permacrud. So changes to this file can affect the entire Evergreen 
diff --git a/docs/reports/reporter_daemon.adoc b/docs/reports/reporter_daemon.adoc
index 4496718c8d..0c4443e181 100644
--- a/docs/reports/reporter_daemon.adoc
+++ b/docs/reports/reporter_daemon.adoc
@@ -42,7 +42,7 @@ the reporter daemon can be started.
 Remember that if the server is restarted, the reporter daemon will need to be 
 restarted before you can view reports unless you have configured your server to 
 start the daemon automatically at start up time. 
-==============
+=============
 
 Stopping the Reporter Daemon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-----------------------------------------------------------------------

Summary of changes:
 docs/admin/booking-admin.adoc                      |  2 +-
 docs/cataloging/batch_importing_MARC.adoc          |  2 +-
 docs/circulation/basic_holds.adoc                  |  2 +-
 docs/circulation/circulating_items_web_client.adoc |  4 +-
 docs/installation/server_upgrade.adoc              | 98 +++++++---------------
 docs/reports/reporter_add_data_source.adoc         |  8 +-
 docs/reports/reporter_daemon.adoc                  |  2 +-
 7 files changed, 38 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
Evergreen ILS
