From: Ben Shum Date: Wed, 17 Dec 2014 17:18:49 +0000 (-0500) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8cbb6857bb57aa3f6f02812bd1fc78cebc16c7cf;p=evergreen%2Fpines.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Ben Shum --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..bcdcb0c0ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,685 @@ -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 673c87ef2dc273b5a55fe2edb63ad26ad4ce545d +Author: Ben Shum +Date: Wed Dec 17 12:00:29 2014 -0500 + + Bump OpenILS.pm version to 2.7.2 + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 66e56a7cb7c005382cdc512b7fa3b3fe0ee57b95 +Author: Dan Scott +Date: Mon Dec 15 23:23:49 2014 -0500 + + LP#1402905 Use stricter matching for UPC values + + Per http://www.loc.gov/marc/bibliographic/bd024.html we + should be checking to see if either the ind1 is "1" or + if there's a subfield 2 with a value of "upc" before + assuming that any "Other standard identifier" 024 field + is a UPC value. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +8 1 Open-ILS/src/templates/opac/parts/misc_util.tt2 + +commit f33b4737878ab0fdf77c23b4d090808406c8ff08 +Author: Mike Rylander +Date: Fri May 18 08:30:08 2012 -0400 + + LP#921142: Bring back automatic padding of short fixed fields in the GUI MARC editor + + Bring back automatic padding of short fixed fields in the GUI MARC + editor. Also, use onblur instead of oninput, so that we've already lost + focus and don't care if that happens again. + + Signed-off-by: Mike Rylander + Signed-off-by: Remington Steed + Signed-off-by: Ben Shum + +12 0 Open-ILS/web/js/dojo/MARC/FixedFields.js +0 5 Open-ILS/xul/staff_client/server/cat/marcedit.js +65 65 Open-ILS/xul/staff_client/server/cat/marcedit.xul + +commit 402b5d0da5495aff8d6f267a60dc3707a21050f8 +Author: Ben Shum +Date: Tue Dec 16 15:15:57 2014 -0500 + + LP#1394356: Stamping upgrade script for patron purge post code fix + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +0 332 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron_purge_post_code.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron_purge_post_code.sql + +commit 94218868866bea115b4a93503daabf4c81c2432c +Author: Bill Erickson +Date: Fri Nov 28 16:29:57 2014 -0500 + + LP#1394356 Patron purge circs retain post code + + When purging a patron, clear the address data after circulation + anonymization to ensure the usr_post_code is retained. + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +9 7 Open-ILS/src/sql/Pg/999.functions.global.sql +332 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron_purge_post_code.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron_purge_post_code.sql + +commit fce2916d590f766b5bc6df60f0d12375712d0a61 +Author: Ben Shum +Date: Tue Dec 16 15:01:53 2014 -0500 + + LP#1400376: Stamping upgrade script for fix to metabib.record_attr + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +12 0 Open-ILS/src/sql/Pg/upgrade/0900.schema.no-null-record_attrs.sql +0 10 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-null-record_attrs.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0900.schema.no-null-record_attrs.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-null-record_attrs.sql + +commit 080f90f9b2d710d869b731a0276ee7c34a83a5fe +Author: Mike Rylander +Date: Mon Dec 15 20:32:51 2014 -0500 + + LP#1400376: Don't allow NULL attrs to polute an HSTORE as a key + + That causes the HSTORE to blow up, which is bad for circs that + want to succeed. + + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +4 1 Open-ILS/src/sql/Pg/030.schema.metabib.sql +10 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-null-record_attrs.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-null-record_attrs.sql + +commit da51ee3b8fd0fbff6a3a7b2eff0d212332eead0c +Author: Ben Shum +Date: Tue Dec 16 14:54:28 2014 -0500 + + LP#1389403: Stamping upgrade script for normalizer detection to call number browse + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +9 0 Open-ILS/src/sql/Pg/upgrade/0899.function.cn_normalizers_immutable.sql +0 9 Open-ILS/src/sql/Pg/upgrade/XXXX.function.cn_normalizers_immutable.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0899.function.cn_normalizers_immutable.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.cn_normalizers_immutable.sql + +commit 181b400843f7a56c0fea6e0e57739282a7b93bc6 +Author: Dan Wells +Date: Fri Oct 4 10:02:39 2013 -0400 + + LP#1389403 Add normalizer detection to call number browse + + When finding the pivot for call number browse, we currently rely on + simple label matching (rather than normalized label matching), since + we do not know at the time of the search which normalizer we should + use. + + Rather than blindly using the label, let's select the pivot in two + phases. First, we will do what we do know, getting as close as + possible by label alone. If we find an exact match, we are done (same + as the current code). If we don't find an exact match, we take the + normalizer setting from the closest label match, normalize our input, + then search again. + + This method *greatly* improves the overall accuracy of call number + searching whenever the call number being browsed for does not exist, + while causing no harm to accuracy when it does exist (since it will + either match the label or normalize to the same call number anyway). + + Eventually, we may want to add interface elements for selecting the + call number type, probably defaulting to the default call number type + for the org unit being searched, but even with that in place, this + "auto-detection" logic should still be valuable. + + Signed-off-by: Dan Wells + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +27 4 Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm +3 3 Open-ILS/src/sql/Pg/040.schema.asset.sql +9 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.cn_normalizers_immutable.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.cn_normalizers_immutable.sql + +commit 5d39669aa4d79e2228b1d9de698cb6cda69ed39d +Author: Dan Scott +Date: Wed Dec 10 17:05:38 2014 -0500 + + LP#1401286: Cleaner display of URIs in search results + + Right now a record with an 856 like: + + 856 40 $zAvailable online $uhttp://publications.gc.ca $9LUSYS + + shows up in search results with an HTML display like: + + http://publications.gc.ca - Available online + + rather than the much cleaner: + + Available online + + My simplistic approach is to check to see if the link text == the href, + and if so, and we have a note to display, to use the note as the text of + the link instead. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +5 0 Open-ILS/src/templates/opac/parts/misc_util.tt2 + +commit 19833e4462769c98d2ce37a10975f0bc634f02c0 +Author: Dan Scott +Date: Sun Dec 7 08:51:33 2014 -0500 + + LP#1400082 - avoid uninitialized var warning at TPAC login + + Give username a default value of '', which makes the regex happy (avoiding an + uninit warning in Apache logs if no value was entered) and still counts as de + nada for the purposes of the actual login dance. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm + +commit d24a74851de436340ab89e64ab25f6271f374f99 +Author: Jason Stephenson +Date: Sat Nov 29 10:34:53 2014 -0500 + + LP#1401271: Add missing dependency for Date::Manip perl module + + This commit adds lines to distro-specific Makefiles to install + Perl Date::Manip packages so that Date::Manip::Date is + avaliable for marc_export. Somehow, this got missed or removed. + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +1 0 Open-ILS/src/extras/install/Makefile.debian-jessie +1 0 Open-ILS/src/extras/install/Makefile.debian-squeeze +1 0 Open-ILS/src/extras/install/Makefile.debian-wheezy +1 0 Open-ILS/src/extras/install/Makefile.fedora +1 0 Open-ILS/src/extras/install/Makefile.ubuntu-precise +1 0 Open-ILS/src/extras/install/Makefile.ubuntu-trusty + +commit d75c738ca6722bd395362f0f2bfab807e3d8442e +Author: Dan Scott +Date: Sun Dec 7 10:17:42 2014 -0500 + + LP#1400100 - Avoid extra when OpenURL is enabled + + When the OpenURL resolver is enabled, the record summary.tt2 page always + inserts a , whether or not there actually are any OpenURL results to + point at (which is the condition that triggers the opening
). + + This has the effect of resulting in the generated RDFa not including anything + below the OpenURL section, effectvely preventing the schema.org/Offer types + from being associated with the record. Which is not good for the semantic web + of library data. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/parts/record/summary.tt2 + +commit cbd5f865322db3fdd2043d9189fbf3e79d0b3dae +Author: Ben Shum +Date: Fri Dec 5 16:02:04 2014 -0500 + + Update 2.6-2.7.0-upgrade-db.sql to reflect that it actually starts from 2.6.3 and up. + + So, actually, the 2.7 upgrade path needs to include everything up to 2.6.3 to get all + the fixes. + + Signed-off-by: Ben Shum + +0 765 Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql +765 0 Open-ILS/src/sql/Pg/version-upgrade/2.6.3-2.7.0-upgrade-db.sql + delete mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.6.3-2.7.0-upgrade-db.sql + +commit 90ac89223330438a7fa55fcb97352d5dfa7131cb +Author: Ben Shum +Date: Fri Dec 5 15:59:40 2014 -0500 + + Re-order parts of 0887 upgrade script + + Based on feedback from dbs, in PostgreSQL 9.1, the order to which we + fix up these functions matters. So drop if exists first, then create + new. + + Signed-off-by: Ben Shum + +6 4 Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql +6 5 Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql + +commit f9d015ee21d05756be428a0d1c3265b59c730bcb +Author: Dan Wells +Date: Wed Nov 5 14:22:26 2014 -0500 + + Forward-port 2.6.3 upgrade script + + Signed-off-by: Dan Wells + Signed-off-by: Ben Shum + +491 0 Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql + +commit 51077f2e20f3b9a374f13cdf3019f109fcd420ca +Author: Jason Stephenson +Date: Wed Dec 10 16:03:11 2014 -0500 + + LP#1401177: Stamping upgrade script of unique_mr_attrs.sql. + + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +101 0 Open-ILS/src/sql/Pg/upgrade/0898.unique_mr_attrs.sql +0 101 Open-ILS/src/sql/Pg/upgrade/XXXX.unique_mr_attrs.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0898.unique_mr_attrs.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.unique_mr_attrs.sql + +commit 4caa655cce982018d37982e2a8d2340ff7749bde +Author: Mike Rylander +Date: Wed Dec 10 13:51:51 2014 -0500 + + LP#1401177: uniquify attrs across a metarecord + + Signed-off-by: Mike Rylander + Signed-off-by: Jason Stephenson + +29 23 Open-ILS/src/sql/Pg/990.schema.unapi.sql +101 0 Open-ILS/src/sql/Pg/upgrade/XXXX.unique_mr_attrs.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.unique_mr_attrs.sql + +commit 8ac9362720d14c8f7c8998ab8e4e156aca8d4709 +Author: Kathy Lussier +Date: Fri Dec 5 09:03:20 2014 -0500 + + Minor fix to web client section headers in root.txt + + I accidentally added the circulation header twice when adding the new + sections for web client docs. This commit removes one of the headers. + + Signed-off-by: Kathy Lussier + +1 3 docs/root.txt + +commit 2ad43738d694d947f1f29340e2d00db6f16d8d39 +Author: Kathy Lussier +Date: Thu Dec 4 16:36:08 2014 -0500 + + Web client section headings + + Adding section headings for web client documentation, which will be coming + shortly. + + Signed-off-by: Kathy Lussier + +21 0 docs/root.txt + +commit 9dffbd34bdb62f7c1032367ca61d0b1b56cd9286 +Author: Lynn Floyd +Date: Wed Nov 26 16:37:29 2014 -0500 + + Docs: Update to template receipt docs + + Thanks to Lynn Floyd. When adding the new content I ended up splitting new and old content into three files. + + Signed-off-by: Yamil Suarez + +0 220 docs/admin/workstation_admin.txt +60 0 docs/admin/workstation_admin_customizable_toolbar.txt +633 0 docs/admin/workstation_admin_receipt_template_editor.txt +10 0 docs/root.txt + create mode 100644 docs/admin/workstation_admin_customizable_toolbar.txt + create mode 100644 docs/admin/workstation_admin_receipt_template_editor.txt + +commit 959be2602438832f6ba9cfd9ca8042c170744c39 +Author: alzr +Date: Mon Aug 5 16:50:09 2013 -0500 + + LP#1207529: Add /openils assumption note + + Signed-off-by: alzr + Signed-off-by: Galen Charlton + +2 0 docs/installation/server_upgrade.txt + +commit 80300c54b26b3b49bb8b3143260465500cf799a2 +Author: alzr +Date: Mon Aug 5 14:33:07 2013 -0500 + + LP#1207529: Make sure $PATH includes /openils/bin when configuring + + https://bugs.launchpad.net/evergreen/+bug/1207529 + + Signed-off-by: alzr + Signed-off-by: Galen Charlton + + Conflicts: + docs/installation/server_upgrade.txt + +1 1 docs/installation/server_upgrade.txt + +commit a933ce6baeb64560d087b25d16d5764ea24bc616 +Author: Josh Stompro +Date: Wed Oct 29 16:12:08 2014 -0500 + + LP#1384932: document the zips.txt ZIP code database feature + + Patron Address City/State/County Pre-Populate by ZIP Code. + + Documented the zips.txt feature that auto fills patron address + (City, State, County) information. + + Signed-off-by: Josh Stompro + Signed-off-by: Galen Charlton + +169 0 docs/admin/patron_address_by_zip_code.txt +2 0 docs/root.txt + create mode 100644 docs/admin/patron_address_by_zip_code.txt + +commit d52c7a0c85964329b4b9f8104d67ce7165e4a844 +Author: Jason Stephenson +Date: Wed Oct 30 11:05:45 2013 -0400 + + LP#1246371: Allow BibCommon::title_is_empty to accept a bre id or bre object. + + I was trying to delete copies with the record fleshed in the call number + object and got the following error: + + Can't use an undefined value as an ARRAY reference at + /usr/local/share/perl/5.14.2/OpenILS/Application/Cat/BibCommon.pm line 399 + + Having title_is_empty check for a bre object and use its id solved this + problem for me. + + Signed-off-by: Jason Stephenson + Signed-off-by: Galen Charlton + +4 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/BibCommon.pm + +commit 58b0239f3a7851a7cbaf1b29386bd2895eba081b +Author: Galen Charlton +Date: Thu Nov 13 10:45:14 2014 -0800 + + LP#1083639: use "cp -r" instead of "cp -R" + + This change is purely for the sake of consistency; there's + no functional difference. + + Signed-off-by: Galen Charlton + +1 1 docs/TechRef/KidsOPAC.txt + +commit abaeb3b72d4ca5788eea3159efddd236cd5661d0 +Author: Josh Stompro +Date: Thu Oct 23 14:30:05 2014 -0500 + + LP#1083639 - Added command to copy fonts into the KPAC2 / Alternate monster skin dir + + Signed-off-by: Josh Stompro + Signed-off-by: Galen Charlton + +1 0 docs/TechRef/KidsOPAC.txt + +commit 3bfb2206640585c1557f1b511e92b28d018fed4f +Author: Josh Stompro +Date: Thu Oct 23 13:21:16 2014 -0500 + + LP#1116387 - adding kpac setup notes. + + Revised instructions based on my testing. Swapped around the Monster + and Default skin discriptions since the listed Alternate Skin is the default skin. + + Signed-off-by: Josh Stompro + Signed-off-by: Galen Charlton + +15 9 docs/TechRef/KidsOPAC.txt +10 13 docs/opac/kids_opac.txt + +commit 04e032d474f2fbd2e6294e4fc9ba4f29952acf8c +Author: Kathy Lussier +Date: Tue Feb 5 10:24:17 2013 -0500 + + Add KPAC configuration info to the community docs + + Adds the KPAC TechRef docs to root.txt so that this information can be + available via the community docs. Also adds a section to the docs on + configuring the alternate skin and removes a reference to configuration + from the end-user KPAC docs. + + Signed-off-by: Kathy Lussier + Signed-off-by: Galen Charlton + +36 2 docs/TechRef/KidsOPAC.txt +0 1 docs/opac/kids_opac.txt +8 1 docs/root.txt + +commit cfaebc9f93eac7e1ebd0cefe9ad71e209a614a26 +Author: Fredric T Parks +Date: Wed Nov 6 15:36:32 2013 -0800 + + LP#1246839: marc_stream_importer.pl no longer crashes with vs 0.23 of File::Temp + + updated marc_stream_importer.pl to use the 0.23 API + + Signed-off-by: Fredric T Parks + Signed-off-by: Bill Erickson + Signed-off-by: Galen Charlton + +2 2 Open-ILS/src/support-scripts/marc_stream_importer.pl + +commit 6d68a5bccf4a27ce74e626705f7b3c6067e3998b +Author: Josh Stompro +Date: Mon Nov 10 09:29:38 2014 -0600 + + LP#1133158 - Fix typos in action_trigger_runner.pl + + Added equals sign to --hooks and added --process-hooks to command so + --hooks=x is actually used. + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/support-scripts/action_trigger_runner.pl.in + +commit bbed3b24e73f27458dddecea077569115bec823a +Author: Ben Shum +Date: Mon Nov 10 21:00:42 2014 -0500 + + LP#1391290: Stamping upgrade script for authority reingest setting + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +88 0 Open-ILS/src/sql/Pg/upgrade/0897.schema.authority_disable_auto_update.sql +0 88 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority_disable_auto_update.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0897.schema.authority_disable_auto_update.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority_disable_auto_update.sql + +commit 131119996616867d08653dbc66a689cbbf4f5870 +Author: Chris Sharp +Date: Mon Nov 10 14:43:22 2014 -0500 + + LP#1391290: Respect setting to disable authority propagation on reingest + + In commit a1612cfd6 we lost the ability to disable authority propagation on + record update. Here, we put it back. + + Signed-off-by: Chris Sharp + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +6 2 Open-ILS/src/sql/Pg/999.functions.global.sql +88 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority_disable_auto_update.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.authority_disable_auto_update.sql + +commit af733e3d617f5d083d2b6010645fcdd8ac646e90 +Author: Bill Erickson +Date: Mon Nov 3 17:55:00 2014 -0500 + + LP#1203734 copy circ counts include anon. circs + + Circ counts displayed on "Show Last Few Circulations" (XUL) includes + active, anonymized, and legacy circulations (via cstore) + + Signed-off-by: Bill Erickson + Signed-off-by: Chris Sharp + +19 7 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm +0 40 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/asset.pm + +commit b19d1c07c4ea17f9c747713f08afc451d6e8db35 +Author: Ben Shum +Date: Mon Nov 10 20:27:11 2014 -0500 + + LP#778989: Stamping upgrade script for copy location trigger + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +32 0 Open-ILS/src/sql/Pg/upgrade/0896.correct_copy_location.sql +0 27 Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0896.correct_copy_location.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql + +commit 11ab00b1890c3d61b22d100424d41ae0060a35f3 +Author: Chris Sharp +Date: Tue Aug 26 15:39:00 2014 -0400 + + LP#778989: Adding DROP TRIGGER IF EXISTS to allow for smooth upgrades. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +2 0 Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql + +commit 194a1c0c212fe00413fb65116f5369816489fae1 +Author: Thomas Berezansky +Date: Tue Aug 26 12:14:11 2014 -0400 + + LP#778989: Add circ lib to location fixer + + Because the circ lib is valid for picking locations. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +5 2 Open-ILS/src/sql/Pg/040.schema.asset.sql +5 2 Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql + +commit c3a9893c1109b9779fee362db84119a07a0576fa +Author: Thomas Berezansky +Date: Wed Feb 1 16:07:05 2012 -0500 + + LP#778989: Attempt to find "Correct" copy location + + This adds a trigger to asset.copy that on insert or change of the location + and/or call number tries to find an identically named copy location that + is scoped to the owning library of the copy. + + If it does not find one it uses the location provided. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +22 0 Open-ILS/src/sql/Pg/040.schema.asset.sql +22 0 Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql + +commit d9840749df9da9e1e76a8ec3cbe1db4df6ad7254 +Author: Timothy Spindler +Date: Mon Nov 10 16:25:00 2014 -0500 + + Docs: remove extra '\r' in cataloging/MARC_batch_edit.txt + + Signed-off-by: Yamil Suarez + +48 48 docs/cataloging/MARC_batch_edit.txt + +commit f65a5324be8b843b474e82440c75b3ff1a436e95 +Author: Timothy Spindler +Date: Mon Nov 10 16:24:26 2014 -0500 + + Docs: Documentation for MARC Batch Edit + + Signed-off-by: Yamil Suarez + +48 0 docs/cataloging/MARC_batch_edit.txt +2 0 docs/root.txt + create mode 100644 docs/cataloging/MARC_batch_edit.txt + +commit 917e470e2a8156afe031f0afacffda6679d248b6 +Author: Josh Stompro +Date: Mon Nov 10 14:06:07 2014 -0500 + + Documentation: LP#1386854 - Locally Hosted Added Content. + + Adds documentation that describes how to use the local content bypass + feature of the AddedContent modules. This allows for local added content like + cover art, reviews, TOC, exerpts or annotations to be shown in bib records. + + I also changed the headers in the External Added Content section to use title case. + + Signed-off-by: Josh Stompro + Signed-off-by: Yamil Suarez + +70 2 docs/admin_initial_setup/designing_your_catalog.txt + +commit 2d83e10b5ab37d995c8503e8e2b631ac43cad5c7 +Author: Mike Rylander +Date: Thu Nov 6 16:03:36 2014 -0500 + + LP#1390225: Fail to care about errors from auth.session.delete + + We're just tossing this call over the wall and moving on. We don't + care if the session wasn't there to delete or even if we didn't pass + a session to the server. + + Signed-off-by: Mike Rylander + Signed-off-by: Chris Sharp + Signed-off-by: Jason Stephenson + +7 5 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm + +commit 0fa2055705b17b0ac8959e57aec2ead91e939718 +Author: Mike Rylander +Date: Thu Nov 6 15:36:16 2014 -0500 + + LP#1390225: redirect to ctx.home_page instead of through ctx.logout_page + + This way, we skip the auth.session.delete call that will error out because + we no longer have the authtoken cookie. + + Signed-off-by: Mike Rylander + Signed-off-by: Chris Sharp + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/templates/opac/parts/base.tt2 + +commit a946eb97e45c6fde2898fb5390bce21e47d41688 +Author: Ben Shum +Date: Wed Nov 5 15:55:09 2014 -0500 + + Forward port 2.7.0-2.7.1 upgrade script + + Signed-off-by: Ben Shum + +170 0 Open-ILS/src/sql/Pg/version-upgrade/2.7.0-2.7.1-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.7.0-2.7.1-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..7aa48fb904 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-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 e9f599d56f..e19d572242 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 ('0901', :eg_version); -- berick/bshum +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.2', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.7.1-2.7.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.7.1-2.7.2-upgrade-db.sql new file mode 100644 index 0000000000..aa3c4c9c2c --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.7.1-2.7.2-upgrade-db.sql @@ -0,0 +1,237 @@ +--Upgrade Script for 2.7.1 to 2.7.2 +\set eg_version '''2.7.2''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.2', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('0896', :eg_version); + +CREATE OR REPLACE FUNCTION asset.acp_location_fixer() +RETURNS TRIGGER AS $$ +DECLARE + new_copy_location INT; +BEGIN + IF (TG_OP = 'UPDATE') THEN + IF NEW.location = OLD.location AND NEW.call_number = OLD.call_number AND NEW.circ_lib = OLD.circ_lib THEN + RETURN NEW; + END IF; + END IF; + SELECT INTO new_copy_location acpl.id FROM asset.copy_location acpl JOIN actor.org_unit_ancestors_distance((SELECT owning_lib FROM asset.call_number WHERE id = NEW.call_number)) aouad ON acpl.owning_lib = aouad.id WHERE name = (SELECT name FROM asset.copy_location WHERE id = NEW.location) ORDER BY distance LIMIT 1; + IF new_copy_location IS NULL THEN + SELECT INTO new_copy_location acpl.id FROM asset.copy_location acpl JOIN actor.org_unit_ancestors_distance(NEW.circ_lib) aouad ON acpl.owning_lib = aouad.id WHERE name = (SELECT name FROM asset.copy_location WHERE id = NEW.location) ORDER BY distance LIMIT 1; + END IF; + IF new_copy_location IS NOT NULL THEN + NEW.location = new_copy_location; + END IF; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +DROP TRIGGER IF EXISTS acp_location_fixer_trig ON asset.copy; + +CREATE TRIGGER acp_location_fixer_trig + BEFORE INSERT OR UPDATE OF location, call_number, circ_lib ON asset.copy + FOR EACH ROW EXECUTE PROCEDURE asset.acp_location_fixer(); + + +SELECT evergreen.upgrade_deps_block_check('0897', :eg_version); + +CREATE OR REPLACE FUNCTION authority.indexing_ingest_or_delete() RETURNS TRIGGER AS $BODY$ +DECLARE + ashs authority.simple_heading%ROWTYPE; + mbe_row metabib.browse_entry%ROWTYPE; + mbe_id BIGINT; + ash_id BIGINT; +BEGIN + + IF NEW.deleted IS TRUE THEN -- If this authority is deleted + DELETE FROM authority.bib_linking WHERE authority = NEW.id; -- Avoid updating fields in bibs that are no longer visible + DELETE FROM authority.full_rec WHERE record = NEW.id; -- Avoid validating fields against deleted authority records + DELETE FROM authority.simple_heading WHERE record = NEW.id; + -- Should remove matching $0 from controlled fields at the same time? + + -- XXX What do we about the actual linking subfields present in + -- authority records that target this one when this happens? + DELETE FROM authority.authority_linking + WHERE source = NEW.id OR target = NEW.id; + + RETURN NEW; -- and we're done + END IF; + + IF TG_OP = 'UPDATE' THEN -- re-ingest? + PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled; + + IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change + RETURN NEW; + END IF; + + -- Unless there's a setting stopping us, propagate these updates to any linked bib records + PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_auto_update' AND enabled; + + IF NOT FOUND THEN + PERFORM authority.propagate_changes(NEW.id); + END IF; + + DELETE FROM authority.simple_heading WHERE record = NEW.id; + DELETE FROM authority.authority_linking WHERE source = NEW.id; + END IF; + + INSERT INTO authority.authority_linking (source, target, field) + SELECT source, target, field FROM authority.calculate_authority_linking( + NEW.id, NEW.control_set, NEW.marc::XML + ); + + FOR ashs IN SELECT * FROM authority.simple_heading_set(NEW.marc) LOOP + + INSERT INTO authority.simple_heading (record,atag,value,sort_value) + VALUES (ashs.record, ashs.atag, ashs.value, ashs.sort_value); + ash_id := CURRVAL('authority.simple_heading_id_seq'::REGCLASS); + + SELECT INTO mbe_row * FROM metabib.browse_entry + WHERE value = ashs.value AND sort_value = ashs.sort_value; + + IF FOUND THEN + mbe_id := mbe_row.id; + ELSE + INSERT INTO metabib.browse_entry + ( value, sort_value ) VALUES + ( ashs.value, ashs.sort_value ); + + mbe_id := CURRVAL('metabib.browse_entry_id_seq'::REGCLASS); + END IF; + + INSERT INTO metabib.browse_entry_simple_heading_map (entry,simple_heading) VALUES (mbe_id,ash_id); + + END LOOP; + + -- Flatten and insert the afr data + PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_full_rec' AND enabled; + IF NOT FOUND THEN + PERFORM authority.reingest_authority_full_rec(NEW.id); + PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_rec_descriptor' AND enabled; + IF NOT FOUND THEN + PERFORM authority.reingest_authority_rec_descriptor(NEW.id); + END IF; + END IF; + + RETURN NEW; +END; +$BODY$ LANGUAGE plpgsql; + + + +SELECT evergreen.upgrade_deps_block_check('0898', :eg_version); + +CREATE OR REPLACE FUNCTION unapi.mmr_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, + pref_lib INT DEFAULT NULL +) 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@mmr/' || $1 AS metarecord + ), + (SELECT XMLAGG(foo.y) + FROM ( + WITH sourcelist AS ( + WITH aou AS (SELECT COALESCE(id, (evergreen.org_top()).id) AS id + FROM actor.org_unit WHERE shortname = $5 LIMIT 1) + SELECT source + FROM metabib.metarecord_source_map, aou + WHERE metarecord = $1 AND ( + EXISTS ( + SELECT 1 FROM asset.opac_visible_copies + WHERE record = source AND circ_lib IN ( + SELECT id FROM actor.org_unit_descendants(aou.id, $6)) + LIMIT 1 + ) + OR EXISTS (SELECT 1 FROM located_uris(source, aou.id, $10) LIMIT 1) + ) + ) + SELECT cmra.aid, + XMLELEMENT( + name field, + XMLATTRIBUTES( + cmra.attr AS name, + cmra.value AS "coded-value", + cmra.aid AS "cvmid", + rad.composite, + rad.multi, + rad.filter, + rad.sorter + ), + cmra.value + ) + FROM ( + SELECT DISTINCT aid, attr, value + FROM ( + SELECT v.source AS id, + c.id AS aid, + c.ctype AS attr, + c.code AS value + FROM metabib.record_attr_vector_list v + JOIN config.coded_value_map c ON ( c.id = ANY( v.vlist ) ) + ) AS x + JOIN sourcelist ON (x.id = sourcelist.source) + ) AS cmra + JOIN config.record_attr_definition rad ON (cmra.attr = rad.name) + UNION ALL + SELECT umra.aid, + XMLELEMENT( + name field, + XMLATTRIBUTES( + umra.attr AS name, + rad.composite, + rad.multi, + rad.filter, + rad.sorter + ), + umra.value + ) + FROM ( + SELECT DISTINCT aid, attr, value + FROM ( + SELECT v.source AS id, + m.id AS aid, + m.attr AS attr, + m.value AS value + FROM metabib.record_attr_vector_list v + JOIN metabib.uncontrolled_record_attr_value m ON ( m.id = ANY( v.vlist ) ) + ) AS x + JOIN sourcelist ON (x.id = sourcelist.source) + ) AS umra + JOIN config.record_attr_definition rad ON (umra.attr = rad.name) + ORDER BY 1 + + )foo(id,y) + ) + ) +$F$ LANGUAGE SQL STABLE; + + + +SELECT evergreen.upgrade_deps_block_check('0899', :eg_version); + +ALTER FUNCTION asset.label_normalizer_generic(TEXT) IMMUTABLE; +ALTER FUNCTION asset.label_normalizer_dewey(TEXT) IMMUTABLE; +ALTER FUNCTION asset.label_normalizer_lc(TEXT) IMMUTABLE; + + +SELECT evergreen.upgrade_deps_block_check('0900', :eg_version); + +CREATE OR REPLACE VIEW metabib.record_attr AS + SELECT id, HSTORE( ARRAY_AGG( attr ), ARRAY_AGG( value ) ) AS attrs + FROM metabib.record_attr_flat + WHERE attr IS NOT NULL + GROUP BY 1; + + +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 dd106530c3..4a8d1888e9 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_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..85d1a6032d 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_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..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..686359340d --- /dev/null +++ b/README @@ -0,0 +1,608 @@ +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 +------------------------------------------------------------------------------ + +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.3.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 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+, 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-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_2 install +------------------------------------------------------------------------------ ++ +2. The server portion of the staff client expects `http://hostname/xul/server` + to resolve. Issue the following commands as the *root* Linux account to + create a symbolic link pointing to the `server` subdirectory of the server + portion of the staff client that we just built using the staff client ID + 'rel_name': ++ +[source, bash] +------------------------------------------------------------------------------ +cd /openils/var/web/xul +ln -sf rel_name/server server +------------------------------------------------------------------------------ + +Change ownership of the Evergreen files +--------------------------------------- + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +Additional Instructions for Developers +-------------------------------------- + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads + +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 + ------------------------------------ + +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..afc001d430 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.2, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.7.2]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])