From: Bill Erickson Date: Wed, 21 Aug 2013 13:23:59 +0000 (-0400) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=319911d71f39973f6998a407d2ec7e34a172ca7d;p=working%2FEvergreen.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Bill Erickson --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..2934fa72a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,465 @@ -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 9d563a8d4626cd4e4b6b0f394606e74ef51e0456 +Author: Bill Erickson +Date: Wed Aug 21 09:20:42 2013 -0400 + + Bumping OpenILS VERSION to 2.0310 + + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 189a620e91fe07bb372a27524544c4e5690a8a82 +Author: Bill Erickson +Date: Wed Aug 21 09:15:46 2013 -0400 + + 2.3.10 translations import + + Signed-off-by: Bill Erickson + +5 5 build/i18n/po/Searcher.js/es-ES.po +4 2 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +30 10 build/i18n/po/acq.js/acq.js.pot +4 2 build/i18n/po/capture.js/capture.js.pot +4 4 build/i18n/po/cat.properties/cs-CZ.po +4 4 build/i18n/po/common.properties/cs-CZ.po +19 7 build/i18n/po/conify.js/conify.js.pot +820 765 build/i18n/po/db.seed/db.seed.pot +13 13 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +104 44 build/i18n/po/ils_events.xml/ils_events.xml.pot +28 27 build/i18n/po/lang.dtd/cs-CZ.po +22 21 build/i18n/po/lang.dtd/es-ES.po +5 1 build/i18n/po/lang.dtd/lang.dtd.pot +11 4 build/i18n/po/opac.js/opac.js.pot +4 4 build/i18n/po/patron.properties/cs-CZ.po +11 10 build/i18n/po/register.js/register.js.pot +5 2 build/i18n/po/reservation.js/reservation.js.pot +8 3 build/i18n/po/selfcheck.js/selfcheck.js.pot +4 4 build/i18n/po/tpac/tpac.pot + +commit 0aa91b755650846ca7c4d425b324ded0bc30b3a9 +Author: Lebbeous Fogle-Weekley +Date: Wed Sep 19 15:27:03 2012 -0400 + + Acq general search: improve searching for negative comparisons + + This aims to address Launchpad bug #1031535. I think the bug only + really shows up when searches involve invoices either as the core type + or with filter fields. If a search doesn't involve invoices, the + problematic joins aren't present. + + Could use more testing though. Seems to make the problem go away, and + other basic searches seem to work, but I certainly haven't tested + everything. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +24 4 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm + +commit fa7b8347e9122cd785683599c6d4900763ddc88c +Author: Ben Shum +Date: Tue Aug 20 10:50:43 2013 -0400 + + Stamping upgrade script for dewey sort fix + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +52 0 Open-ILS/src/sql/Pg/upgrade/0819.schema.acn_dewey_normalizer.sql +0 52 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acn_dewey_normalizer.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0819.schema.acn_dewey_normalizer.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acn_dewey_normalizer.sql + +commit c024726cb5ac5f686b0253e09f010649b4696280 +Author: Jason Etheridge +Date: Thu Mar 7 11:59:09 2013 -0500 + + LP#1150939 fix dewey sort + + There's a bit in the code where it tries to pad the first digit group, + if it's the only digit group, but it assumed the digit group was the + first token. + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +6 1 Open-ILS/src/sql/Pg/040.schema.asset.sql +52 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acn_dewey_normalizer.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acn_dewey_normalizer.sql + +commit 85ca009c2bd0ba9e4580660ab3a6ec37d9a2e42d +Author: Chris Sharp +Date: Mon Aug 5 14:10:56 2013 -0400 + + LP1208572 - Fixes for reporter.classic_item_list + + This view was created before the extend_reporter schema and the reporter. + materialized_simple_record existed. Rewriting the view definition to include + those. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +7 9 Open-ILS/src/sql/Pg/example.reporter-extension.sql + +commit f844bfc0ebd14569cf48b48c6b9076efe0ad549b +Author: Lebbeous Fogle-Weekley +Date: Fri Aug 16 10:32:42 2013 -0400 + + DB numbering for patron duplication check depth setting + + Signed-off-by: Lebbeous Fogle-Weekley + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +22 0 Open-ILS/src/sql/Pg/upgrade/0818.data.duplicate_patron_check_depth_ou_setting.sql +0 22 Open-ILS/src/sql/Pg/upgrade/XXXX.add_setting_for_selecting_consortium_as_search_ou_for_duplicate_patron_check.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0818.data.duplicate_patron_check_depth_ou_setting.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.add_setting_for_selecting_consortium_as_search_ou_for_duplicate_patron_check.sql + +commit a7017eb786935223d2a2013d6347d9c31a9bd945 +Author: Lebbeous Fogle-Weekley +Date: Fri Aug 16 09:31:16 2013 -0400 + + Adjust Kyle Tomita's patron dupe check fix to use the depth concept + + Addressing these comments: + https://bugs.launchpad.net/evergreen/+bug/1185524/comments/3 + + And also renaming the OU setting to better peer with similar settings + affecting staff client (not OPAC) patron registration. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Chris Sharp + +11 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm +6 6 Open-ILS/src/sql/Pg/950.data.seed-values.sql +16 18 Open-ILS/src/sql/Pg/upgrade/XXXX.add_setting_for_selecting_consortium_as_search_ou_for_duplicate_patron_check.sql + +commit 1eb958dede143e3227b52196dda1f0d05fd0cfcf +Author: Kyle Tomita +Date: Fri May 31 11:33:59 2013 -0700 + + LP1185524 - Duplicate patron checking in the user editor is limited to workstation OU + + Added a new library setting opac.duplicate_patron_check_use_consortium. + When true, the duplicate check will use the consortium (1) as the OU. + When false or not set, the duplicate check will use the workstation OU. + + The setting is checked in subroutine that creates the search request and + sets the OU accordingly. + + [LFW: Signing off but following with material changes next commit.] + + Signed-off-by: Kyle Tomita + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Chris Sharp + + Conflicts: + Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm + +5 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm +12 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql +24 0 Open-ILS/src/sql/Pg/upgrade/XXXX.add_setting_for_selecting_consortium_as_search_ou_for_duplicate_patron_check.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.add_setting_for_selecting_consortium_as_search_ou_for_duplicate_patron_check.sql + +commit fd9fb9ee7811f6b7fa9dcb4f6301c2dfc4fcf89d +Author: Steven Chan +Date: Mon Aug 5 12:13:54 2013 -0400 + + Fix LP985075, cannot save Patron Acquisition Request form + + The form is shown using a dojo EditPane attached to an EditDialog, + however, attaching the pane was done manually, resulting in the dialog + acting improperly and the pane positioned improperly. + + Instead, we use dojo's attr method to define the content attribute of + the dialog to be the pane. + + Signed-off-by: Steven Chan + Signed-off-by: Remington Steed + Signed-off-by: Ben Shum + +1 2 Open-ILS/web/js/dojo/openils/widget/EditDialog.js + +commit 6e5bee24ee72f1c2fd5345d1b5d306507f3fd5ae +Author: Chris Sharp +Date: Wed Jul 31 11:03:25 2013 -0400 + + Fixing LP 1072892 - repeated rows in reporter.classic_item_list view + + The view joined the actor.card table in such a way that all library + cards (active or not) were being returned. This commit changes that + behavior so that only the current card (from actor.usr.card) is returned. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/example.reporter-extension.sql + +commit 52a63bf1066109a6b151dda399416d31285cff64 +Author: Bill Erickson +Date: Tue Aug 13 10:03:10 2013 -0400 + + LP1211506 fix numeric sorting in staff client grids + + To recover numeric (vs. ascii-betical) sorting of number and money + values in grids, cast the cached sort values back into numbers. + + This was tested in the billing interface, but should repair numeric + sorting for most grids. + + Signed-off-by: Bill Erickson + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +8 0 Open-ILS/xul/staff_client/chrome/content/util/list.js + +commit 9e55c1e4619daa5d53fd0a0f8f74d0757210b3cd +Author: Pasi Kallinen +Date: Mon Jul 22 10:16:36 2013 +0300 + + Always show grid buttons on My Selection List + + Fix LP#1028601 by showing the selection list creation buttons in the acq + search UI even when there are no search results. + + Signed-off-by: Pasi Kallinen + Signed-off-by: Remington Steed + Signed-off-by: Ben Shum + +5 1 Open-ILS/web/js/ui/default/acq/search/unified.js + +commit c0a79af1509d3b770c3a919020a515dbc1e2caa0 +Author: Dan Wells +Date: Tue Jul 2 11:55:21 2013 -0400 + + Solidify caption/holding relationship, improve MFHD::Holding comparisons + + [This commit has been squashed for merging. LFW] + + * This commit: + - Makes sure that holding data is valid for the given caption + for new holding objects + - Teaches field_values() to fall back to '*' (unknown marker) + when a holding is missing data + - Allows the caption() method to be a setter + + * This commit: + - Makes the comparison operator consider chron data, not just + enumeration data + - Teaches the comparison operator a way to handle 'unsure' data + (that is, data presented in brackets []) + + * The code was assuming the $end_holding param would be uncompressed, + but this was not stated anywhere, nor enforced. Let's allow the + method to take both compressed and uncompressed holdings as the "end" + (and handle it appropriately). + + * Add some holdings with missing and unsure data to test the new + comparison operators handling of such data. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +33 5 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Holding.pm +19 15 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhddata2.txt + +commit 68c1bf0152750e3d085d24bea7c9a47b80e5189a +Author: Dan Wells +Date: Wed May 8 15:09:41 2013 -0400 + + Fix logic in get_compressed_holdings() + + [This commit has been squashed for merging. LFW] + + * This commit rearranges some of the logic branches to protect + against an unusual case of having two holding statements with + the same start value, but one being open-ended and one not. + + * The logic in get_combined_holdings() was a little sloppy and + repeated some steps unnecessarily. This cleans things up. + + See the test case in the previous commit for more clarity. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +17 16 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD.pm + +commit 12d88a006c06015e9bba5de483af6b987722ee7f +Author: Dan Wells +Date: Tue May 7 18:23:27 2013 -0400 + + Tie in new MFHD method to serials module/MFHD tests for compressing, combining + + [This commit has been squashed for merging. LFW] + + * Now that we have a potentially better alternative, let's call + get_combined_holdings() in place of get_compressed_holdings() in + Serial.pm. + + * First, add a test for the new get_combined_holdings() method. + + Second, add a known problem case for get_compressed_holdings(). + The fix will come in a subsequent commit. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm +24 0 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhd.t +31 0 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhddata2.txt + +commit df0d0704534db44eab4cb7a4b414510c61b21c40 +Author: Dan Wells +Date: Tue May 7 18:19:34 2013 -0400 + + Add new get_combined_holdings() method to MFHD.pm + + This commit adds a new method to the MFHD module which creates an + array of compressed holdings from all holdings for a given caption, + combining as needed. + + NOTE: This method is similar to, but much less aggressive/strict than + get_compressed_holdings(). Ultimately, get_compressed_holdings() + might be deprecated in favor of this. + + Signed-off-by: Dan Wells + Signed-off-by: Lebbeous Fogle-Weekley + +84 0 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD.pm + +commit 9717addcd5221e594df9c9025e9c3e51475b6db3 +Author: Lebbeous Fogle-Weekley +Date: Mon Jun 24 11:47:40 2013 -0400 + + Acq: When processing EDI invoices, skip unknown line item references + + See LP #1172373. + + In their electronic invoices, vendors sometimes include a mix of line + items that your ILS knows about, because you ordered them through it, + and line items of which your ILS knows nothing. We should not fail + altogether at processing invoices, but instead process what line items + we can. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Ben Shum + +106 66 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm + +commit 96a1fb4e9a148af329a0b024534ab4279963c791 +Author: Lebbeous Fogle-Weekley +Date: Tue Apr 16 15:18:17 2013 -0400 + + Acq: When building invoices from EDI messages, avoid bad data + + From some vendors, these EDI messages contain strings (useless ones, + like just the name of the vendor) where we had been expecting numeric + identifiers. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Ben Shum + +18 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm + +commit ed48cbdedf0b6e4be292c4fa2ad9d6741a1ee225 +Author: Pasi Kallinen +Date: Wed Jul 17 20:24:26 2013 +0300 + + Validate date ranges in Close Dates editor + + Complain in Closed Dates Editor when ending date is earlier than starting date. + + Signed-off-by: Pasi Kallinen + Signed-off-by: Remington Steed + Signed-off-by: Ben Shum + +1 0 Open-ILS/web/opac/locale/en-US/lang.dtd +5 0 Open-ILS/xul/staff_client/server/admin/closed_dates.js +1 0 Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml + +commit 3ba30f6c644f51d1158025e94675db8759c30cc2 +Author: Pasi Kallinen +Date: Tue Jul 23 10:49:47 2013 +0300 + + Prevent paste from empty clipboard throwing an error + + Signed-off-by: Pasi Kallinen + Signed-off-by: Ben Shum + +3 1 Open-ILS/xul/staff_client/chrome/content/util/clipboard.js + +commit 953cd16194b454199b3029ac00e83287d533546b +Author: Jeff Godin +Date: Tue May 29 10:28:50 2012 -0400 + + Fix IDL and OU setting check for staged users + + The IDL had references to sequences that do not exist: + + staging.usr_stage_row_id_seq -- a typo, fixed + + In the case of staging.billing_address_stage_row_id_seq, the + staging.billing_address_stage table is created with LIKE, + and uses the sequence staging.mailing_address_stage_row_id_seq + + The OU setting check for the open-ils.actor.user.stage.create API + call was not passing an org unit, and would always fail. + + We now pass the home_ou of the user being staged. + + At this point, the opac.allow_pending_user OU setting type must + be manually created before its value can be set. + + Signed-off-by: Jeff Godin + Signed-off-by: Bill Erickson + +2 2 Open-ILS/examples/fm_IDL.xml +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/Stage.pm + +commit e956804719b1f4380293b5dc2ed1f420f075b478 +Author: Bill Erickson +Date: Mon Jul 22 15:21:15 2013 -0400 + + LP1203753 AuthProxy barcode login support + + When users attempt a barcode-based login with AuthProxy, the system will + determine the username of the user (based on the barcode) and use the + username instead of the barcode for all proxied login attempts. This + allows users to use their barcodes (or barcode-looking usernames) to + log in via remote authenticators. + + Signed-off-by: Bill Erickson + Signed-off-by: Dan Wells + +16 4 Open-ILS/src/perlmods/lib/OpenILS/Application/AuthProxy.pm + +commit c41a96c64cae57981a5f62ae2b685817a4dbba31 +Author: Pasi Kallinen +Date: Fri Jul 19 09:04:04 2013 +0300 + + Fix LP#1187402: Datafield contents turned undefined in Marc Editor after adding 006, 007 or 008 + + Signed-off-by: Pasi Kallinen + Signed-off-by: Dan Scott + +4 1 Open-ILS/xul/staff_client/server/cat/marcedit.js + +commit 1f99bc8a85d56f9de3089ca38e9f88dc95f661e3 +Author: Mike Rylander +Date: Wed Jul 17 17:13:57 2013 -0400 + + Explicit function ownership is not the job of upgrade scripts + + Signed-off-by: Mike Rylander + + Conflicts: + Open-ILS/src/sql/Pg/version-upgrade/2.4.0-2.4.1-upgrade-db.sql + + Signed-off-by: Bill Erickson + +0 2 Open-ILS/src/sql/Pg/upgrade/0811.function.copy_related_hold_stats.sql diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index cd4dbbf9c0..f1f4432c42 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 "HEAD"; + return "2-3-10"; } __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 68255c51ed..a38205558d 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 ('0819', :eg_version); -- phasefx/bshum +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.10', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.3.9-2.3.10-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.3.9-2.3.10-upgrade-db.sql new file mode 100644 index 0000000000..b92e91cd17 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.3.9-2.3.10-upgrade-db.sql @@ -0,0 +1,75 @@ +--Upgrade Script for 2.3.9 to 2.3.10 +\set eg_version '''2.3.10''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.10', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('0818', :eg_version); + +INSERT INTO config.org_unit_setting_type ( name, grp, label, description, datatype ) VALUES ( + 'circ.patron_edit.duplicate_patron_check_depth', 'circ', + oils_i18n_gettext( + 'circ.patron_edit.duplicate_patron_check_depth', + 'Specify search depth for the duplicate patron check in the patron editor', + 'coust', + 'label'), + oils_i18n_gettext( + 'circ.patron_edit.duplicate_patron_check_depth', + 'When using the patron registration page, the duplicate patron check will use the configured depth to scope the search for duplicate patrons.', + 'coust', + 'description'), + 'integer') +; + + + +-- Evergreen DB patch 0819.schema.acn_dewey_normalizer.sql +-- +-- Fixes Dewey call number sorting (per LP# 1150939) +-- + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0819', :eg_version); + +CREATE OR REPLACE FUNCTION asset.label_normalizer_dewey(TEXT) RETURNS TEXT AS $func$ + # Derived from the Koha C4::ClassSortRoutine::Dewey module + # Copyright (C) 2007 LibLime + # Licensed under the GPL v2 or later + + use strict; + use warnings; + + my $init = uc(shift); + $init =~ s/^\s+//; + $init =~ s/\s+$//; + $init =~ s!/!!g; + $init =~ s/^([\p{IsAlpha}]+)/$1 /; + my @tokens = split /\.|\s+/, $init; + my $digit_group_count = 0; + my $first_digit_group_idx; + for (my $i = 0; $i <= $#tokens; $i++) { + if ($tokens[$i] =~ /^\d+$/) { + $digit_group_count++; + if ($digit_group_count == 1) { + $first_digit_group_idx = $i; + } + if (2 == $digit_group_count) { + $tokens[$i] = sprintf("%-15.15s", $tokens[$i]); + $tokens[$i] =~ tr/ /0/; + } + } + } + # Pad the first digit_group if there was only one + if (1 == $digit_group_count) { + $tokens[$first_digit_group_idx] .= '_000000000000000' + } + my $key = join("_", @tokens); + $key =~ s/[^\p{IsAlnum}_]//g; + + return $key; + +$func$ LANGUAGE PLPERLU; + +-- regenerate sort keys for any dewey call numbers +UPDATE asset.call_number SET id = id WHERE label_class = 2; + +COMMIT; diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index 2737f47bf1..82e353e588 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_3_10

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 6352b6e04e..bef2d67544 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_3_10"); 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 e0bc1ef5df..e7e96bb1ed 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.3" !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..a053b5547a --- /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 below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +5. Add the libdbi-libdbd libraries to the system dynamic library path by + issuing the following commands as the *root* Linux account: ++ +[NOTE] +You should skip this step if installing on Ubuntu Precise. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ ++ +.Fedora +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ + +Configuration and compilation instructions +------------------------------------------ + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +./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_3_10 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] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ ++ +6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf` + file to change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ + +Configure OpenSRF for the Evergreen application +----------------------------------------------- +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config.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 , , +, , 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.pl --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. + +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= -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 +------------------------------------------------------------------------------ + +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 89e64f6829..a868a0025f 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.3.10, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.3.10]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/])