[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_8_5 created. d5d242ec805cb4553011efc06e7a8a005ac368f7
Evergreen Git
git at git.evergreen-ils.org
Wed Feb 17 13:54:38 EST 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_8_5 has been created
at d5d242ec805cb4553011efc06e7a8a005ac368f7 (commit)
- Log -----------------------------------------------------------------
commit d5d242ec805cb4553011efc06e7a8a005ac368f7
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Nov 18 14:19:33 2015 -0500
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..1c15d6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,639 @@
-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 19e8150ba98c34746a5ce89416d8cd29433a3225
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Nov 18 13:37:53 2015 -0500
+
+ Modify server upgrade doc for 2.8.5
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+17 15 docs/installation/server_upgrade.txt
+
+commit 2e15ba49daefa20c5aa5f81f321a6d2a46296115
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Sep 16 13:52:40 2015 -0400
+
+ Bumping Perl version string for 2.8.5 release
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit ebda03c2671147aff7d8daad656cd040cf3cca09
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Nov 18 13:51:07 2015 -0500
+
+ Docs: Addition to 2.8.5 point release notes
+
+ Last-minute addition to 2.8.5 release notes for miker's query parser fix.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+2 0 docs/RELEASE_NOTES_2_8.txt
+
+commit 17fd0961e7ff9a0a8e9543a6f94d0be2058bfc36
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Tue Nov 17 17:20:05 2015 -0500
+
+ LP#1516707: Phrase search ignores CD modifiers
+
+ Because phrases are subqueries, we need to look at the top of the parse tree
+ when looking for modifiers for cover density. This is because modifers are
+ normally only allowed at the top of the parse tree (or in the floating sub-
+ query). We do that by asking the plan's QueryParse for it's reference to its
+ parse_tree member, which is always the top of the parse tree in QP.
+
+ Included in this commit is a small change to the QP testing script to
+ facilitate testing of this fix.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+7 0 Open-ILS/src/extras/fts-replacement.pl
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+
+commit 21733c3b0fbb618ea5ded5156312f10f57874980
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Tue Nov 17 16:37:51 2015 -0500
+
+ Docs: 2.8.5 point release notes
+
+ Adding bug fixes and acknowledgements for the 2.8.5 point release.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+64 2 docs/RELEASE_NOTES_2_8.txt
+
+commit c3d891ddd5b9f0608842a90856857480a8c51d02
+Author: blake <blake at mobiusconsortium.org>
+Date: Mon Jan 5 10:38:18 2015 -0600
+
+ LP1402018_Acq_Copy_location_UI_scoped_to_registered_workstation
+
+ This little patch will open up the acq copy location dropdown UI
+ to include other library's copy locations outside of the workstation
+ registration. When the user permissions are scoped to more branches.
+
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+40 20 Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
+1 1 Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit 64057435cd776c1a4f12b32ea3363127832f2047
+Author: Steven Chan <schan at sitka.bclibraries.ca>
+Date: Thu Sep 19 12:51:35 2013 -0700
+
+ Fix LP1175711, OPAC can't renew item on booking resource list
+
+ A test sequence to show the behaviour before and after the fix:
+
+ 1. Using staff client, check out an item to test account.
+ 2. Go to Copy Details on the OPAC, click Book Now, and cancel the form;
+ the side effect is to put the item on the Resource list.
+ 3. Using the OPAC on a web browser, log in with test account.
+ 4. Go to Items Checked Out, select the item in the list and click Renew
+ Selected Items.
+
+ Before the fix, we saw the OPAC spin forever, and we saw the Javascript
+ console of the web browser log the error noted in previous comments.
+
+ With the fix, we see an error prompt saying, 'The system is unable to
+ renew the selected item at this time. This usually means the item is
+ needed to fulfill a hold. Please see a librarian for further help.'
+
+ Note: A patron with the normal group of permissions will not be able to
+ renew an item on resource list.
+
+ The fix is to check for an error object emitted by the function
+ Booking.pm/reservation_list_by_filters(), and to propagate it back to
+ the client, by returning a call to bail_on_events().
+
+ We also clarify the coding of the function's parameter list and how the
+ function checks for mandatory parameters.
+
+ Signed-off-by: Steven Chan <schan at sitka.bclibraries.ca>
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+7 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Booking.pm
+9 4 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit bac5b646a52cedec5f5152ff69070611bfbba96a
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Fri Nov 13 16:12:46 2015 -0500
+
+ LP#1513554 - Stamping Upgrade Script
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+21 0 Open-ILS/src/sql/Pg/upgrade/0949.schema.no_delete_acq_cancel_reasons.sql
+0 21 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no_delete_acq_cancel_reasons.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0949.schema.no_delete_acq_cancel_reasons.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no_delete_acq_cancel_reasons.sql
+
+commit b669e3397a85b301fd98a0c7363fcee3b2c7ac80
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Sun Nov 8 09:47:58 2015 -0500
+
+ LP#1513554 - Doc update for cancel reason selection
+
+ Adding an update to the docs to inform users that default cancel reasons
+ cannot be selected.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+19 5 docs/admin/acquisitions_admin.txt
+
+commit 32838d5faef842d22b715c8768695745cb31e015
+Author: Chris Sharp <csharp at georgialibraries.org>
+Date: Thu Nov 5 13:30:51 2015 -0500
+
+ LP#1513554 - Prevent deletion of reserved rows.
+
+ It was previously possible to delete reserved rows in
+ the acq.cancel_reasons table via the UI. We take a belt
+ and suspenders approach here:
+
+ 1) Grey out the checkboxes beside cancel reasons with an
+ ID lower than 2000.
+ 2) Create a trigger on the acq.cancel_reason table that
+ prevents deletion of rows with an ID lower than 2000.
+
+ The trigger executes a new generally available function
+ for use in similar situations in the future.
+
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+
+9 0 Open-ILS/src/sql/Pg/000.functions.general.sql
+5 0 Open-ILS/src/sql/Pg/200.schema.acq.sql
+13 0 Open-ILS/src/sql/Pg/t/lp1513554_do_not_delete_reserved_cancel_reasons.pg
+21 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no_delete_acq_cancel_reasons.sql
+5 0 Open-ILS/web/js/ui/default/conify/global/acq/cancel_reason.js
+ create mode 100644 Open-ILS/src/sql/Pg/t/lp1513554_do_not_delete_reserved_cancel_reasons.pg
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no_delete_acq_cancel_reasons.sql
+
+commit ec852021bad593cd100b5a2d7cc53afc4dbc4b66
+Author: Ben Shum <bshum at biblio.org>
+Date: Thu Nov 5 18:12:35 2015 -0500
+
+ LP#937789: Stamping upgrade script for part deletion
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+ Conflicts:
+ Open-ILS/src/sql/Pg/002.schema.config.sql
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+139 0 Open-ILS/src/sql/Pg/upgrade/0948.schema.fake-delete-parts.sql
+0 137 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fake-delete-parts.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0948.schema.fake-delete-parts.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fake-delete-parts.sql
+
+commit 59ca73acbdb9510bfa77bd09acb6299e0132cba4
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Thu Nov 5 08:45:23 2015 -0500
+
+ LP#937789: Hide 'deleted' from parts table & editor
+
+ This commit hides the new parts 'deleted' field from the Manage Parts
+ dojo table and popup editor.
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2 2 Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
+
+commit 521e0b6a9e06fba67d4acf50ef102deb6ec310e5
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Oct 29 15:39:16 2015 +0000
+
+ LP#937789: various improvements to logical deletion of parts
+
+ This patch ensures that when a monograph part is marked as
+ deleted, that mappings between it and its copies are also
+ removed, similar to the previous behavior of the cascade
+ on delete.
+
+ This patch also adds some pgTAP tests and ensures that
+ unapi.bmp() and unapi.holdings_xml() get updated during upgrade.
+
+ To test the fix for this bug:
+
+ [1] Apply the patches.
+ [2] Create a monograph part on a record, then delete it. Verify that
+ it no longer shows up in the parts maintenance interface, but that
+ a row in the biblio.monograph_parts table still exists with the
+ deleted flag set to true.
+ [3] Create another monograph part on the same record.
+ [4] Create a new volume/copy and assign the part created in step
+ 3 to it. Verify that the part shown in step 2 is *not*
+ included in the XUL part selector.
+ [5] Place a part-level hold. Verify that the hold request
+ is displayed correct in both the public catalog and the staff
+ interface.
+ [6] Delete the part created in step 3.
+ [7] Verify that viewing the list of the patron's holds in the XUL staff
+ client doesn't result in any 'network errors'. Also verify that
+ the hold request is still displayed in patron's view in the public
+ catalog.
+ [8] Using SQL or some other means, set the expire_time and
+ prev_check_time of the test hold request to a couple days in the
+ past, then run the hold targeter. Verify that the hold gets
+ cancelled for lack of a suitable copy to fill it.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+3 1 Open-ILS/src/sql/Pg/800.fkeys.sql
+73 0 Open-ILS/src/sql/Pg/t/regress/lp937789_fake_bmp_delete.sql
+131 1 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fake-delete-parts.sql
+ create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp937789_fake_bmp_delete.sql
+
+commit 03abdcd69f83e71a8a269b1b67da463381b6d74b
+Author: Ben Shum <bshum at biblio.org>
+Date: Fri Nov 6 09:47:16 2015 -0500
+
+ LP#937789: fake-delete support for monograph parts
+
+ Unlike copies, call numbers, and bibs, parts can be directly removed from the
+ database. This has a negative impact on holds, in that the holds become not
+ just orphaned, but broken entirely. With this commit we bring part holds to
+ parity with other hold types such that they can be system-canceled when their
+ target goes away. This will avoid spurious UI-level errors to staff.
+
+ Conflicts: rel_2_8 does not contain the cataloging module for webstaff, commit
+ amended.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 0 Open-ILS/examples/fm_IDL.xml
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+2 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/biblio.pm
+4 0 Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+1 0 Open-ILS/src/sql/Pg/010.schema.biblio.sql
+7 0 Open-ILS/src/sql/Pg/800.fkeys.sql
+2 2 Open-ILS/src/sql/Pg/990.schema.unapi.sql
+7 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fake-delete-parts.sql
+1 1 Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
+1 1 Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fake-delete-parts.sql
+
+commit 7969b7c06ac6dc4c89f264ff9d664165af1f5e28
+Author: Kate Butler <katebutler at rodgerslibrary.org>
+Date: Thu Nov 5 16:21:37 2015 -0500
+
+ Docs: add 'Place another hold link' docs
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+9 0 docs/circulation/holds.txt
+- - docs/media/place-another-hold-1.png
+ create mode 100644 docs/media/place-another-hold-1.png
+
+commit 1974d54348d30a7a1274ca036aa0bede6297cff0
+Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
+Date: Thu Jul 4 08:33:25 2013 +0300
+
+ LP#1092018: Make the reports UI use UTF-8.
+
+ To test:
+
+ [1] Install the translation for a language that uses
+ non-Latin-1 characters, such as Russian.
+ [2] Start the XUL staff client and open the reports
+ interface. Note that labels are mangled.
+ [3] Apply the Apache configuration changes in this patch,
+ reload Apache, clear cache in the staff client, and
+ reload the reports UI. The labels should now be
+ displayed correctly.
+
+ Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+7 0 Open-ILS/examples/apache/eg_vhost.conf.in
+8 0 Open-ILS/examples/apache_24/eg_vhost.conf.in
+
+commit e524c2f0df9f480bc065751ff11e7b32ecf688bf
+Author: Josh Stompro <stomproj at larl.org>
+Date: Sat Oct 31 10:38:41 2015 -0500
+
+ LP#1511828: sort proximities numerically when targeting holds
+
+ The hold targeter had three instances of using lexical sorting
+ rather than numerical sorting.
+
+ Two of the instances affected hold targeting if proximity values were
+ over 9. Proximity values were being sorted lexically. For instance,
+ 1,2,5,11,15,100,120 was sorted as 1,100,11,120,15,2,5, causing
+ interesting hold targeting results. Normally proximity doesn't go
+ that high so it isn't a problem, but we were using proximity adjustments
+ to strictly order locations so each location had a different proximity,
+ driving the numbers above 9.
+
+ One instance wasn't causing any current issue but could cause problems in
+ the future if more best hold selection sort options are added to bring the
+ total number of sort options over 9.
+
+ Also included are some changes to reduce warnings in the logs
+ suggested by Bill Erickson. The sorting problem was found by
+ Galen Charlton, thanks Galen.
+
+ Testing Notes - to trigger this issue you need to have adjusted
+ proximities over 9.
+
+ 1. Use proximity adjustment rules to add a +10 proximity adjustment to
+ one item circ lib, Branch A and a +2 proximity adjustment to the
+ item circ lib Branch B.
+
+ 2. Find a title with a copy at Branch A and B. Place a hold with a
+ pickup location of Branch B.
+
+ 3. The copy at Branch A should get targeted since it has a proximity of
+ 12-14 (10+normal proximity) and Branch B has a proximity of 2
+ (2+normal proximity). 12 gets sorted before 2 lexically.
+
+ 4. After the fix the copy at Branch B should get targeted since 2
+ is sorted before 12.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+5 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+
+commit d1f7def042ba76f3d6f94229212dc7aefe6bdc76
+Author: Josh Stompro <stomproj at larl.org>
+Date: Wed Jun 10 20:12:10 2015 -0500
+
+ LP#1400801 - Updated email validation regex for Org Unit admin gui
+
+ Grabbed the example of a simplified RFC 5322 email regex from
+ http://www.regular-expressions.info/email.html and lightly modified it
+ for case sensitivity and removed the "&" character from the localpart allowed
+ characters, which causes a 500 server error for some reason.
+
+ This matches many more of the valid localpart special characters.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+1 1 Open-ILS/web/conify/global/actor/org_unit.html
+
+commit 432757b90c6cd0b0417148cb1363723d701c8e8a
+Author: Adam Bowling <abowling at emeralddata.net>
+Date: Mon Jan 19 12:05:19 2015 -0500
+
+ LP#1406387 Fix for Holds Placement Advanced Options
+
+ In the staff client, when placing a hold and clicking
+ Advanced Hold Options, the barcode input will populate
+ with the staff member's barcode if it was previously
+ empty, regardless of whether the radio input for the
+ hold was specified for a patron or the staff member.
+
+ This patch corrects that behavior, and also populates
+ the input radio on load after clicking Advanced Hold
+ Options.
+
+ Signed-off-by: Adam Bowling <abowling at emeralddata>
+ Signed-off-by: Michael Peters <mpeters at emeralddata.net>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+13 2 Open-ILS/src/templates/opac/parts/place_hold.tt2
+22 0 Open-ILS/web/js/ui/default/opac/staff.js
+
+commit 02ea34923c32de76e6fcff4e7eb7cb54d611ca96
+Author: Jake Litrell <jake at masslnc.org>
+Date: Mon Sep 14 17:49:29 2015 -0400
+
+ LP#1340852: Retain search params for copy location groups
+
+ The order in which we determined what to 'selected' in the "Library"
+ dropdown put the resolved locg first (which allows for shortnames, e.g.
+ BR1). That only gives us half the location group though, which is why
+ it was bumping up a level. Now, if we have a location group selected,
+ it will use that first (since they don't have shortnames); the remaining
+ select order will be the same.
+
+ Signed-off-by: Jake Litrell <jake at masslnc.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+6 2 Open-ILS/src/templates/opac/parts/misc_util.tt2
+
+commit 15b0730a427979ce70ca7f7c27769129f88c0a0f
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Mon Jun 22 14:33:28 2015 -0400
+
+ LP#1467634: Hide saved searches from screen readers for non-staff client
+
+ This commit will only allow screen readers to see the saved searches for
+ users that are logged through XUL client.
+ Assuming that a screen reader can be attached to the XUL client.
+
+ It should also work for a user logged in through the web staff
+ client that is using a screen reader.
+
+ To test
+ -------
+ [1] Apply the patch, then perform a search in the public catalog and
+ view the HTML source. Verify that there's no "sr-only" heading
+ for "Saved searches".
+ [2] Set the opac.staff_saved_search.size library setting to a non-zero
+ value.
+ [3] In the web staff client, perform a search using the embeded OPAC;
+ verify that the recent searches list is displayed.
+ [4] Repeat step 4 in the XUL client.
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2 0 Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit 51decf3af821ceb86ba6238b79b79efaed0d61be
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Oct 7 17:49:19 2015 +0000
+
+ LP#1503782: fix horizontal scrollbar in MARC import queue inspector
+
+ In the XUL client (and webstaff), attempting to view the contents
+ of a MARC record import queue displays a table that, due to
+ its width, will almost always have a horizontal scrollbar. However,
+ attempting to actually use the scrollbar often causes the
+ focus to jump to the top of the table instead. This patch
+ fixes that.
+
+ To test:
+
+ [1] Create a bib queue that has at least a dozen records or so.
+ [2] Inspect the contents of the queue, scroll to the bottom of
+ the table, and interact with the horizontal scrollbar.
+ [3] Observe that doing so typically results in jumping up
+ to the top of the table.
+ [4] Apply the patch, clear cache and refresh, and try step #2
+ again.
+ [5] This time, the horizontal scrollbar should act normally.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+
+2 2 Open-ILS/src/templates/vandelay/inc/queue.tt2
+
+commit d60b5648e17e8643447053fb95615747ebf1be27
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Oct 29 19:30:31 2015 +0000
+
+ LP#1406786: fix remapping copies during parts merge
+
+ This patch fixes an issue with how copies are mapped
+ on the target part when using "Merge Selected" in the
+ Monograph Parts interface.
+
+ To test:
+
+ [1] Create some monograph parts on a record and assign
+ some copies to use them.
+ [2] Use the merge parts function to collapse all of the
+ parts created in step 1 onto a single part.
+ [3] Verify that the copies whose original parts were removed
+ are now mapped onto the part that was the target of the
+ merge.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+2 1 Open-ILS/web/js/dojo/openils/biblio/monographPartMerge.js
+
+commit b2843639e8e0f75a88542a7c01e70a1c35b17dc4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Oct 23 20:03:07 2015 +0000
+
+ LP#1509479: set a limit on loops in QP's decompose() method
+
+ Following a suggestion of Dan Scott's, add a pair of
+ suspenders to the belt and enforce an arbitrary limit
+ of 1000 passes through QP->decompse().
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+7 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm
+
+commit e40ee650203f52b29fadbc9c7e9a1747f10171b5
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Oct 23 19:23:05 2015 +0000
+
+ LP#1509479: fix infinite loop bug in QueryParser
+
+ An unclosed phrase search that has a modifier can cause QueryParser to
+ enter an infinite loop, tying up open-ils.storage backends.
+
+ Examples of such searches include:
+
+ -"cats and dogs
+ subject:+"physical chemistry
+
+ This patch fixes the bug by allowing the end of the query string
+ to terminate a phrase (in addition to a quotation mark).
+
+ To test:
+
+ [1] Verify that the t/21-QueryParser.t unit test passes
+ [2] To test in a *development* database, before applying the patch
+ run one of the example queries. Observe that no
+ results are returned, and that one of the open-ils.storage
+ drones is running at 100% CPU.
+ [3] Apply the patch and restart the open-ils.storage service.
+ [4] Try the query again; this time, it should return results
+ immediately without causing an open-ils.storage drone to
+ peg a CPU.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm
+12 0 Open-ILS/src/perlmods/t/21-QueryParser.t
+
+commit a97830d71ee66f26e958d10fddf035ff66978986
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Fri Oct 2 10:17:09 2015 -0400
+
+ LP 1502156: Fix marc_export error when dumping authorities.
+
+ There is a chance that marc_export will attempt to call a nonexistent
+ field on MARC::Record if an error occurs while exporting authority
+ records. The bug could only be triggered if a conversion error
+ occurred while exporting the authority as either MARCXML or USMARC.
+
+ The fix is to rename a couple of variables in the Marque::Authority->next
+ method to be more like those used in Marque::Biblio->next. This will have
+ the side effect of making marc_export easier to maintain, since the
+ variables used in one method will now have the same meaning as those
+ in the other.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+18 18 Open-ILS/src/support-scripts/marc_export.in
+
+commit e38f089bb54397c6465b9c12bf2c4c0d3ac12a39
+Author: Josh Stompro <stomproj at larl.org>
+Date: Sun Sep 20 10:43:10 2015 -0500
+
+ LP#1497318 - Acknowledgments update Adding Northwest Regional Library System
+ and Matthew Berowski for typo fixes.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+
+2 0 docs/RELEASE_NOTES_2_8.txt
+
+commit fcfed58bd2e875d1b7246f2a1052836770bfd9b5
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Thu Sep 17 08:24:56 2015 -0400
+
+ LP#1496837: Postgres fixed a bug and broke our test
+
+ So, we will unbreak it here. The PG fix in question can be seen here:
+
+ http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=c975fa4713c2325623d7bbfd81806327234281ac
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
+
+commit 2dcc84612ccc83eb775d36bd4de21a05efefa28b
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Sep 16 16:14:51 2015 -0400
+
+ Docs: 2.8 Acknowledgements addition
+
+ We missed acknowledgements for a few code contributors during the 2.8.3
+ point release. Adding them here as well as a fix to get the header to display
+ properly for the 2.8.4 release notes.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+6 0 docs/RELEASE_NOTES_2_8.txt
+
+commit 37e3c70bce9e1911bb4328654a2993195d01512b
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Wed Sep 16 15:20:49 2015 -0400
+
+ Porting 2.8.3->2.8.4 SQL upgrade
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+12 0 Open-ILS/src/sql/Pg/version-upgrade/2.8.3-2.8.4-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.8.3-2.8.4-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..0f2ecf9 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-8-5";
}
__PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ca4950d..9c3c32c 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 ('0949', :eg_version); -- csharp/kmlussier/dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.8.5', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.8.5-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.8.5-upgrade-db.sql
new file mode 100644
index 0000000..aa3e899
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.8.5-upgrade-db.sql
@@ -0,0 +1,161 @@
+--Upgrade Script for 2.8.4 to 2.8.5
+\set eg_version '''2.8.5'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.8.5', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('0948', :eg_version);
+
+ALTER TABLE biblio.monograph_part ADD COLUMN deleted BOOL NOT NULL DEFAULT FALSE;
+CREATE RULE protect_mono_part_delete AS ON DELETE TO biblio.monograph_part DO INSTEAD (
+ UPDATE biblio.monograph_part SET deleted = TRUE WHERE OLD.id = biblio.monograph_part.id;
+ DELETE FROM asset.copy_part_map WHERE part = OLD.id
+);
+
+CREATE OR REPLACE FUNCTION unapi.holdings_xml (
+ bid BIGINT,
+ ouid INT,
+ org TEXT,
+ depth INT DEFAULT NULL,
+ includes TEXT[] DEFAULT NULL::TEXT[],
+ slimit HSTORE DEFAULT NULL,
+ soffset HSTORE DEFAULT NULL,
+ include_xmlns BOOL DEFAULT TRUE,
+ pref_lib INT DEFAULT NULL
+)
+RETURNS XML AS $F$
+ SELECT XMLELEMENT(
+ name holdings,
+ XMLATTRIBUTES(
+ CASE WHEN $8 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+ CASE WHEN ('bre' = ANY ($5)) THEN 'tag:open-ils.org:U2 at bre/' || $1 || '/' || $3 ELSE NULL END AS id,
+ (SELECT record_has_holdable_copy FROM asset.record_has_holdable_copy($1)) AS has_holdable
+ ),
+ XMLELEMENT(
+ name counts,
+ (SELECT XMLAGG(XMLELEMENT::XML) FROM (
+ SELECT XMLELEMENT(
+ name count,
+ XMLATTRIBUTES('public' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+ )::text
+ FROM asset.opac_ou_record_copy_count($2, $1)
+ UNION
+ SELECT XMLELEMENT(
+ name count,
+ XMLATTRIBUTES('staff' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+ )::text
+ FROM asset.staff_ou_record_copy_count($2, $1)
+ UNION
+ SELECT XMLELEMENT(
+ name count,
+ XMLATTRIBUTES('pref_lib' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+ )::text
+ FROM asset.opac_ou_record_copy_count($9, $1)
+ ORDER BY 1
+ )x)
+ ),
+ CASE
+ WHEN ('bmp' = ANY ($5)) THEN
+ XMLELEMENT(
+ name monograph_parts,
+ (SELECT XMLAGG(bmp) FROM (
+ SELECT unapi.bmp( id, 'xml', 'monograph_part', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'bre'), 'holdings_xml'), $3, $4, $6, $7, FALSE)
+ FROM biblio.monograph_part
+ WHERE NOT deleted AND record = $1
+ )x)
+ )
+ ELSE NULL
+ END,
+ XMLELEMENT(
+ name volumes,
+ (SELECT XMLAGG(acn ORDER BY rank, name, label_sortkey) FROM (
+ -- Physical copies
+ SELECT unapi.acn(y.id,'xml','volume',evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'holdings_xml'),'bre'), $3, $4, $6, $7, FALSE), y.rank, name, label_sortkey
+ FROM evergreen.ranked_volumes($1, $2, $4, $6, $7, $9, $5) AS y
+ UNION ALL
+ -- Located URIs
+ SELECT unapi.acn(uris.id,'xml','volume',evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'holdings_xml'),'bre'), $3, $4, $6, $7, FALSE), uris.rank, name, label_sortkey
+ FROM evergreen.located_uris($1, $2, $9) AS uris
+ )x)
+ ),
+ CASE WHEN ('ssub' = ANY ($5)) THEN
+ XMLELEMENT(
+ name subscriptions,
+ (SELECT XMLAGG(ssub) FROM (
+ SELECT unapi.ssub(id,'xml','subscription','{}'::TEXT[], $3, $4, $6, $7, FALSE)
+ FROM serial.subscription
+ WHERE record_entry = $1
+ )x)
+ )
+ ELSE NULL END,
+ CASE WHEN ('acp' = ANY ($5)) THEN
+ XMLELEMENT(
+ name foreign_copies,
+ (SELECT XMLAGG(acp) FROM (
+ SELECT unapi.acp(p.target_copy,'xml','copy',evergreen.array_remove_item_by_value($5,'acp'), $3, $4, $6, $7, FALSE)
+ FROM biblio.peer_bib_copy_map p
+ JOIN asset.copy c ON (p.target_copy = c.id)
+ WHERE NOT c.deleted AND p.peer_record = $1
+ LIMIT ($6 -> 'acp')::INT
+ OFFSET ($7 -> 'acp')::INT
+ )x)
+ )
+ ELSE NULL END
+ );
+$F$ LANGUAGE SQL STABLE;
+
+CREATE OR REPLACE FUNCTION unapi.bmp ( obj_id BIGINT, format TEXT, ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit HSTORE DEFAULT NULL, soffset HSTORE DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+ SELECT XMLELEMENT(
+ name monograph_part,
+ XMLATTRIBUTES(
+ CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+ 'tag:open-ils.org:U2 at bmp/' || id AS id,
+ id AS ident,
+ label,
+ label_sortkey,
+ 'tag:open-ils.org:U2 at bre/' || record AS record
+ ),
+ CASE
+ WHEN ('acp' = ANY ($4)) THEN
+ XMLELEMENT( name copies,
+ (SELECT XMLAGG(acp) FROM (
+ SELECT unapi.acp( cp.id, 'xml', 'copy', evergreen.array_remove_item_by_value($4,'bmp'), $5, $6, $7, $8, FALSE)
+ FROM asset.copy cp
+ JOIN asset.copy_part_map cpm ON (cpm.target_copy = cp.id)
+ WHERE cpm.part = $1
+ AND cp.deleted IS FALSE
+ ORDER BY COALESCE(cp.copy_number,0), cp.barcode
+ LIMIT ($7 -> 'acp')::INT
+ OFFSET ($8 -> 'acp')::INT
+
+ )x)
+ )
+ ELSE NULL
+ END,
+ CASE WHEN ('bre' = ANY ($4)) THEN unapi.bre( record, 'marcxml', 'record', evergreen.array_remove_item_by_value($4,'bmp'), $5, $6, $7, $8, FALSE) ELSE NULL END
+ )
+ FROM biblio.monograph_part
+ WHERE NOT deleted AND id = $1
+ GROUP BY id, label, label_sortkey, record;
+$F$ LANGUAGE SQL STABLE;
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0949', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.protect_reserved_rows_from_delete() RETURNS trigger AS $protect_reserved$
+BEGIN
+IF OLD.id < TG_ARGV[0]::INT THEN
+ RAISE EXCEPTION 'Cannot delete row with reserved ID %', OLD.id;
+END IF;
+END
+$protect_reserved$
+LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS acq_no_deleted_reserved_cancel_reasons ON acq.cancel_reason;
+
+CREATE TRIGGER acq_no_deleted_reserved_cancel_reasons BEFORE DELETE ON acq.cancel_reason
+ FOR EACH ROW EXECUTE PROCEDURE evergreen.protect_reserved_rows_from_delete(2000);
+
+ALTER TABLE acq.cancel_reason ENABLE TRIGGER acq_no_deleted_reserved_cancel_reasons;
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index dd10653..83fed84 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_8_5</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..a24c9c8 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_8_5");
pref("open-ils.repository.author","$Author$");
pref("open-ils.repository.revision","$Revision$");
pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..db9c66d 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.8"
!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..9763047
--- /dev/null
+++ b/README
@@ -0,0 +1,641 @@
+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), Debian Squeeze(6.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 many distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
+ *root* Linux account and add the following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+deb http://backports.debian.org/debian-backports squeeze-backports main contrib
+------------------------------------------------------------------------------
++
+ * 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`, `debian-squeeze`, `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
+------------------------------------------------------------------------------
+
+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_8_5 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+ to resolve. Issue the following commands as the *root* Linux account to
+ create a symbolic link pointing to the `server` subdirectory of the server
+ portion of the staff client that we just built using the staff client ID
+ 'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+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-debian-squeeze
+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 585ab00..757e51b 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.8.5, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.8.5])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
commit 19e8150ba98c34746a5ce89416d8cd29433a3225
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Nov 18 13:37:53 2015 -0500
Modify server upgrade doc for 2.8.5
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 1c0c1a9..43607c6 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -48,8 +48,8 @@ the http://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
+
[source, bash]
-----------------------------------------------
-wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.8.3.tar.gz
-tar xzf Evergreen-ILS-2.8.3.tar.gz
+wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.8.5.tar.gz
+tar xzf Evergreen-ILS-2.8.5.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the http://evergreen-ils.org/egdownlo
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.8.3
+cd /home/opensrf/Evergreen-ILS-2.8.5
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -85,7 +85,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.8.3
+cd /home/opensrf/Evergreen-ILS-2.8.5
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -96,8 +96,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.8.3
-make STAFF_CLIENT_STAMP_ID=rel_2_8_3 install
+cd /home/opensrf/Evergreen-ILS-2.8.5
+make STAFF_CLIENT_STAMP_ID=rel_2_8_5 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -113,7 +113,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_8_3/server server
+ln -sf rel_2_8_5/server server
----------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -133,7 +133,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.8.3
+cd /home/opensrf/Evergreen-ILS-2.8.5
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -157,21 +157,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.8.3/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.8.5/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.8.3/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.8.5/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.8.3/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.8.5/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -194,7 +194,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.8.3, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.8.5, you
would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
@@ -210,13 +210,15 @@ would run the following upgrade scripts:
- 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.8.5-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.8.3), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.8.5), use
the same logic to utilize the provided major version upgrade scripts. For
example:
@@ -230,7 +232,7 @@ example:
- 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.3)
+- (run all incremental scripts from 2.8.0 to 2.8.5)
=============
[CAUTION]
@@ -244,7 +246,7 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.8.3/Open-ILS/src/sql/Pg
+cd /home/opensrf/Evergreen-ILS-2.8.5/Open-ILS/src/sql/Pg
psql -U evergreen -h localhost -f version-upgrade/2.7.4-2.8.0-upgrade-db.sql evergreen
----------------------------------------------------------
commit 2e15ba49daefa20c5aa5f81f321a6d2a46296115
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Sep 16 13:52:40 2015 -0400
Bumping Perl version string for 2.8.5 release
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index 485edbc..045055f 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
=cut
-our $VERSION = '2.08';
+our $VERSION = '2.0805';
1;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list