From 1109dce26f5a33827f65ba18788b2a3874cccdf9 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Thu, 16 Jan 2014 16:11:29 -0500 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Dan Wells --- ChangeLog | 655 ++++++++++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../Pg/version-upgrade/2.5.1-2.5.2-upgrade-db.sql | 234 ++++++++ .../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 | 552 ++++++++++++++++- configure.ac | 4 +- 9 files changed, 1444 insertions(+), 10 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.5.1-2.5.2-upgrade-db.sql mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..3e6ee35c84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,652 @@ -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 8acd20b13fc6f70fa47113f77c2e0d9552518c18 +Author: Dan Wells +Date: Thu Jan 16 16:01:09 2014 -0500 + + Rejigger 2.4.3-2.5.0 upgrade bits + + As reported in LP#1261355, Postgres fails in some cases when changing + constraints on existing data inside a transaction. This may or may not + fix the actual problem, but it at least tidies up these changes, and + will make it much cleaner to move outside the transaction if needed. + + Signed-off-by: Dan Wells + Signed-off-by: Remington Steed + +57 80 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.5.0-upgrade-db.sql + +commit d7d83e62421b32224475a2f62b80abaf6b970898 +Author: Dan Wells +Date: Thu Jan 16 15:10:09 2014 -0500 + + Bump OpenILS.pm version + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 3759277eb9466d333b7fd36a99ff2d03ca515cab +Author: Dan Wells +Date: Thu Jan 16 15:07:40 2014 -0500 + + Changes to smooth out make_release + + 1) Make the fake 'HeadURL' into a URL which works with our web repo. + Note that this has 'tags/' hardcoded in, so it only works with true + release branches (e.g. rel_x_y_z) not "working" branches + (e.g. rel_x_y). + + 2) Change range selector when building log to better exclude commits + from previous releases. + + Signed-off-by: Dan Wells + +2 2 build/tools/make_release + +commit 882bb2351979110784264c67902f46752443a3ea +Author: Mike Rylander +Date: Thu Jan 16 15:44:48 2014 -0500 + + Renumbering the upgrade script + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +97 0 Open-ILS/src/sql/Pg/upgrade/0852.function.prox_adjust.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0852.function.prox_adjust.sql + +commit 855ae327d62ac983c966f64ba8dfffabbe512478 +Author: Mike Rylander +Date: Thu Jan 16 14:11:34 2014 -0500 + + Upgrade script + + Signed-off-by: Mike Rylander + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Mike Rylander + +95 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.prox_adjust.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.prox_adjust.sql + +commit 70cde9a407f47234c424d96c8db289c45b4503a2 +Author: Mike Rylander +Date: Thu Jan 16 13:58:12 2014 -0500 + + Fix proximity adjustment calculator + + The canonical use case for proximity adjustment is to use it broadly + to effect the local proximity of items within a particular area, in + a like manner, across many parts of the org tree. However, in cases + where it is lightly used, or used with non-overlapping criteria columns, + there are cases where the adjustment will spread beyond its intended + range of influence. + + The changes here create a much stricter and correct test for rule + matching, which will end in the correct choice of rules in all cases. + + Signed-off-by: Mike Rylander + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Mike Rylander + +15 5 Open-ILS/src/sql/Pg/090.schema.action.sql + +commit 7a8348216405d4e9c74aa2b3996c74f98edd4efe +Author: Bill Erickson +Date: Wed Dec 18 13:31:18 2013 -0500 + + make_release cleanup and options + + * Avoid packaging the XULRunner packages within the Evergree tarball + + * Skip the inline SQL upgrade script edit step by default; continue + supporting option inline editing with a new -r option. + + * New -i option forces the script to bypass the lengthy i18n process, + which is primarily useful for quickly testing changes to this script. + + Signed-off-by: Bill Erickson + Signed-off-by: Dan Wells + +34 14 build/tools/make_release + +commit f043794140fc185a88c3e108442a20dd9d7d9620 +Author: Lebbeous Fogle-Weekley +Date: Tue Jan 14 17:11:45 2014 -0500 + + In prereq installer, don't try to chown extracted files to original UID/GID + + As this Makefile is designed to be used by a make process running as + root, this will avoid problems on some systems when tar extracts + files and tries to give them the same UID/GID as they have in their + archives, but those accounts don't exist on the local system. + + e.g, libdbi has files set 1000/1000. On most systems, there's a user + and a group with these IDs, but there can be systems where nothing + uses those IDs, and where tar fails with e.g. 'tar: libdbi-0.8.3: + Cannot change ownership to uid 1000, gid 1000: Invalid argument' + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Mike Rylander + +12 0 Open-ILS/src/extras/Makefile.install + +commit 0c1bef5d414c8ad8df8612d415e73d99cedb0dd4 +Author: Galen Charlton +Date: Tue Jan 14 13:30:48 2014 -0500 + + LP#1234201: fix menu item to display patron requests (if summary is horizontal) + + This patch adds a missing command element to the horizontal + patron summary display so that the 'Acquisition Requests' menu + item will work. + + To test: + + [1] Set the Patron circulation summary is horizontal library setting + to true. + [2] Retrieve a patron and try using the Acquisition Requests menu + item. It will do nothing. + [3] Apply the patch and clear cache in the staff client. + [4] Repeat step 2. This time, the Acquisitions Request menu item + should bring up the list of the patron's requests. + + Signed-off-by: Galen Charlton + Signed-off-by: Srey Seng + +1 0 Open-ILS/xul/staff_client/server/patron/display_horiz.xul + +commit f7c683bd37bf7e66cb341d2cac5e5269c62e0ab6 +Author: Galen Charlton +Date: Tue Jan 14 11:00:38 2014 -0500 + + LP#1269042: prevent acq seach from building dropdown of every copy ID in the DB + + This patch ensures that if a user sets a search field in the + acquisitions general search form to the line item details copy ID + (labeled "LID - Evergreen Copy ID"), the form presents a normal + input widget rather than trying to build a drop-down containing + every copy ID in the database. Except for very small databases, + the previous behavior would mean that an open-ils.pcrud backend + would eventually consume a great deal of memory trying to service + a request for all copies in the system. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +6 3 Open-ILS/web/js/ui/default/acq/search/unified.js + +commit 9b76589e0ba2ec59eaf52df073a0052dcb1ad8fd +Author: Jeff Godin +Date: Wed Oct 30 15:29:24 2013 -0400 + + Treat empty username as invalid in user editor + + There seems to be undesired interaction between the required + attribute and the isValid method on a dojo/dijit ValidationTextBox. + If both are set, isValid needs to check for an empty value, + otherwise the field is considered valid the moment it gains focus. + + We don't want an empty username to be considered valid, because we + know that we will be unable to save the user. + + We can work around this by teaching the isValid function to consider + an empty value as invalid. + + Signed-off-by: Jeff Godin + Signed-off-by: Melissa Ceraso + Signed-off-by: Ben Shum + +4 0 Open-ILS/web/js/ui/default/actor/user/register.js + +commit 33b8acf6d69b3d9555aa0acdd38118f292996d5d +Author: Galen Charlton +Date: Thu Jan 9 12:05:55 2014 -0500 + + LP#1267224: repair another fm_IDL.xml typo + + vam.eg_record points to authority.record_entry, not + biblio.record_entry. + + Signed-off-by: Galen Charlton + +1 1 Open-ILS/examples/fm_IDL.xml + +commit 342565fcc62d7528477d6a3512305c5876d5f2f3 +Author: Bill Erickson +Date: Wed Jan 8 14:35:05 2014 -0500 + + LP#1267224: Repair IDL typo for vandelay authority match / rec link + + "vqbr" should be "vqar" for authority records. + + Signed-off-by: Bill Erickson + Signed-off-by: Yamil Suarez + Signed-off-by: Galen Charlton + +1 1 Open-ILS/examples/fm_IDL.xml + +commit f958b378c8cf6d8989e01bdf8ff1dcf9e36f8e27 +Author: Kyle Tomita +Date: Tue Sep 24 09:55:02 2013 -0700 + + LP1038240 - Patron editor field documentation does not display text + + Changed the legend tag to have a closing tag. + Also modified the css id uedit-help-div, to add a top margin so + it does not overlap the save div. + + Signed-off-by: Kyle Tomita + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/templates/actor/user/register.tt2 +1 0 Open-ILS/web/css/skin/default/register.css + +commit 857b8f1a788ba28d4d07fe7dec61d736adce432e +Author: Srey Seng +Date: Tue Jan 7 14:30:49 2014 -0800 + + LP#1266937: Fix missing/incorrect regex for authority in Vandelay.pm + + Add in missing "~" in function import_record_list_impl when + type is authority records. Also replace "auth" with "authority" + so that the generated values match up with functions in the + database. + + Signed-off-by: Srey Seng + Signed-off-by: Bill Erickson + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm + +commit fc1ec17e41a2c5df64544f0fc518bb58935c9b98 +Author: Chris Sharp +Date: Wed Jan 8 14:51:59 2014 -0500 + + fix pub date data type in reporter.classic_item_list + + As noticed by Ben Shum in IRC, reporter.classic_item_list + had pub_date, a free text field, classified as "int". This + changes that to "text" to prevent errors. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +1 1 Open-ILS/examples/fm_IDL.xml + +commit 693e05226dedd282d5d2ae4a5dd91a3877c7d618 +Author: Jeff Davis +Date: Wed Jan 8 13:21:13 2014 -0800 + + Fix bug that caused deleted holdings to be visible in SRU/Z39.50 results + + Signed-off-by: Jeff Davis + Signed-off-by: Ben Shum + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm + +commit 02f578de015007d348413bc4f228e30648140cdb +Author: Ben Shum +Date: Wed Dec 18 13:36:39 2013 -0500 + + Stamping 0850 - translate icon labels + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +35 0 Open-ILS/src/sql/Pg/upgrade/0850.cvm_translated.sql +0 29 Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0850.cvm_translated.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql + +commit d43cc8efa84e6a0e6ca24c11156f894811177c4f +Author: Thomas Berezansky +Date: Tue Dec 10 13:54:40 2013 -0500 + + Translate the icon labels in TPAC + + Instead of just using English. + + Also, in the event we have a search_label, use it. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + +1 0 Open-ILS/src/sql/Pg/990.schema.unapi.sql +29 0 Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql +19 1 Open-ILS/src/templates/opac/parts/misc_util.tt2 + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql + +commit 26ec2c5d54ad3a106337542fd73130406d560441 +Author: Ben Shum +Date: Tue Dec 17 14:59:44 2013 -0500 + + Stamping 0849 - desk renewal description + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +10 0 Open-ILS/src/sql/Pg/upgrade/0849.schema.desk_renewal_desc_update.sql +0 10 Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0849.schema.desk_renewal_desc_update.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update + +commit adec54f4e7804a0003dcd5ab6356a4c50bfcdaca +Author: Steven Callender +Date: Thu Dec 12 15:13:57 2013 -0500 + + Updated the label on the desk renewal global setting. + + Updated the label on the desk renewal global flag circ.desk_renewal.use_original_circ_lib + to properly explain the it's the workstation library that will not be used rather than the + user home library. The OPAC renewal uses the users home library and desk renewals use + the workstation library. + + Signed-off-by: Steven Callender + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/950.data.seed-values.sql +10 0 Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update + create mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update + +commit 781f489efe44468db53bff2a8333cd0621667f54 +Author: Jason Stephenson +Date: Wed Dec 11 10:05:18 2013 -0500 + + Break out of focus() in cat/z3950.js if obj.active_services is undefined. + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +1 0 Open-ILS/xul/staff_client/server/cat/z3950.js + +commit 88cd3947a1b8394bd0307cbd2f6eedb8e98e3668 +Author: Jason Stephenson +Date: Wed Dec 11 09:50:09 2013 -0500 + + Eliminate an annoying and useless warning in the JavaScript Console. + + Timestamp: 12/10/2013 02:52:51 PM + Warning: Empty string passed to getElementById(). + Source File: oils://remote/xul/rel_3_0_20131206_120120/server/OpenILS/global_util.js + Line: 354 + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +55 53 Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js + +commit bdf6be3f19cdae07834b8cf191541202063b1805 +Author: Angela Kilsdonk +Date: Tue Dec 17 11:37:23 2013 -0500 + + Asciidoc fix + + Another asciidoc fix for 2.5 documentation: + -Disable patron credit. + + Signed-off-by: Angela Kilsdonk + +1 1 docs/circulation/circulation_patron_records.txt + +commit 2422dbf9df7db3eefc5ab1b1092ab5b151930376 +Author: Angela Kilsdonk +Date: Tue Dec 17 11:22:41 2013 -0500 + + Documentation for 2.5 + + asciidoc fixes for: + -Disable Patron Credit + -Lost and Long Overdue Colors + -PV Supa Goodstuff Integration + + Signed-off-by: Angela Kilsdonk + +5 5 docs/circulation/circulation_patron_records.txt +2 2 docs/circulation/rfid_product_integration.txt +- - docs/media/Billed Transaction Color.JPG +- - docs/media/Billed_Transaction_Color.JPG +- - docs/media/Default_Patron_Billing_Screen.jpg +- - docs/media/Disable_Patron_Credit_Library_Setting.jpg +- - docs/media/Disabled_Patron_Credit_Patron_Billing_Screen.jpg + delete mode 100644 docs/media/Billed Transaction Color.JPG + create mode 100644 docs/media/Billed_Transaction_Color.JPG + create mode 100644 docs/media/Default_Patron_Billing_Screen.jpg + create mode 100644 docs/media/Disable_Patron_Credit_Library_Setting.jpg + create mode 100644 docs/media/Disabled_Patron_Credit_Patron_Billing_Screen.jpg + +commit 523736fd452e67bbf69da31d320e01ff3764d3d7 +Author: Angela Kilsdonk +Date: Mon Dec 16 13:29:16 2013 -0500 + + Documentation for 2.5 + + Includes: + -Patron Self Registration + -PV Supa Goodstuff Integration + -Disable Patron Credit in Billing Interface + + Signed-off-by: Angela Kilsdonk + +108 1 docs/circulation/circulation_patron_records.txt +73 0 docs/circulation/rfid_product_integration.txt +- - docs/media/patron_self_registration2.JPG +2 0 docs/root.txt + create mode 100644 docs/circulation/rfid_product_integration.txt + create mode 100644 docs/media/patron_self_registration2.JPG + +commit c922bb20a3e3ea5f9aed6f95ec7c8ca0b70c474d +Author: Galen Charlton +Date: Mon Nov 25 10:05:21 2013 -0800 + + LP#1254816: prevent cases where a Google Book preview is not displayed + + Due to quirks in how different parts of the Google Books API + processes ISBN searches, it is possible for a Google Books Preview + badge to get displayed, but when the user tries to display the preview, + the embedded preview does not get displayed. + + This patch fixes the problem by grabbing the preview link from + the GB volumes search results, which in turn can be fed into the + Embedded Viewer initialization. + + An ISBN that can be used to reproduce the problem is 9781937994198. + Before the patch, the badge is displayed but not the preview; after + the patch, both badge and preview should be displayed. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +6 1 Open-ILS/src/templates/opac/parts/ac_google_books.tt2 + +commit ed310bf7a1a06c8e6b62052e7c1678e091774b87 +Author: Angela Kilsdonk +Date: Fri Dec 13 16:30:51 2013 -0500 + + Documentation for 2.5 + + asciidoc fix + + Signed-off-by: Angela Kilsdonk + +1 1 docs/cataloging/batch_importing_MARC.txt + +commit 0af1f924f748ae4ebb44b22c7b5b5089ff7138bb +Author: Angela Kilsdonk +Date: Tue Dec 10 14:52:18 2013 -0500 + + Documentation for Sorting Billing Columns + + Docs for sorting money columns in billing interface. In ersions 2.3-2.5. + + Signed-off-by: Angela Kilsdonk + +6 0 docs/circulation/circulation_patron_records.txt + +commit cad6d05d30b28a4cb7e3b18d994161be218b1d09 +Author: Angela Kilsdonk +Date: Tue Dec 10 14:30:28 2013 -0500 + + New documentation for 2.5 + + Documentation for: + -Z39.50 Search Enhancements + -Catalog Browse + -Alternative Hold Pick-up Location + -Marking Items Long Overdue + -Lost and Long Overdue Bill Colors + -Vandelay Item Load + + Signed-off-by: Angela Kilsdonk + +22 0 docs/cataloging/batch_importing_MARC.txt +102 0 docs/cataloging/z39.50_search_enhancements.txt +67 0 docs/circulation/circulating_items.txt +15 0 docs/circulation/circulation_patron_records.txt +39 0 docs/circulation/holds.txt +- - docs/media/Billed Transaction Color.JPG +- - docs/media/Locate_Z39.50_Matches1.jpg +- - docs/media/Locate_Z39.50_Matches2.jpg +- - docs/media/Locate_Z39.50_Matches3.jpg +- - docs/media/Locate_Z39.50_Matches4.jpg +- - docs/media/custom_hold_pickup_location1.JPG +- - docs/media/custom_hold_pickup_location2.JPG +- - docs/media/long_overdue1.JPG +- - docs/media/long_overdue2.JPG +31 0 docs/opac/catalog_browse.txt +4 0 docs/root.txt + create mode 100644 docs/cataloging/z39.50_search_enhancements.txt + create mode 100644 docs/media/Billed Transaction Color.JPG + create mode 100644 docs/media/Locate_Z39.50_Matches1.jpg + create mode 100644 docs/media/Locate_Z39.50_Matches2.jpg + create mode 100644 docs/media/Locate_Z39.50_Matches3.jpg + create mode 100644 docs/media/Locate_Z39.50_Matches4.jpg + create mode 100644 docs/media/custom_hold_pickup_location1.JPG + create mode 100644 docs/media/custom_hold_pickup_location2.JPG + create mode 100644 docs/media/long_overdue1.JPG + create mode 100644 docs/media/long_overdue2.JPG + create mode 100644 docs/opac/catalog_browse.txt + +commit 37eff510e374360640bec86ee3be00eda28ffb0b +Author: Steven Chan +Date: Wed May 15 14:30:15 2013 -0700 + + Fix LP1180140, View Holds not working for a serial with subscription and no issuances + + A request is made to + open-ils.circ.holds.retrieve_all_from_title, + which is the function Circ/Holds.pm/all_rec_holds(). + + In the function, when checking for issuance holds, there is a missing @ + to dereference the list of issuance IDs, so that the ahr table is search + with badly formed input, which results in returning an undefined list + instead of an empty list. The error will occur for any record with a + serial.subscription entry but with no related entries in + serial.issuance. + + We also recode the initialization of the response object in order to + clarify its expected structure, a hash of array references. + + Signed-off-by: Steven Chan + Signed-off-by: Lebbeous Fogle-Weekley + +11 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit e55e01049cf27cf422ec4937b3b5dfb8a38983cc +Author: Thomas Berezansky +Date: Mon Dec 9 11:15:29 2013 -0500 + + Always show Email Address label to staff + + When placing holds staff commonly change out patrons, and pointing staff + towards the "My Account" area makes no sense to begin with. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/parts/place_hold.tt2 + +commit 8c5d7e5c1d2cd7504562a128dc187a4d932ab3db +Author: Elliot Voris +Date: Sat Dec 7 15:24:46 2013 -0600 + + Documentation typo in Authorities chapter subheading + Addresses this bugs reported in launchpad: + https://bugs.launchpad.net/evergreen/+bug/1248726 + + I also browsed through the rest of the docs/admin + directory, and made some (very non-consequential) + changes. + + Signed-off-by: Elliot Voris + Signed-off-by: Robert Soulliere + +10 9 docs/admin/authorities.txt +1 1 docs/admin/permissions.txt +1 1 docs/admin/staff_client-patron_border.txt +6 6 docs/admin/template_toolkit.txt + +commit 91cebdc9bdfc2b6fd234b86aa99b57fa3197717c +Author: Mike Rylander +Date: Thu Dec 5 11:00:19 2013 -0500 + + Pushing upgrade scripts forward + + Signed-off-by: Mike Rylander + +174 4 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql + +commit 1ac2363446c86b4a21edfa4fab53a9e562d0bfb4 +Author: Bill Erickson +Date: Thu Dec 5 10:08:34 2013 -0500 + + Forward port 2.3.11->2.3.12 DB upgrade + + Signed-off-by: Bill Erickson + +171 0 Open-ILS/src/sql/Pg/version-upgrade/2.3.11-2.3.12-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.11-2.3.12-upgrade-db.sql + +commit bc4933921c5fcc649fc0017c78131416212b693e +Author: Dan Wells +Date: Thu Dec 5 09:49:05 2013 -0500 + + Pull in 2.5 version upgrade files + + For 2.5.0 and 2.5.1 + + Signed-off-by: Dan Wells + +16017 0 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.5.0-upgrade-db.sql +173 0 Open-ILS/src/sql/Pg/version-upgrade/2.5.0-2.5.1-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.5.0-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.5.0-2.5.1-upgrade-db.sql + +commit 8eabec0cc1cde55c4bed8ec6db15ebf295f9a03f +Author: Remington Steed +Date: Wed Dec 4 09:35:30 2013 -0500 + + Fix a broken link in the holds docs + + Signed-off-by: Remington Steed + +1 1 docs/circulation/holds.txt + +commit 31e3570c1e3e7f3be73cc9278f39d9fa59acd2de +Author: Remington Steed +Date: Thu Nov 21 10:29:22 2013 -0500 + + Docs: integrate holds docs from EG 2.1 + + The small amount of Holds docs present in master seemed to fit well at + the end of the older Holds documentation, so this commit appends them + to the new holds.txt file, deletes the previous holds_management.txt file, + and makes the appropriate change to root.txt. + + This commit also includes several small formatting improvements, wording + changes, and bug fixes. + + Signed-off-by: Remington Steed + +410 0 docs/circulation/holds.txt +0 28 docs/circulation/holds_management.txt +1 1 docs/root.txt + create mode 100644 docs/circulation/holds.txt + delete mode 100644 docs/circulation/holds_management.txt diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index d750216454..f1870f9d0a 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-5-2"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index e66e8e4584..6244164d6c 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 ('0852', :eg_version); -- miker/senator +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.5.2', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.5.1-2.5.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.5.1-2.5.2-upgrade-db.sql new file mode 100644 index 0000000000..f34a211bd2 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.5.1-2.5.2-upgrade-db.sql @@ -0,0 +1,234 @@ +--Upgrade Script for 2.5.1 to 2.5.2 +\set eg_version '''2.5.2''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.5.2', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('0849', :eg_version); + +UPDATE config.global_flag + SET label = 'Circ: Use original circulation library on desk renewal instead of the workstation library' + WHERE name = 'circ.desk_renewal.use_original_circ_lib'; + + + +SELECT evergreen.upgrade_deps_block_check('0850', :eg_version); + +CREATE OR REPLACE FUNCTION unapi.mra ( 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 attributes, + XMLATTRIBUTES( + CASE WHEN $9 THEN 'http://open-ils.org/spec/indexing/v1' ELSE NULL END AS xmlns, + 'tag:open-ils.org:U2@mra/' || mra.id AS id, + 'tag:open-ils.org:U2@bre/' || mra.id AS record + ), + (SELECT XMLAGG(foo.y) + FROM (SELECT XMLELEMENT( + name field, + XMLATTRIBUTES( + key AS name, + cvm.value AS "coded-value", + cvm.id AS "cvmid", + rad.filter, + rad.sorter + ), + x.value + ) + FROM EACH(mra.attrs) AS x + JOIN config.record_attr_definition rad ON (x.key = rad.name) + LEFT JOIN config.coded_value_map cvm ON (cvm.ctype = x.key AND code = x.value) + )foo(y) + ) + ) + FROM metabib.record_attr mra + WHERE mra.id = $1; +$F$ LANGUAGE SQL STABLE; + + +SELECT evergreen.upgrade_deps_block_check('0852', :eg_version); + +CREATE OR REPLACE FUNCTION action.hold_copy_calculated_proximity( + ahr_id INT, + acp_id BIGINT, + copy_context_ou INT DEFAULT NULL + -- TODO maybe? hold_context_ou INT DEFAULT NULL. This would optionally + -- support an "ahprox" measurement: adjust prox between copy circ lib and + -- hold request lib, but I'm unsure whether to use this theoretical + -- argument only in the baseline calculation or later in the other + -- queries in this function. +) RETURNS NUMERIC AS $f$ +DECLARE + aoupa actor.org_unit_proximity_adjustment%ROWTYPE; + ahr action.hold_request%ROWTYPE; + acp asset.copy%ROWTYPE; + acn asset.call_number%ROWTYPE; + acl asset.copy_location%ROWTYPE; + baseline_prox NUMERIC; + + icl_list INT[]; + iol_list INT[]; + isl_list INT[]; + hpl_list INT[]; + hrl_list INT[]; + +BEGIN + + SELECT * INTO ahr FROM action.hold_request WHERE id = ahr_id; + SELECT * INTO acp FROM asset.copy WHERE id = acp_id; + SELECT * INTO acn FROM asset.call_number WHERE id = acp.call_number; + SELECT * INTO acl FROM asset.copy_location WHERE id = acp.location; + + IF copy_context_ou IS NULL THEN + copy_context_ou := acp.circ_lib; + END IF; + + -- First, gather the baseline proximity of "here" to pickup lib + SELECT prox INTO baseline_prox FROM actor.org_unit_proximity WHERE from_org = copy_context_ou AND to_org = ahr.pickup_lib; + + -- Find any absolute adjustments, and set the baseline prox to that + SELECT adj.* INTO aoupa + FROM actor.org_unit_proximity_adjustment adj + LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acl_ol.id = adj.copy_location) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib) + WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND + (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND + (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND + (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND + (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND + (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND + absolute_adjustment AND + COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL + ORDER BY + COALESCE(acp_cl.distance,999) + + COALESCE(acn_ol.distance,999) + + COALESCE(acl_ol.distance,999) + + COALESCE(ahr_pl.distance,999) + + COALESCE(ahr_rl.distance,999), + adj.pos + LIMIT 1; + + IF FOUND THEN + baseline_prox := aoupa.prox_adjustment; + END IF; + + -- Now find any relative adjustments, and change the baseline prox based on them + FOR aoupa IN + SELECT adj.* + FROM actor.org_unit_proximity_adjustment adj + LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acn_ol.id = adj.copy_location) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib) + WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND + (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND + (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND + (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND + (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND + (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND + NOT absolute_adjustment AND + COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL + LOOP + baseline_prox := baseline_prox + aoupa.prox_adjustment; + END LOOP; + + RETURN baseline_prox; +END; +$f$ LANGUAGE PLPGSQL; + + +CREATE OR REPLACE FUNCTION action.hold_copy_calculated_proximity( + ahr_id INT, + acp_id BIGINT, + copy_context_ou INT DEFAULT NULL + -- TODO maybe? hold_context_ou INT DEFAULT NULL. This would optionally + -- support an "ahprox" measurement: adjust prox between copy circ lib and + -- hold request lib, but I'm unsure whether to use this theoretical + -- argument only in the baseline calculation or later in the other + -- queries in this function. +) RETURNS NUMERIC AS $f$ +DECLARE + aoupa actor.org_unit_proximity_adjustment%ROWTYPE; + ahr action.hold_request%ROWTYPE; + acp asset.copy%ROWTYPE; + acn asset.call_number%ROWTYPE; + acl asset.copy_location%ROWTYPE; + baseline_prox NUMERIC; + + icl_list INT[]; + iol_list INT[]; + isl_list INT[]; + hpl_list INT[]; + hrl_list INT[]; + +BEGIN + + SELECT * INTO ahr FROM action.hold_request WHERE id = ahr_id; + SELECT * INTO acp FROM asset.copy WHERE id = acp_id; + SELECT * INTO acn FROM asset.call_number WHERE id = acp.call_number; + SELECT * INTO acl FROM asset.copy_location WHERE id = acp.location; + + IF copy_context_ou IS NULL THEN + copy_context_ou := acp.circ_lib; + END IF; + + -- First, gather the baseline proximity of "here" to pickup lib + SELECT prox INTO baseline_prox FROM actor.org_unit_proximity WHERE from_org = copy_context_ou AND to_org = ahr.pickup_lib; + + -- Find any absolute adjustments, and set the baseline prox to that + SELECT adj.* INTO aoupa + FROM actor.org_unit_proximity_adjustment adj + LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acl_ol.id = adj.copy_location) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib) + WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND + (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND + (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND + (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND + (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND + (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND + absolute_adjustment AND + COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL + ORDER BY + COALESCE(acp_cl.distance,999) + + COALESCE(acn_ol.distance,999) + + COALESCE(acl_ol.distance,999) + + COALESCE(ahr_pl.distance,999) + + COALESCE(ahr_rl.distance,999), + adj.pos + LIMIT 1; + + IF FOUND THEN + baseline_prox := aoupa.prox_adjustment; + END IF; + + -- Now find any relative adjustments, and change the baseline prox based on them + FOR aoupa IN + SELECT adj.* + FROM actor.org_unit_proximity_adjustment adj + LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib) + LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acn_ol.id = adj.copy_location) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib) + LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib) + WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND + (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND + (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND + (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND + (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND + (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND + NOT absolute_adjustment AND + COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL + LOOP + baseline_prox := baseline_prox + aoupa.prox_adjustment; + END LOOP; + + RETURN baseline_prox; +END; +$f$ LANGUAGE PLPGSQL; + +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 2737f47bf1..45ed17dbed 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/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_5_2

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..dbddd268b1 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_5_2"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index a9543579a8..5ba81dff08 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.5" !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..d4e0230791 --- /dev/null +++ b/README @@ -0,0 +1,551 @@ +Installing the Evergreen server +=============================== +:toc: +:numbered: + +Preamble: referenced user accounts +---------------------------------- + +In subsequent sections, we will refer to a number of different accounts, as +follows: + + * Linux user accounts: + ** The *user* Linux account is the account that you use to log onto the + Linux system as a regular user. + ** The *root* Linux account is an account that has system administrator + privileges. On Debian and Fedora you can switch to this account from + your *user* account by issuing the `su -` command and entering the + password for the *root* account when prompted. On Ubuntu you can switch + to this account from your *user* account using the `sudo su -` command + and entering the password for your *user* account when prompted. + ** The *opensrf* Linux account is an account that you create when installing + OpenSRF. You can switch to this account from the *root* account by + issuing the `su - opensrf` command. + ** The *postgres* Linux account is created automatically when you install + the PostgreSQL database server. You can switch to this account from the + *root* account by issuing the `su - postgres` command. + * PostgreSQL user accounts: + ** The *evergreen* PostgreSQL account is a superuser account that you will + create to connect to the PostgreSQL database server. + * Evergreen administrator account: + ** The *egadmin* Evergreen account is an administrator account for + Evergreen that you will use to test connectivity and configure your + Evergreen instance. + +Preamble: developer instructions +-------------------------------- + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +After running `make install`, developers also need to install the Dojo Toolkit +set of JavaScript libraries. The appropriate version of Dojo is included +in Evergreen release tarballs. Developers should install the Dojo 1.3.3 +version of Dojo by issuing the following commands as the *opensrf* Linux +account: + +[source, bash] +------------------------------------------------------------------------------ +wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz +tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz +cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/. +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + +Evergreen has a number of prerequisite packages that must be installed +before you can successfully configure, compile, and install Evergreen. + +1. Begin by installing the most recent version of OpenSRF (2.2.1 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 from external + repositories. ++ + * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the + *root* Linux account and add the following line: ++ +[source, bash] +------------------------------------------------------------------------------ +deb http://backports.debian.org/debian-backports squeeze-backports main contrib +------------------------------------------------------------------------------ ++ + * On Ubuntu Lucid, you can use a PPA (personal package archive), which are + package sources hosted on Launchpad. The one most commonly used by Evergreen + Community members is maintained by Martin Pitt, who also maintains the + official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue + the following commands to add the PPA source: ++ +[source, bash] +------------------------------------------------------------------------------ +apt-get install python-software-properties +add-apt-repository ppa:pitti/postgresql +------------------------------------------------------------------------------ ++ + * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. ++ + * Fedora comes with PostgreSQL 9, so no additional steps are required. ++ +3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to + retrieve the new packages from the backports repository. +4. Issue the following commands as the *root* Linux account to install + prerequisites using the `Makefile.install` prerequisite installer, + substituting `debian-squeeze`, `fedora`, `ubuntu-lucid`, or + `ubuntu-precise` for 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. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ ++ +.Fedora +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ + +Configuration and compilation instructions +------------------------------------------ + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +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_5_2 install +------------------------------------------------------------------------------ ++ +2. The server portion of the staff client expects `http://hostname/xul/server` + to resolve. Issue the following commands as the *root* Linux account to + create a symbolic link pointing to the `server` subdirectory of the server + portion of the staff client that we just built using the staff client ID + 'rel_name': ++ +[source, bash] +------------------------------------------------------------------------------ +cd /openils/var/web/xul +ln -sf rel_name/server server +------------------------------------------------------------------------------ + +Change ownership of the Evergreen files +--------------------------------------- + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +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 +[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 +------------------------------------------------------------------------------ ++ +.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. 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 + +------------------------------------------------------------------------------ ++ +6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf` + file to change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ + +Configure OpenSRF for the Evergreen application +----------------------------------------------- +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config`, described in the following section, sets the database +connection information in `opensrf.xml` for you. + +Creating the Evergreen database +------------------------------- + +By default, the `Makefile.install` prerequisite installer does not install +the PostgreSQL 9 database server required by every Evergreen system; +for production use, most libraries install the PostgreSQL database server on a +dedicated machine. You can install the packages required by Debian or Ubuntu Lucid +on the machine of your choice using the following commands as the *root* +Linux account: + +.(Debian / 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-lucid +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise +make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora +------------------------------------------------------------------------------ + +.(Fedora) Postgres initialization + +Installing Postgres on Fedora requires one additional step. + +[source, bash] +------------------------------------------------------------------------------ +postgresql-setup initdb +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules as the +*root* Linux account: + +.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +aptitude install gcc libxml-libxml-perl libxml-libxslt-perl +cpan Business::ISBN +cpan JSON::XS +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +cpan Rose::URI +------------------------------------------------------------------------------ + +.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN +yum install perl-Library-CallNumber-LC perl-MARC-Record perl-MARC-Charset +yum install perl-MARC-File-XML perl-UUID-Tiny +------------------------------------------------------------------------------ + +You need to create a PostgreSQL superuser to create and access the database. +Issue the following command as the *postgres* Linux account to create a new +PostgreSQL superuser named `evergreen`. When prompted, enter the new user's +password: + +[source, bash] +------------------------------------------------------------------------------ +createuser -s -P evergreen +------------------------------------------------------------------------------ + +Once you have created the *evergreen* PostgreSQL account, you also need to +create the database and schema, and configure your configuration files to point +at the database server. Issue the following command as the *root* Linux account +from inside the Evergreen source directory, replacing , , +, , 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.pl` 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_ctl.sh -l -a start_all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_ctl.sh: command not found`, + then your environment variable `PATH` does not include the `/openils/bin` + directory; this should have been set in the *opensrf* Linux account's + `.bashrc` configuration file. To manually set the `PATH` variable, edit the + configuration file `~/.bashrc` as the *opensrf* Linux account and add the + following line: ++ +[source, bash] +------------------------------------------------------------------------------ +export PATH=$PATH:/openils/bin +------------------------------------------------------------------------------ ++ +3. As the *opensrf* Linux account, generate the Web files needed by the staff + client and catalogue and update the organization unit proximity (you need to do + this the first time you start Evergreen, and after that each time you change + the library hierarchy in `config.cgi`): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh -u +------------------------------------------------------------------------------ ++ +4. As the *root* Linux account, restart the Apache Web server: ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/apache2 restart +------------------------------------------------------------------------------ ++ +If the Apache Web server was running when you started the OpenSRF services, you +might not be able to successfully log in to the OPAC or staff client until the +Apache Web server is restarted. + +Testing connections to Evergreen +-------------------------------- + +Once you have installed and started Evergreen, test your connection to +Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following +commands to start `srfsh` and try to log onto the Evergreen server using the +*egadmin* Evergreen administrator user name and password that you set using the +`eg_db_config` 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 + ------------------------------------ + +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 99370e4f2e..ff8dab634e 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.5.2, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.5.2]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar]) -- 2.11.0