From 4a1c89986044610e37fc739163e6fa19d3c0c730 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Tue, 3 Mar 2015 14:31:30 -0500 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Ben Shum --- ChangeLog | 664 ++++++++++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../Pg/version-upgrade/2.7.3-2.7.4-upgrade-db.sql | 114 ++++ .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- Open-ILS/xul/staff_client/windowssetup.nsi | 2 +- README | 620 ++++++++++++++++++- configure.ac | 4 +- 9 files changed, 1401 insertions(+), 10 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.7.3-2.7.4-upgrade-db.sql mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..3f5c6bfe0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,661 @@ -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 71005a34c3f4d21f61fde01362697a0898f23d7e +Author: Ben Shum +Date: Wed Feb 4 14:42:16 2015 -0500 + + Bump OpenILS.pm version to 2.7.4 + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit a9fe81b813d8bc92b71a800e54e8ba8759c69df0 +Author: Jason Stephenson +Date: Thu Feb 19 11:17:08 2015 -0500 + + LP#1424755: Add IMPORTANT SECURITY INFORMATION release note. + + Signed-off-by: Jason Stephenson + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +9 0 docs/RELEASE_NOTES_NEXT/security-bug-fix.txt + create mode 100644 docs/RELEASE_NOTES_NEXT/security-bug-fix.txt + +commit e2a16e576e443084493fc0c327fb8fb80a9e1c51 +Author: Jason Stephenson +Date: Wed Feb 18 16:28:31 2015 -0500 + + LP#1424755: Org Unit Setting view permissions can be bypassed + + Fix private org. unit setting leakage by forcing the $auth argument + to true if not passed in when open-ils.actor.ou_setting.ancestor_default + or open-ils.actor.ou_setting.ancestor_default.batch are called. + + Other than a change to the desc of the public methods to reflect that + they now check permissions if permissions are required, there are no + required api changes to the back or the front ends. + + Signed-off-by: Jason Stephenson + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +10 4 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm + +commit 928094b536189fc2c7896d67ab6b97f3f241022b +Author: Jason Stephenson +Date: Tue Feb 24 14:05:16 2015 -0500 + + LP#1206589: Temporary Fix for Org. Unit Settings History Bug + + This commit makes two changes to the coustl IDL entry. + + 1. It adds a retrieve permission of STAFF_LOGIN. This at least + requires someone with staff permission to be able to view settings + history. + + 2. It fixed the primary key field from date_applied to id. The + prior setting was just an outright error. + + NOTE: This is intended as a short term fix for the Library Settings + Editor history feature. + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +2 2 Open-ILS/examples/fm_IDL.xml + +commit 0a2fe2443981e28ff84a35d7a4188071f114a1fd +Author: Kathy Lussier +Date: Mon Mar 2 15:06:03 2015 -0500 + + lp1427331: Remove relator information from author links + + Removes the display and linking of relator information from the author field + on the search results page. The display of subfield e was limiting the number + or results retrieved when clicking these links. + + Signed-off-by: Kathy Lussier + Signed-off-by: Dan Scott + +1 1 Open-ILS/src/templates/opac/parts/misc_util.tt2 + +commit 3794cfdf9913618d3ddb585f86009ad5cb67d7b6 +Author: Dan Wells +Date: Tue Mar 3 12:11:35 2015 -0500 + + Revert LP#1205072 + + It was decided that these changes caused too much potential for + confusion, and would be better served by a simultaneous change to + making 'granularity' case insensitive. Pulling back for now. + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/support-scripts/action_trigger_runner.pl.in +5 8 Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2 +0 1 Open-ILS/web/js/ui/default/conify/global/action_trigger/event_definition.js +0 13 docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt +2 2 docs/admin/actiontriggers.txt + delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt + +commit 71d56c035ab939f5d7e4839cb88c58f16d94a8ba +Author: Galen Charlton +Date: Thu Nov 13 09:42:45 2014 -0800 + + LP#1287370: minor textual cleanup + + - remove trailing spaces + - remove debug logging + + Signed-off-by: Galen Charlton + Signed-off-by: Erica Rohlfs + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +4 5 Open-ILS/web/js/dojo/openils/widget/AutoGrid.js +1 1 Open-ILS/web/js/ui/default/acq/financial/list_funds.js + +commit 21604aee487a1c78981e9bdecffc272885886693 +Author: Bill Erickson +Date: Tue Aug 12 12:03:05 2014 -0400 + + LP#1287370: apply filter/offset persistence to the fund search page + + This patch completes the AutoGrid work and applies the + filter & offset persistence to the fund search page. + + Signed-off-by: Bill Erickson + Signed-off-by: Galen Charlton + Signed-off-by: Erica Rohlfs + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +1 0 Open-ILS/src/templates/acq/fund/list.tt2 +46 21 Open-ILS/web/js/dojo/openils/widget/AutoGrid.js +18 2 Open-ILS/web/js/ui/default/acq/financial/list_funds.js + +commit bdda621dec98c5cea7ae1d8dcf0bf42fa42df80c +Author: Bill Erickson +Date: Mon Aug 11 16:45:21 2014 -0400 + + LP#1287370: allow AutoGrid to persist filter state and page offset + + By turning on a new AutoGrid option called urlNavigation, + the current filter and offset is stored in a URL parameter + called djgridops. This permits using the back button + to return to an AutoGrid page at the place in the search + results where the user left it. + + Signed-off-by: Bill Erickson + Signed-off-by: Galen Charlton + Signed-off-by: Erica Rohlfs + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +58 7 Open-ILS/web/js/dojo/openils/widget/AutoGrid.js + +commit 1419de51d949afd4d573c0407d0ae6fd96e5d25d +Author: Adam Bowling +Date: Tue Jan 20 16:54:11 2015 -0500 + + LP #1406350 Mobile Device Navigation Issue Fix for Shelf Browser + + Currently, when a browser window is narrowed too much, whether + in a mobile browser, or on a desktop or laptop machine, the + "Previous Page" and "Next Page" navigation links disappear. The + only solution that seems to solve this is by removing the + "THEAD" element from the shelf browser table. + + This patch removes that tag, adds a new row to imitate a new + border as existed before, and modifies the CSS in .../opac/ + css/style.css.tt2 to address that difference. + + Signed-off-by: Adam Bowling + Signed-off-by: Yamil Suarez + Signed-off-by: Ben Shum + +3 1 Open-ILS/src/templates/opac/css/style.css.tt2 +3 2 Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 + +commit d49f53af0ecd3982ea27f2b95201ec91b1fb4b03 +Author: Remington Steed +Date: Mon Mar 2 16:54:56 2015 -0500 + + LP#1205072: Correct and clarify the upgrade notes + + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +5 3 docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt + +commit ed6ed6fcaa70e70e1589a2a10af96a52657b50df +Author: Josh Stompro +Date: Tue Jan 13 13:36:40 2015 -0600 + + LP#1205072 - Assorted fixes for action trigger granularity settings + + - Added "weekdays" option to match up with example crontab file + - Change granularity example back to lowercase + - Change granularity labels to lowercase in the docs + + Signed-off-by: Josh Stompro + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/support-scripts/action_trigger_runner.pl.in +1 0 Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2 +2 2 docs/admin/actiontriggers.txt + +commit a2c54d44817c5a85186183d3fe61f9ea30ac268b +Author: Bill Erickson +Date: Tue Dec 2 15:00:22 2014 -0500 + + LP#1205072 A/T granularity upgrade notes + + Signed-off-by: Bill Erickson + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +11 0 docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt + create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt + +commit 34172c39751cf4a6e0f45c8653d9582fcf9c543c +Author: Bill Erickson +Date: Wed Nov 26 14:31:41 2014 -0500 + + LP#1205072 A/T granularity UI sane default, honors case + + Present A/T granularity options as untranslated, lower-case strings to + match the crontab examples. Also, honor alternate case variations for + granularity values so that "Daily" and "daily" are both seprate, valid + options. + + Signed-off-by: Bill Erickson + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +7 5 Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2 +1 0 Open-ILS/web/js/ui/default/conify/global/action_trigger/event_definition.js + +commit 151100ea708cc5c4c281a542295677abc1442998 +Author: Mike Rylander +Date: Tue Mar 4 11:31:13 2014 -0500 + + LP#1287791: Restrict authority browse to controlled subfields + + Back in bug 1175308 I added some logic that improves the behavior + of the MARC editor's right-click authority popup. Now we need to + go a little farther and adjust that logic to be more careful about + which subfields it uses to browse for authority records. Specifically, + it should only use controlled subfields. + + Signed-off-by: Mike Rylander + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +19 1 Open-ILS/xul/staff_client/server/cat/marcedit.js + +commit a0c9d45a66568d26fdf886e313b140c1c8ed8fdc +Author: Galen Charlton +Date: Mon Mar 2 14:56:34 2015 +0000 + + LP#1155313: fix mangling of schema upgrade script name + + Signed-off-by: Galen Charlton + +25 0 Open-ILS/src/sql/Pg/upgrade/0914.schema.lpad-number-repair.sql +0 25 Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0914.schema.lpad-number-repair.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql + +commit 10009982c5b4dc28e23fffb2a1cf85a10ba9094b +Author: Galen Charlton +Date: Mon Mar 2 14:20:55 2015 +0000 + + LP#1155313: recalculate normalized labels during upgrade + + Signed-off-by: Galen Charlton + +4 0 Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql + +commit 79eb3de8fdac6467aa59ddf5ebc0a2d6c6cbda7f +Author: Galen Charlton +Date: Mon Mar 2 14:05:52 2015 +0000 + + LP#1155313: pin upgrade script to 0914 + + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +21 0 Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql +0 19 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql + +commit a996868bd08de94f26dd09ed895a5f71af1ce942 +Author: Galen Charlton +Date: Mon Mar 2 14:02:23 2015 +0000 + + LP#1155313: fix copy-and-paste-o in test case + + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg + +commit 7b3bc0873518add3c14ae7fe9b7b8ca153fe8748 +Author: Dan Pearl +Date: Mon Jan 5 13:28:13 2015 -0500 + + LP#1155313: upgrade script and pgTAP tests for monograph_part label normalization fix + + Signed-off-by: Daniel Pearl + Signed-off-by: Galen Charlton + +41 0 Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg +19 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql + create mode 100644 Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql + +commit 73c869128467a55f63deeaba00482372ad4b9744 +Author: Dan Pearl +Date: Fri Mar 15 15:04:37 2013 -0400 + + LP#1155313: Repair generation of label_sortkey for monograph_part entries + + The evergreen.lpad_number_substrings function attempts to codify numeric + fields within labels. It does this by finding the strings, padding them + to a given size, and replacing them in the source string. For instance: + 3 => 0000000003 + 15.4 => 00000000150000000004 + + The algorithm was fooled by repeated characters, like in 15.1: + 15.1 => 00000000000000000150000000001 INCORRECT + + This change will result in the correct value. + + Signed-off-by: Dan Pearl + Signed-off-by: Galen Charlton + +6 6 Open-ILS/src/sql/Pg/002.functions.config.sql + +commit 38f3cfc0071e6664352b128e720bf18cd01496fd +Author: Josh Stompro +Date: Thu Jan 15 20:03:55 2015 -0600 + + LP#1395842: fix labels for A/T environment and parameter ID fields + + Signed-off-by: Josh Stompro + Signed-off-by: Galen Charlton + +2 2 Open-ILS/examples/fm_IDL.xml + +commit 888e54be1a819bb93558a461dfa6eadf5f5ed912 +Author: Ben Shum +Date: Sat Feb 28 12:24:31 2015 -0500 + + LP#1426133: followup fix seed data sequence + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/950.data.seed-values.sql + +commit f847a92ddbd2e3231f48fa73ccfe6a9b9c769d78 +Author: Jason Etheridge +Date: Thu Feb 26 09:26:47 2015 -0500 + + LP#1425967: look for Business::CreditCard in settings-tester.pl + + and not Business::CreditCard::Object + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/support-scripts/settings-tester.pl + +commit 94d646f5c433481ddbb331382703b62a43dbd2a9 +Author: Ben Shum +Date: Fri Feb 27 10:25:48 2015 -0500 + + LP#1426133: Stamping upgrade script for set merge_profile_id_seq + + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +24 0 Open-ILS/src/sql/Pg/upgrade/0913.schema.redo_vandelay_merge_profile_sequence.sql +0 24 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0913.schema.redo_vandelay_merge_profile_sequence.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql + +commit 8d75bafea9614ede49b27d572c40cc04f3bb715f +Author: Remington Steed +Date: Thu Feb 26 16:21:48 2015 -0500 + + LP#1426133: Set merge_profile_id_seq explicitly + + Many database tables need to explicitly set the id sequence (often to + 100) to provide room for stock data with static ids. This commit does so + for vandelay.merge_profile, and also updates the ids of any non-stock + profiles (both in the merge_profile table and in related settings). + + Signed-off-by: Remington Steed + Signed-off-by: Ben Shum + +2 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql +24 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql + +commit 4dc66577e9864230272dad4f5ddf45ead9073887 +Author: Dan Wells +Date: Thu Feb 12 13:08:52 2015 -0500 + + LP#1425191 Restore summarization of serial units + + In a previous commit, code was added for force summaries to be limited + to a certain type (to prevent cross type contamination of summaries). + This had the negative side-effect of preventing summaries on units, as + the units were not requesting a 'type' for their summary. + + While we could force the unit code to send a type, it seemed generally + more flexible to restore the removed support for returning all summary + information in the absense of a requested type. This could lead to + cross-type summaries for units, but that is a larger issue altogether + (i.e. how we can properly support cross-type units at all). + + Signed-off-by: Dan Wells + Signed-off-by: Kathy Lussier + +12 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm + +commit a1b703ee1d67afb4a8ea25555c6f2908acf1a28e +Author: Kathy Lussier +Date: Wed Feb 25 15:20:51 2015 -0500 + + lp1373203: Allow users to escape metarecord holds (backport version) + + Provides a means for users to escape a metarecord hold if they accidentally + clicked the Advanced Hold Options link. A "Go Back" link will be + provided to allow the user to return to a title hold. If the hold starts as a + metarecord hold, this link won't display since we don't know which bib the + patron wants. + + Also fixes an issue where the hold cancel button always returned the user to + the previous screen. + + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +10 3 Open-ILS/src/templates/opac/parts/place_hold.tt2 + +commit fabb840587ffbca9f9e3ed83d7d33f8b9d1a505e +Author: Remington Steed +Date: Tue Feb 24 13:25:16 2015 -0500 + + LP#957466: Fix invalid MARCXML syntax + + This commit fixes some invalid MARCXML syntax, and also makes the XPath + query more general to allow for namespaces on the tags. + + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm + +commit 1bee75f92d9e6fd5157867cbff16f6f3e5b32053 +Author: Remington Steed +Date: Thu Feb 19 10:03:18 2015 -0500 + + LP#957466: Added pgTAP test for db function change + + Signed-off-by: Remington Steed + Signed-off-by: Dan Wells + +80 0 Open-ILS/src/sql/Pg/t/regress/lp957466_update_date_and_source.pg + create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp957466_update_date_and_source.pg + +commit 8a64ef33c48d2ec523dfa4b9ca0dfdc111c08cf7 +Author: Jason Stephenson +Date: Wed Feb 18 10:13:56 2015 -0500 + + LP#957466: Stamping Upgrade Script + + Signed-off-by: Jason Stephenson + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +66 0 Open-ILS/src/sql/Pg/upgrade/0908.function.vandelay-overlay_bib_record.sql +0 66 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vandelay-overlay_bib_record.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0908.function.vandelay-overlay_bib_record.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vandelay-overlay_bib_record.sql + +commit 4bf4b6e8bd414de8c06070b3554642607662b936 +Author: Jason Stephenson +Date: Fri Feb 13 12:22:19 2015 -0500 + + LP#957466 Vandelay set the 905$u to current user if not defined + + This version only adds a 905$u if none already exist in the document. It + does so by creating a new 905 tag with subfield u. It does not add on + to any possibly existing 905 tag that does not have a subfield u. + + This will cause the code in the previous commit to trigger and update the + appropriate fields in biblio.record_entry. + + Signed-off-by: Jason Stephenson + Signed-off-by: Dan Wells + +24 0 Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm +5 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm + +commit d1459e045d5a4da3b6220fa3267448a5a0f68eef +Author: Remington Steed +Date: Mon Oct 13 12:22:32 2014 -0400 + + LP#957466: Update editor/edit_date/source on overlay + + This commit does three things. + + 1. It removes some declared variables that are never used in this + function. + + 2. It updates the bib record edit_date field (along with the editor) if + an editor is found in the MARC. If an editor is not found (or doesn't + match an Evergreen user), it seems best to leave the edit_date + unchanged so as not to imply that the previous editor is responsible for + the newest edit. + + 3. If a bib source is chosen in the vandelay importer UI, it updates the + bib record with the source. To access this field, the reference to table + "queued_record" is replaced by its child table "queued_bib_record". + Since the new table is a child of the other, all of the other needed + values are still available. + + Signed-off-by: Remington Steed + Signed-off-by: Jason Stephenson + Signed-off-by: Martha Driscoll + Signed-off-by: Dan Wells + +17 9 Open-ILS/src/sql/Pg/012.schema.vandelay.sql +66 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vandelay-overlay_bib_record.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.vandelay-overlay_bib_record.sql + +commit 2defa0d44052a21e2efa5ed42739e1badb4c3ade +Author: Galen Charlton +Date: Mon Feb 23 20:25:02 2015 +0000 + + LP#1154579: explicitly alert if copy location failed to be deleted + + This patch adds an alert if the act of deleting a copy + location in the staff interface fails -- which would + most commonly happen if there are still active items + attached to the location to be deleted. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +4 1 Open-ILS/xul/staff_client/server/admin/copy_locations.js + +commit 2c0d82dac53ef965e0588c678bfe7e788f1b7cd6 +Author: Galen Charlton +Date: Thu Feb 5 16:52:36 2015 +0000 + + LP#904581: when calculating hold status, be more careful about fetching transits + + This patch fixes a problem where if a hold meets the following + criteria, an "Invalid date format: at /usr/share/perl5/Error.pm" + error can be thrown when fetching its details: + + - the hold has a captured item + - the captured item has status 8 (on hold shelf) + - there is another item that is currently in transit to fill the hold + - the pickup library (or one of its ancestors) has the + circ.hold_shelf_status_delay library setting set. + + Signed-off-by: Galen Charlton + Signed-off-by: Ben Shum + +5 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit f0ad0694c3e2981fb03cd417beb66215c302a7bc +Author: Galen Charlton +Date: Mon Feb 23 19:11:59 2015 +0000 + + Revert "LP#1419813 Fix default joins for config.rule_age_hold_protection." + + This reverts commit e775a06a92807da781886cb4a46024210fa5fd19. + +4 4 Open-ILS/examples/fm_IDL.xml + +commit 78064b92135426be4b2795fafc68ac60a99308fa +Author: Galen Charlton +Date: Thu Feb 19 15:59:33 2015 +0000 + + LP#1418772: (follow-up) tweak undef-edness check + + Use the Perl defined() function rather than "eq undef" + to avoid logging warnings about undefined values. + + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm + +commit 25c25e7ac885b22a8e09b39814d623e49956013b +Author: Steven Chan +Date: Mon Jul 22 12:39:48 2013 -0700 + + LP#1418772: Avoid internal server error on viewing full record when copy create_date is null + + In the TPAC client, when it tries to show record details containing a copy + record with no create date, it shows an Internal Server Error instead. + + 1. The error is caused by trying to execute the parse_datetime() method + in the parse_date() function in the WWW/EGCatLoader/util.pm module with + an empty date string. The function will normally translate a datetime + string from the database to a datetime string that is formatted for TPAC + templates. The fix is to not execute parse_datetime() and just return + an empty string. + + 2. In the record/copy_table.tt2 template, if an empty datetime string is + the value for copy_info.create_date, the format() method of the Date + plugin will show the current datetime by default. The fix is to show '-' + in its place, replicating the same template logic as for + copy_info.due_date. + + Signed-off-by: Jeff Davis + Signed-off-by: Galen Charlton + +3 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm +10 4 Open-ILS/src/templates/opac/parts/record/copy_table.tt2 + +commit e775a06a92807da781886cb4a46024210fa5fd19 +Author: Chris Sharp +Date: Mon Feb 9 09:24:11 2015 -0500 + + LP#1419813 Fix default joins for config.rule_age_hold_protection. + + config.rule_age_hold_protection had a "has_a" relationship + to several copy and copy-like sources when age protection + is optional. Changing those to "might_have" to allow left + joins by default. + + Signed-off-by: Chris Sharp + Signed-off-by: Galen Charlton + +4 4 Open-ILS/examples/fm_IDL.xml + +commit 6f4c296821464cb7d8e56561880cfa4a8ebbf4cf +Author: Ben Shum +Date: Wed Feb 4 16:08:41 2015 -0500 + + Forward-port 2.7.2-2.7.3 upgrade script + + Signed-off-by: Ben Shum + +732 0 Open-ILS/src/sql/Pg/version-upgrade/2.7.2-2.7.3-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.7.2-2.7.3-upgrade-db.sql diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index d750216454..3c0e927e46 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-7-4"; } __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 5e1a8923ba..f9b4a5085f 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 ('0914', :eg_version); -- dpearl/gmcharlt +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.4', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.7.3-2.7.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.7.3-2.7.4-upgrade-db.sql new file mode 100644 index 0000000000..f2b63e1285 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.7.3-2.7.4-upgrade-db.sql @@ -0,0 +1,114 @@ +--Upgrade Script for 2.7.3 to 2.7.4 +\set eg_version '''2.7.4''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.4', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('0908', :eg_version); + +CREATE OR REPLACE FUNCTION vandelay.overlay_bib_record ( import_id BIGINT, eg_id BIGINT, merge_profile_id INT ) RETURNS BOOL AS $$ +DECLARE + editor_string TEXT; + editor_id INT; + v_marc TEXT; + v_bib_source INT; + update_fields TEXT[]; + update_query TEXT; +BEGIN + + SELECT q.marc, q.bib_source INTO v_marc, v_bib_source + FROM vandelay.queued_bib_record q + JOIN vandelay.bib_match m ON (m.queued_record = q.id AND q.id = import_id) + LIMIT 1; + + IF v_marc IS NULL THEN + -- RAISE NOTICE 'no marc for vandelay or bib record'; + RETURN FALSE; + END IF; + + IF vandelay.template_overlay_bib_record( v_marc, eg_id, merge_profile_id) THEN + UPDATE vandelay.queued_bib_record + SET imported_as = eg_id, + import_time = NOW() + WHERE id = import_id; + + editor_string := (oils_xpath('//*[@tag="905"]/*[@code="u"]/text()',v_marc))[1]; + + IF editor_string IS NOT NULL AND editor_string <> '' THEN + SELECT usr INTO editor_id FROM actor.card WHERE barcode = editor_string; + + IF editor_id IS NULL THEN + SELECT id INTO editor_id FROM actor.usr WHERE usrname = editor_string; + END IF; + + IF editor_id IS NOT NULL THEN + --only update the edit date if we have a valid editor + update_fields := ARRAY_APPEND(update_fields, 'editor = ' || editor_id || ', edit_date = NOW()'); + END IF; + END IF; + + IF v_bib_source IS NOT NULL THEN + update_fields := ARRAY_APPEND(update_fields, 'source = ' || v_bib_source); + END IF; + + IF ARRAY_LENGTH(update_fields, 1) > 0 THEN + update_query := 'UPDATE biblio.record_entry SET ' || ARRAY_TO_STRING(update_fields, ',') || ' WHERE id = ' || eg_id || ';'; + --RAISE NOTICE 'query: %', update_query; + EXECUTE update_query; + END IF; + + RETURN TRUE; + END IF; + + -- RAISE NOTICE 'update of biblio.record_entry failed'; + + RETURN FALSE; + +END; +$$ LANGUAGE PLPGSQL; + + +SELECT evergreen.upgrade_deps_block_check('0913', :eg_version); + +--stock evergreen comes with 2 merge profiles; move any custom profiles +UPDATE vandelay.merge_profile SET id = id + 100 WHERE id > 2; + +--update the same ids in org unit settings, stored in double quotes +UPDATE actor.org_unit_setting + SET value = '"' || merge_profile_id+100 || '"' + FROM ( + SELECT id, (regexp_matches(value, '"(\d+)"'))[1]::int as merge_profile_id FROM actor.org_unit_setting + WHERE name IN ( + 'acq.upload.default.vandelay.low_quality_fall_thru_profile', + 'acq.upload.default.vandelay.merge_profile' + ) + ) as foo + WHERE actor.org_unit_setting.id = foo.id + AND foo.merge_profile_id > 2; + +--set sequence's next value to 100, or more if necessary +SELECT SETVAL('vandelay.merge_profile_id_seq', GREATEST(100, (SELECT MAX(id) FROM vandelay.merge_profile))); + + +SELECT evergreen.upgrade_deps_block_check('0914', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.lpad_number_substrings( TEXT, TEXT, INT ) RETURNS TEXT AS $$ + my $string = shift; # Source string + my $pad = shift; # string to fill. Typically '0'. This should be a single character. + my $len = shift; # length of resultant padded field + my $find = $len - 1; + + while ($string =~ /(^|\D)(\d{1,$find})($|\D)/) { + my $padded = $2; + $padded = $pad x ($len - length($padded)) . $padded; + $string = $` . $1 . $padded . $3 . $'; + } + + return $string; +$$ LANGUAGE PLPERLU; + +COMMIT; + +-- recompute the various normalized label fields that use lpad_number_substrings() +UPDATE biblio.monograph_part SET id = id; +UPDATE asset.call_number_prefix SET id = id; +UPDATE asset.call_number_suffix SET id = id; 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 dd106530c3..781144cbd4 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_4

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 0613a13ddf..d07aefbf12 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_4"); 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 a9543579a8..31ae06e28f 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.7" !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}" !define UI_IMAGESET "beta" ;!define UI_IMAGESET "release" diff --git a/README b/README deleted file mode 120000 index b57451acb4..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/installation/server_installation.txt \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000000..90abf9ed15 --- /dev/null +++ b/README @@ -0,0 +1,619 @@ +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 install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + + * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version + is 9.1. + * **Linux**: Evergreen 2.7 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 below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +5. Add the libdbi-libdbd libraries to the system dynamic library path by + issuing the following commands as the *root* Linux account: ++ +[NOTE] +You should skip this step if installing on Ubuntu Precise or Trusty. The ubuntu +targets use libdbd-pgsql from packages. ++ +.Debian +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ ++ +.Fedora +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ + +Configuration and compilation instructions +------------------------------------------ + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +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_7_4 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 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 +[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, Ubuntu Precise, and Fedora) Update the prefork configuration + section to suit your environment. The following settings apply to a busy + system: ++ +[source,bash] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ + d. (Ubuntu Trusty) 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 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): ++ +[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 +------------------------------------------------------------------------------ + +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-'. Choose the most appropriate +command below based on your operating system. + +[source, bash] +------------------------------------------------------------------------------ +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 , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config --update-config \ + --service all --create-database --create-schema --create-offline \ + --user --password --hostname --port \ + --database --admin-user --admin-pass +------------------------------------------------------------------------------ + +This creates the database and schema and configures all of the services in +your `/openils/conf/opensrf.xml` configuration file to point to that database. +It also creates the configuration files required by the Evergreen `cgi-bin` +administration scripts, and sets the user name and password for the *egadmin* +Evergreen administrator account to your requested values. + +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 +------------------------------------------------------------------------------ + +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 585ab00c5f..e230afb6dd 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.7.4, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.7.4]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar]) -- 2.11.0