[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_2_2 created. 91f7333b3c3ae246f22ab7aec55b058481ffc0b5
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 22 14:45:55 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, tags/rel_2_2_2 has been created
at 91f7333b3c3ae246f22ab7aec55b058481ffc0b5 (commit)
- Log -----------------------------------------------------------------
commit 91f7333b3c3ae246f22ab7aec55b058481ffc0b5
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Wed Aug 22 11:12:29 2012 -0400
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..7ece2ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,513 @@
-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 b69c3b2967209e6f206f6309c97504af1f3a509b
+Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+Date: Tue Aug 21 15:45:31 2012 -0400
+
+ Documentation: 2.2.2 release notes; adjust upgrade instructions for 2.2.2
+
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+0 72 docs/RELEASE_NOTES_2_2_1.txt
+37 0 docs/RELEASE_NOTES_2_2_2.txt
+12 12 docs/installation/server_upgrade.txt
+ delete mode 100644 docs/RELEASE_NOTES_2_2_1.txt
+ create mode 100644 docs/RELEASE_NOTES_2_2_2.txt
+
+commit 7a120b12eab6fe618b15c12f8d00b168f33f9f7b
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Thu Aug 16 15:40:58 2012 -0400
+
+ Sanity check cstore limit/offset param values
+
+ Certain cstore calls (direct / json_query) that support limit/offset
+ params called with a non-string / non-numeric value
+
+ e.g. { "limit": null }
+
+ result in a cstore segfault as it tries to call atoi(NULL) under the
+ covers. This patch prevents this by verifying that the limit/offset
+ values are actual strings or numbers (i.e. return a value from
+ jsonObjectGetString) and not JSON_NULL, etc.
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+20 12 Open-ILS/src/c-apps/oils_sql.c
+
+commit 53cbfd2242c3be791ae1ba4d68ccdc2bc8557f73
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Tue Aug 21 17:23:26 2012 -0400
+
+ Protect against installs with no locales
+
+ Installs from source outside of tarballs may not have a built locale,
+ which would result in a make error and an aborted install. Protect
+ against that by checking for the existence of the locale install
+ directory before trying to copy the files into place.
+
+ In the weird case that Open-ILS/src/data/locale has been generated but
+ there are no files in it, protect against erroring out via the judicious
+ application of the - flag.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+5 3 Open-ILS/src/Makefile.am
+
+commit e0337805221d7465aa3cbf20f36548155e4fa099
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Aug 20 14:11:50 2012 -0400
+
+ TPAC: Standardize i18n file installation
+
+ Make TPAC i18n files act like any other i18n file. In short:
+
+ 1. When in build/i18n, a 'make LOCALE=fr-CA install' will copy
+ the i18n file into the Open-ILS/src/data/locale directory.
+ 2. In the build root, a 'make install' will copy all files from
+ Open-ILS/src/data/locale into (by default) the
+ /openils/var/data/locale directory.
+
+ This also means that when tarballs are created, all of the locales will
+ get packaged appropriately.
+
+ This commit also updates eg_vhost.conf to provide working out-of-the-box
+ examples for any installed locales, by using the names of the actual
+ PO files, and adds some contextual comments to explain how the
+ configuration directives work.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+12 3 Open-ILS/examples/apache/eg_vhost.conf
+4 0 Open-ILS/src/Makefile.am
+3 0 build/i18n/Makefile
+
+commit a575bb9675b33635a15a871cb5538794bf1e64cc
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Jul 30 11:30:50 2012 -0400
+
+ TPAC: Autosuggest focus() throws a JS error
+
+ On page load, the Dojo autosuggest code tries to set focus to the
+ element with the ID "search_box" - which is fine, except when the page
+ does not have said ID. Therefore, test for the existence of the ID
+ before setting focus to it.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Art Rhyno <art632000 at yahoo.ca>
+
+9 6 Open-ILS/src/templates/opac/parts/js.tt2
+
+commit a907bc50f586c99624c8781ba0bcf15383d5c38a
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sat Aug 4 10:26:25 2012 -0400
+
+ TPAC locale picker: use POST instead of GET
+
+ Users could (deliberately or not) change another's language
+ preferences by sharing links with the "set_eg_locale" GET param given
+ the locale picker's current behaviour. By switching to a POST param, we
+ prevent this result from accidentally occurring.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Art Rhyno <art632000 at yahoo.ca>
+
+1 1 Open-ILS/src/templates/opac/parts/locale_picker.tt2
+
+commit cc38fdc351e545f29ef783a3a194d5f000826485
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Thu Aug 16 15:11:29 2012 -0400
+
+ Stamping upgrade script for copy editor field hiding permission
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+ Conflicts:
+ Open-ILS/src/sql/Pg/002.schema.config.sql
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+11 0 Open-ILS/src/sql/Pg/upgrade/0736.data.copy_editor_perms.sql
+0 6 Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/0736.data.copy_editor_perms.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+
+commit 1b6f161984ed82d0a14cc74d303806975099b3b8
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Thu Aug 16 14:58:01 2012 -0400
+
+ Update permission name to match existing ones
+
+ To be consistent with our previous naming scheme for these.
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+ Conflicts:
+ Open-ILS/src/sql/Pg/950.data.seed-values.sql
+
+1 1 Open-ILS/src/sql/Pg/950.data.seed-values.sql
+1 1 Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+
+commit 89f3acd5984b0391fc7e30b9d602ea63b0c654a6
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Thu Aug 16 13:45:23 2012 -0400
+
+ Provide permission for copy editor field hiding
+
+ We can adjust what fields are available in the copy editor in 2.2+, but that
+ requires the general UPDATE_ORG_SETTING permission. The YAOUS-specific
+ permission here allows more granular control, so that staff can be given the
+ ability to adjust only that one OU setting.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+
+ Conflicts:
+ Open-ILS/src/sql/Pg/950.data.seed-values.sql
+
+7 3 Open-ILS/src/sql/Pg/950.data.seed-values.sql
+6 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+
+commit 7e325cde9138b6cac08ee11eaa80ccf70a9c14ed
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Jul 16 13:27:54 2012 -0400
+
+ Hide OPAC-invisible holdings from SRU/Z39.50
+
+ The basic_holdings Supercat method filtered out deleted call numbers and
+ copies, but didn't filter out copies based on the OPAC visibility status
+ of copy location / status / the copy itself. This has undesired results
+ when third-party services request copies via SRU or Z39.50 and expose
+ copies that should not be visible to the public.
+
+ We wrap all of the visibility and deletedness checks for a given copy up
+ into a subroutine so that we can avoid repeating ourselves in the
+ basic_holdings logic. Also, if we missed a test, we can add it in one
+ handy place :)
+
+ (Thanks to Galen Charlton for finding two missing tests: circ lib
+ visibility and owning lib visibility!)
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Art Rhyno <art632000 at yahoo.ca>
+
+20 2 Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+
+commit 42a3ff59cc82ee95a842fbfa1181054bd7d63d5e
+Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+Date: Thu Jul 26 16:45:24 2012 -0400
+
+ Trying to update patron CSS color fails here, so don't try
+
+ After modifying user standing penalties ("messages" in the staff client
+ patron interface), you could get this error message in an alert() dialog:
+ TypeError: patron.display is undefined.
+
+ We were apparently trying to use patron.util.set_patron_css() wrongly,
+ so the commented out changed verison of the call got farther, but stopped at
+ ...penalties[i].standing_penalty().name is not a function.
+
+ Which probably has something to do with unfleshed data. Somebody can
+ get to the bottom of this if they want, but for now it's easier just not
+ to try to do this and make the alert() dialog go away.
+
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+3 3 Open-ILS/xul/staff_client/server/patron/standing_penalties.js
+
+commit 5669ab7e55d23303bfb7689e6c05c0fa5be1be9a
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Tue Jul 31 15:35:21 2012 -0400
+
+ Check for filled hold on transit checkin
+
+ "Fill related hold" can grab a hold out from under a transit, so check for
+ filled holds in addition to canceled ones.
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+2 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 97d89ddf5022b415d91a2fe2e1e6c54f3a2f4d79
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Tue Apr 10 09:10:46 2012 -0400
+
+ SuperCat fixes - Child Init
+
+ Sometimes it seems that child_init has not run properly for supercat.
+
+ This attempts to fix that by checking for the global appsession objects. If
+ they are not there we run child_init. The function that does this is being
+ called from all handler entry functions.
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+
+28 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+
+commit 13869d72c78dae42b9a43beeed40a557f0513e13
+Author: Ben Shum <bshum at biblio.org>
+Date: Mon Aug 6 11:11:54 2012 -0400
+
+ TPAC - Fix footer on hold history page
+
+ The hold history page was missing an ending div tag to complete the
+ block which leads to the footer being generated incorrectly on that
+ page.
+
+ Adding the ending tag repairs the display of the footer to match all
+ the other pages.
+
+ Credit to Melissa Lefebvre for noticing this discrepancy.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 0 Open-ILS/src/templates/opac/myopac/hold_history.tt2
+
+commit 0d896279df3649f44a1622cb990788aa6023a69b
+Author: Melissa Lefebvre <mlefebvre at biblio.org>
+Date: Tue Aug 14 12:58:18 2012 -0400
+
+ Change grammar for lost and missing failure messages
+
+ Update to the lost and missing failure wording to make it
+ gramatically correct. Removed the word "has" from both
+ messages.
+
+ Signed-off-by: Melissa Lefebvre <mlefebvre at biblio.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+2 2 Open-ILS/src/extras/ils_events.xml
+
+commit 3c4ae14df412d70c445027eff74d4c144418670c
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Tue Aug 14 10:50:11 2012 -0400
+
+ Physical Location Fixes/Enhancements
+
+ Teach the physical location retrieval function about using an ENV var.
+
+ This allows a subdomain to force a specific physical location, say by adding
+ to their apache config:
+
+ SetEnv physical_loc 4
+
+ Rewriterules could also be used for more dynamic configuration.
+
+ Also, as a fix:
+
+ Have preferred library use the stored physical location instead of assuming
+ that CGI has the setting all the time.
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+
+3 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+2 2 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
+
+commit 077cb9a1dc65d361450f21430c8f1b5eaaed17e1
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Wed Aug 15 09:57:59 2012 -0400
+
+ Documentation: Fix typos and include references in root.txt.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+2 2 docs/root.txt
+
+commit eca49e528ea2987130130d87670c6283861b19bf
+Author: Ben Shum <bshum at biblio.org>
+Date: Tue Aug 7 13:48:31 2012 -0400
+
+ TPAC - fix pickup locations for edit holds
+
+ When a patron goes to edit a hold in TPAC, they have the option to
+ choose a different pickup location. Unfortunately, it looks like that
+ dropdown does not prevent them from selecting locations that aren't
+ normally allowed for pickups, such as system groups or consortium
+ itself.
+
+ This patch adds a check for 'can_have_vols_only' to the edit holds
+ screen.
+
+ Credit to Melissa Lefebvre for finally nailing down the source of
+ the issue.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+1 1 Open-ILS/src/templates/opac/myopac/holds/edit.tt2
+
+commit addef21ade78b1abc52e8ced611b1c162c7c2d65
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Fri Aug 10 14:59:50 2012 -0400
+
+ Default to current fiscal year in ACQ order upload
+
+ * Adds a new API call to determine the current fiscal year for a given
+ org unit: open-ils.acq.org_unit.current_fiscal_year
+
+ * Use open-ils.acq.org_unit.current_fiscal_year to populate the correct
+ fiscal year in the ACQ order upload selector.
+
+ This addresses part 2 of LP 1031927
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+37 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm
+25 4 Open-ILS/web/js/ui/default/acq/picklist/upload.js
+
+commit a242871dcb6d4c9e7c4630305a40ffb1be218cc3
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Fri Aug 10 14:59:29 2012 -0400
+
+ Enable pcrud access to fiscal year / fiscal calendar
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+4 12 Open-ILS/examples/fm_IDL.xml
+
+commit c997cba9081b07db3779c84ab6b11baae789cfff
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Fri Aug 10 14:06:36 2012 -0400
+
+ Fiscal year selector in ACQ order record upload
+
+ * Support a 'fiscal_year' parameter to ACQ order record upload API.
+ * Adds a new "Fiscal Year" selector to the upload form to facilitate
+ uploading orders to different fiscal years.
+
+ This partially resolves LP 1031927 by allowing manual selection of the
+ correct fiscal year.
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
+
+7 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm
+10 0 Open-ILS/src/templates/acq/picklist/upload.tt2
+29 1 Open-ILS/web/js/ui/default/acq/picklist/upload.js
+
+commit 8ab1bd5f05da9dd91a94ad3c1b7f1acf9303496e
+Author: Ben Shum <bshum at biblio.org>
+Date: Sun Aug 12 03:25:49 2012 -0400
+
+ TPAC - add library scoping to shelf browser
+
+ The shelf browser currently uses the 'loc' variable to define scoping and
+ limit browsing to specific org units. However, since much of the scoping
+ actually uses 'locg', the scoping was broken for the shelf browser.
+
+ Additionally, under Advanced Search's Numeric Search, the option for
+ 'Call Number (Shelf Browse)' only applies the 'cn' variable to searches
+ and never adds the search scope, despite the search library now being
+ an available filter choice.
+
+ Based on suggestion by Dan Scott in IRC, this patch uses the function for
+ _get_search_lib() to retrieve the search library and add it to both parts
+ of the shelf browser.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+1 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+
+commit 4070d823f4f073fc3ae54891fa005a69d1a54a5f
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Wed Jul 25 13:43:38 2012 -0400
+
+ Make opac/results.tt2 remember facet when sorting, etc.
+
+ Add a hidden field in the search form and set its value to the value
+ of the CGI 'facet' param if the facet parameter is set. This appears
+ to work for multiple facets. Clearing a facet is as simple as clicking
+ on the gray-backgounded facet name.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+3 0 Open-ILS/src/templates/opac/results.tt2
+
+commit eff0427eb257bf01d258391aa9fd3a396cfa285d
+Author: Ben Shum <bshum at biblio.org>
+Date: Thu Aug 9 12:27:57 2012 -0400
+
+ TPAC - fix alignment of "You are now browsing..." in shelf browser
+
+ The "You are now browsing..." message does not align to the center of the
+ page. Changing the <div> to a <p> seems to properly align the text.
+
+ Along the way, we should remove the extra <span> and <strong> (the strong
+ is redundant with the css being inherited by color_4 class) and make the
+ new single line message more i18n-friendly for future translations.
+
+ Credit to Michael Peters for noticing the problem and thanks to Dan Scott,
+ Lebbeous Fogle-Weekley, and Thomas Berezansky for help via IRC for the
+ i18n-bits.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Michael Peters <mrpeters at library.in.gov>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+3 4 Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+
+commit 6d6bb833d35a39a3b809cd7a48ec4f4c933a09d7
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Sun Aug 12 15:16:01 2012 -0400
+
+ Fix TPAC shelf browser's previous link
+
+ Line fix suggested by Thomas Berezansky.
+
+ The cnoffset was strictly checking for values that start with a digit.
+ But negative numbers start with a "-" instead. Once this check was
+ changed, the previous link will continue to move further into negative
+ offsets.
+
+ Signed-off-by: Ben Shum <bshum at biblio.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+
+commit e4a2048d4e5840d2e589532ad014374b5598c365
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Thu Aug 9 18:25:00 2012 -0400
+
+ Authorities: Fix broken UI due to new XUL/Dojo/regressions
+
+ New versions of XUL, since Firefox 10, hate dojo.query("foo bar"), so we
+ have to refactor it to use dojo.query("foo").query("bar") instead. At
+ least until we upgrade to a new version of Dojo.
+
+ In addition, 522d8d82 introduced a regression meaning that the text of
+ the authorities was no longer wrapped in a SPAN element with a class of
+ "text". That in turn meant that the Dojo queries weren't picking up the
+ labels for the merge box, leaving no visual indication to the user as to
+ what authorities exactly were being merged. So, repair that.
+
+ Also, similar to a fix for the MFHD editor, set the initial height of
+ the spawned MARC Editor for an authority record to something reasonable.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+ Conflicts:
+ Open-ILS/web/js/ui/default/cat/authority/list.js
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+15 7 Open-ILS/web/js/ui/default/cat/authority/list.js
+
+commit 796a3e95acb558d319c35f46dde3f888ca60fdfe
+Author: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+Date: Thu Aug 9 14:53:32 2012 -0400
+
+ Documentation: Update upgrade instructions for 2.2.1 release.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+11 10 docs/installation/server_upgrade.txt
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index 7e36e0e..98dee35 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/;
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 "2-2";
+ return "2-2-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 fea872b..9b97b06 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -88,6 +88,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 ('0736', :eg_version); -- miker/tsbere
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.2.2', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.2.1-2.2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.2.1-2.2.2-upgrade-db.sql
new file mode 100644
index 0000000..52696ff
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.2.1-2.2.2-upgrade-db.sql
@@ -0,0 +1,13 @@
+--Upgrade Script for 2.2.1 to 2.2.2
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.2.2', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('0736', :eg_version);
+
+INSERT INTO permission.perm_list (id, code, description)
+ VALUES (539, 'UPDATE_ORG_UNIT_SETTING.ui.hide_copy_editor_fields', 'Allows staff to edit displayed copy editor fields');
+
+UPDATE config.org_unit_setting_type SET update_perm = 539 WHERE name = 'ui.hide_copy_editor_fields';
+
+
+COMMIT;
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..299bfad
--- /dev/null
+++ b/README
@@ -0,0 +1,549 @@
+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.1 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php
+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 <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+ issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Precise. 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]
+------------------------------------------------------------------------------
+./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+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_2_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/` 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/startup.pl /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/
+cp Open-ILS/examples/apache/startup.pl /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. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable
+ access to the offline upload / execute interface from any workstation on
+ any network - note that you must secure this for a production instance)
+ 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]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 20
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxClients 150
+ MaxRequestsPerChild 10000
+</IfModule>
+------------------------------------------------------------------------------
++
+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.pl`, 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 and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91
+------------------------------------------------------------------------------
+
+.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91
+------------------------------------------------------------------------------
+
+You can install the packages required by Fedora on the machine of your choice
+using the following commands as the *root* Linux account:
+
+.(Fedora) Installing PostgreSQL server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server
+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
+------------------------------------------------------------------------------
+
+.(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
+cpan Library::CallNumber::LC
+cpan MARC::Record
+cpan MARC::File::XML
+cpan 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 <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config \
+ --service all --create-database --create-schema --create-offline \
+ --user <user> --password <password> --hostname <hostname> --port <port> \
+ --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+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.pl`.
+
+For PostgreSQL 9.0
+^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.0, you can either:
+
+ * Install the PostgreSQL contrib modules on the machine on which you
+ are installing the Evergreen code, and use the `--create-database`
+ option from that machine, or
+ * Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your
+ PostgreSQL server and invoke it as the *postgres* Linux account:
++
+[source, bash]
+------------------------------------------------------------------------------
+psql -vdb_name=<dbname> -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql
+------------------------------------------------------------------------------
+
+Then you can issue the `eg_db_config.pl` command as above _without_ the
+`--create-database` argument to create your schema and configure your
+configuration files.
+
+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.pl` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+ Received Data: "250bf1518c7527a03249858687714376"
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 0.045286
+ ------------------------------------
+
+ Received Data: {
+ "ilsevent":0,
+ "textcode":"SUCCESS",
+ "desc":" ",
+ "pid":21616,
+ "stacktrace":"oils_auth.c:304",
+ "payload":{
+ "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+ "authtime":420
+ }
+
+ }
+
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 1.336568
+ ------------------------------------
+
+If this does not work, it's time to do some troubleshooting.
+
+ * As the *opensrf* Linux acccount, 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://open-ils.org/listserv.php[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/listserv.php 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 d599a51..c08e3c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
export PATH=${PATH}:/usr/sbin
AC_PREREQ(2.61)
-AC_INIT(Open-ILS, 2.2, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [2.2])
+AC_INIT(Open-ILS, 2.2.2, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.2.2])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_PREFIX_DEFAULT([/openils/])
commit b69c3b2967209e6f206f6309c97504af1f3a509b
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Tue Aug 21 15:45:31 2012 -0400
Documentation: 2.2.2 release notes; adjust upgrade instructions for 2.2.2
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/docs/RELEASE_NOTES_2_2_1.txt b/docs/RELEASE_NOTES_2_2_1.txt
deleted file mode 100644
index 5ac5f0d..0000000
--- a/docs/RELEASE_NOTES_2_2_1.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Release Notes for Evergreen 2.2.1
-=================================
-
-This release contains many bugfixes improving on Evergreen 2.2.0.
-Significant changes since 2.2.0 are mentioned below, roughly grouped by area
-affected. For more information on a given change, see the
-http://open-ils.org/downloads/ChangeLog-2.2.0-2.2.1[technical changelog].
-
-All releases starting with this one are going to be much larger than they
-used to be now that the Evergreen documentation is stored in the same
-repository as the source code. Cheers to Robert Soulliere and to so many
-more contributors from our Documentation Interest Group.
-
-We also have some new folks contributing code, as well as continuing
-contributions from all the old folks (har). Thanks all!
-
-Changes
--------
- * ACQ: Vendor Invoice Won't Save
- * ACQ: Cache propagated funds in fund rollover action
- * ACQ: Add constraint to PO state value
- * Documentation: Fix typo in upgrade instructions
- * Documentation: remove those darn Windows carriage returns
- * Documentation: Migrate reports documentation from 2.1
- * Documentation: Format text to limit line length to 80 characters
- * Documentation: Fix various issues causing errors during processing
- * Documentation: Add Patron Bills section to Patron Management chapter
- * Documentation: Add Circulation, Patron management Chapter
- * Documentation: Add Group Serials Issues Chapter
- * Documentation: Update EG upgrade instructions to reflect 2.2.0 release
- * Documentation: Remove antiquated 1.6 directory from docs folder
- * Documentation: Improve Fedora prereqs and instructions
- * Documentation: Bump OpenSRF prerequisite to 2.1 for Evergreen 2.2+
- * Documentation: link README to server install docs
- * Documentation: Merge the Evergreen docs into the code repository
- * Documentation: Fix typo in upgrade instructions
- * Documentation: Add line breaks in authorities chapter to fix
- * Documentation: Wording improvement for 2.2 release notes
- * JSPAC: Point to TPAC from <noscript> section
- * TPAC: Decode translated strings into UTF8
- * TPAC: Implement a locale picker
- * TPAC: Allow user to change activation options for suspended holds
- * TPAC: Fix recognition of logged-in users via HTTP
- * TPAC: repair editions statement display
- * TPAC: Set autofocus appropriately for different contexts
- * TPAC: Use % font size + bold to highlight login failure
- * TPAC: CSS change for login failure message
- * TPAC: Physical description, now with spaces
- * TPAC: Fix glitch returning from viewing ready-for-pickup to all holds
- * TPAC: Disable caching for auth-required pages
- * TPAC: Fix titles/tabs in Account Preferences subpages
- * TPAC: Handle multiple matches for an XPath expression
- * TPAC: Add paging to My Lists
- * TPAC: Add record detail navigation to page bottom
- * TPAC: Search wrapper spacing
- * Staff client: increase default width for the XUL list line number column
- * Staff client: Patron name border color for Notes
- * Staff client: Add component to force external browser use
- * Staff client: Allow opening of links in default browser
- * Staff client: Move Prefix field ahead of Names in patron editor
- * Staff client: Show in Catalog not working in bills interface
- * Repair PCrudFilter localeStrings variable collisions
- * Repaired typo in example rsyslog config file
- * Fix version numbers in 2.1 -> 2.2 upgrade script
- * Avoid problem with 2.1 -> 2.2 upgrade script issuing error about thesuari
- * 2.2 upgrade missing vandelay.authority_match.quality column
- * Teach the autosuggest web service to cache suggestions where appropriate
- * Add new columns to CDBI table definitions
- * Switch to a PLPERLU maintain_901() trigger function
- * Add evergreen.get_locale_name() function to base schema
- * Squelch uninitialized var warning from hold_copy_targeter
- * Silence undef string concatenation warning in AutoSuggest
diff --git a/docs/RELEASE_NOTES_2_2_2.txt b/docs/RELEASE_NOTES_2_2_2.txt
new file mode 100644
index 0000000..c4519e4
--- /dev/null
+++ b/docs/RELEASE_NOTES_2_2_2.txt
@@ -0,0 +1,37 @@
+Release Notes for Evergreen 2.2.2
+=================================
+
+This release contains a SECURITY FIX and other bugfixes improving on
+Evergreen 2.2.1.
+
+Significant changes since 2.2.1 are mentioned below, roughly grouped by area
+affected. For more information on a given change, see the
+http://open-ils.org/downloads/ChangeLog-2.2.1-2.2.2[technical changelog].
+
+Thanks everyone!
+
+Changes
+-------
+ * SECURITY FIX: Sanitize NULL out of cstore limit/offset param values
+ * TPAC: Standardize i18n file installation
+ * TPAC: Prevent JS error from Autosuggest focus()
+ * TPAC: use POST instead of GET for locale picker
+ * TPAC: Fix footer on hold history page
+ * TPAC: fix pickup locations for edit holds
+ * TPAC: add library scoping to shelf browser
+ * TPAC: Remember facet when sorting, etc., on results page
+ * TPAC: fix alignment of "You are now browsing..." in shelf browser
+ * TPAC: Fix shelf browser's previous link
+ * TPAC: Physical Location Fixes/Enhancements
+ * ACQ: Default to current fiscal year in ACQ order upload
+ * ACQ: Enable pcrud access to fiscal year / fiscal calendar
+ * ACQ: Fiscal year selector in ACQ order record upload
+ * Staff client: avoid popup caused while saving patron messages
+ * Documentation: Fix typos and include references in root.txt.
+ * Documentation: Update upgrade instructions for 2.2.2 release.
+ * Authorities: Fix broken UI due to new XUL/Dojo/regressions
+ * Provide permission for copy editor field hiding
+ * Hide OPAC-invisible holdings from SRU/Z39.50
+ * Check for filled hold on transit checkin
+ * SuperCat fixes - Child Init
+ * Change grammar for lost and missing failure messages
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 599526c..223a361 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -42,12 +42,12 @@ osrf_ctl.sh -l -a stop_all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the http://evergreen-ils.org/opensrf.php[OpenSRF download page].
-. As the opensrf user, download and extract Evergreen 2.2:
+. As the opensrf user, download and extract Evergreen 2.2.2:
+
[source, bash]
-----------------------------------------------
-wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.2.1.tar.gz
-tar xzf Evergreen-ILS-2.2.1.tar.gz
+wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.2.2.tar.gz
+tar xzf Evergreen-ILS-2.2.2.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -57,7 +57,7 @@ For the latest edition of Evergreen, check the http://evergreen-ils.org/download
+
[source, bash]
----------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.2.1
+cd /home/opensrf/Evergreen-ILS-2.2.2
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -76,7 +76,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.2.1
+cd /home/opensrf/Evergreen-ILS-2.2.2
./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -85,8 +85,8 @@ make
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.2.1
-make STAFF_CLIENT_STAMP_ID=rel_2_2_1 install
+cd /home/opensrf/Evergreen-ILS-2.2.2
+make STAFF_CLIENT_STAMP_ID=rel_2_2_2 install
------------------------------------------------------------
+
. As the root user, change all files to be owned by the opensrf user and group:
@@ -100,7 +100,7 @@ chown -R opensrf:opensrf /openils
+
[source, bash]
-----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.2.1
+cd /home/opensrf/Evergreen-ILS-2.2.2
perl Open-ILS/src/support-scripts/eg_db_config.pl \
--create-offline --user evergreen --password evergreen \
@@ -113,7 +113,7 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl \
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -s rel_2_2_1/server
+ln -s rel_2_2_2/server
----------------------------------------------------------
+
. As the opensrf user, update opensrf_core.xml and opensrf.xml by copying the
@@ -146,7 +146,7 @@ opensrf.xml.example, then:
[source, bash]
-------------------------------------------------------------------------
cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
-cd /home/opensrf/Evergreen-ILS-2.2.1
+cd /home/opensrf/Evergreen-ILS-2.2.2
perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all \
--database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -179,9 +179,9 @@ database server connection information:
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.2.1/Open-ILS/src/sql/Pg
+cd /home/opensrf/Evergreen-ILS-2.2.2/Open-ILS/src/sql/Pg
psql -U evergreen -h localhost -f version-upgrade/2.1-2.2-upgrade-db.sql evergreen
-psql -U evergreen -h localhost -f version-upgrade/2.2.0-2.2.1-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/2.2.1-2.2.2-upgrade-db.sql evergreen
----------------------------------------------------------
Restart Evergreen and Test
commit 7a120b12eab6fe618b15c12f8d00b168f33f9f7b
Author: Bill Erickson <berick at esilibrary.com>
Date: Thu Aug 16 15:40:58 2012 -0400
Sanity check cstore limit/offset param values
Certain cstore calls (direct / json_query) that support limit/offset
params called with a non-string / non-numeric value
e.g. { "limit": null }
result in a cstore segfault as it tries to call atoi(NULL) under the
covers. This patch prevents this by verifying that the limit/offset
values are actual strings or numbers (i.e. return a value from
jsonObjectGetString) and not JSON_NULL, etc.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/c-apps/oils_sql.c b/Open-ILS/src/c-apps/oils_sql.c
index 902a4e0..c9c1618 100644
--- a/Open-ILS/src/c-apps/oils_sql.c
+++ b/Open-ILS/src/c-apps/oils_sql.c
@@ -4910,12 +4910,16 @@ char* SELECT (
if( limit ){
const char* str = jsonObjectGetString( limit );
- buffer_fadd( sql_buf, " LIMIT %d", atoi( str ));
+ if (str) { // limit could be JSON_NULL, etc.
+ buffer_fadd( sql_buf, " LIMIT %d", atoi( str ));
+ }
}
if( offset ) {
const char* str = jsonObjectGetString( offset );
- buffer_fadd( sql_buf, " OFFSET %d", atoi( str ));
+ if (str) {
+ buffer_fadd( sql_buf, " OFFSET %d", atoi( str ));
+ }
}
if( !(flags & SUBSELECT) )
@@ -5453,21 +5457,25 @@ static char* buildSELECT ( const jsonObject* search_hash, jsonObject* rest_of_qu
const jsonObject* limit = jsonObjectGetKeyConst( rest_of_query, "limit" );
if( limit ) {
const char* str = jsonObjectGetString( limit );
- buffer_fadd(
- sql_buf,
- " LIMIT %d",
- atoi(str)
- );
+ if (str) {
+ buffer_fadd(
+ sql_buf,
+ " LIMIT %d",
+ atoi(str)
+ );
+ }
}
const jsonObject* offset = jsonObjectGetKeyConst( rest_of_query, "offset" );
if( offset ) {
const char* str = jsonObjectGetString( offset );
- buffer_fadd(
- sql_buf,
- " OFFSET %d",
- atoi( str )
- );
+ if (str) {
+ buffer_fadd(
+ sql_buf,
+ " OFFSET %d",
+ atoi( str )
+ );
+ }
}
}
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list