From: Dan Wells Date: Tue, 26 Nov 2013 19:40:45 +0000 (-0500) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5a9c9f79338d76c9bec28e936c9e3959d7f0f6d5;p=evergreen%2Ftadl.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Dan Wells --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..6d65c427d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,469 @@ -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 92ba29f2c208325e847f1367e32f2ed18de84cb0 +Author: Dan Wells +Date: Tue Nov 26 14:35:22 2013 -0500 + + Bump OpenILS.pm version + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 45b2335bfefb3a5b77dbec6e1afdd9b12dbd7528 +Author: Mike Rylander +Date: Wed Nov 13 18:15:21 2013 -0500 + + Fix boolean lists; Better atom regex; Caching + + First, we didn't need to make $last_type local, and it broke explicit + grouping anyway. That's removed, and we now reset that (and a few more + like it) at calls to the top level parse() method. This introduces a + situation where a long list of booleans could cause query plan problems, + so we limit the plan depth to 40 (20 ||'d conditions). + + Second, we are smarter about finding the boundary of atoms. Previous + to this commit, and curly brace could send the parser into a tailspin + from which it would not recover. Now we use alternation instead of + a character class, which is much safer with the default multi-character + float syntax specifier. + + Third, as a catch-all, if we can't parse the remained of a query we + now simply say so (when in debug mode) and go away, instead of risking + an infinite loop. We do this via a final, unqualified "else" clause + in decompose(). + + Finally, instead of building 10+ regexp objects on each query parse, + cache them per QP subclass and reuse them. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +2 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm +117 94 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm +2 0 Open-ILS/src/support-scripts/test-scripts/query_tests.pl + +commit b4f1dfba98a0971eabb8824188d5fe0f21b8351f +Author: Bill Erickson +Date: Mon Oct 28 10:24:37 2013 -0400 + + LP#1238015 hide patron credit summary when disabled + + When the circ.disable_patron_credit / "Disable Patron Credit" org unit + setting is disabled, also hide the patron credit summary information in + the bills interface. + + Signed-off-by: Bill Erickson + Signed-off-by: Dan Wells + +6 1 Open-ILS/xul/staff_client/server/patron/bill2.xul + +commit 33fe2cee4b94a382fd62e02bfd6dcd6f5bb0684f +Author: Mike Rylander +Date: Mon Nov 25 10:14:08 2013 -0500 + + Re-apply the changes provided by 0802 for backport + + Preserve record order of subfields for authority heading extraction + + When extracting headings from authority records we currently read the + subfields of a tag in configuration order. We should, instead, read + them in record order, to preserve the desired sorting properties that + the cataloger has encoded in the record. + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +170 0 Open-ILS/src/sql/Pg/upgrade/0848.function.authority-sf-file-order-again.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0848.function.authority-sf-file-order-again.sql + +commit 165d51a2843954dafdd9cbb904908d17f789daea +Author: Dan Scott +Date: Sun Oct 27 13:11:37 2013 -0400 + + Fix copy_table HTML markup errors + + TD elements take a "headers" attribute, not a "header" attribute. Also, + we have a few typos in identifying the header attributes. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +2 2 Open-ILS/src/templates/opac/css/style.css.tt2 +19 19 Open-ILS/src/templates/opac/parts/record/copy_table.tt2 + +commit 7db96d3ea576c2f774208c450f3baf9a72e02703 +Author: Bill Erickson +Date: Fri Nov 22 14:55:26 2013 -0500 + + LP#1254146 gracefully handle custom trees sans entries + + Avoid references to custom tree entries when no tree entries for a + custom tree exist. Prevents: + + egweb: template error: undef error - Can't call method "org_unit" on an + undefined value at + /usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader/Util.pm line 185.\n + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +2 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm + +commit 1fff24ee104c1965003d4eea3123fe9227360562 +Author: Dan Wells +Date: Thu Nov 14 15:12:46 2013 -0500 + + Improve facet styling + + 1) Facets currently display very poorly when the number reaches 3-4 + digits. Facet data is more or less a two column table, so let's style + it that way to make it more robust. + + 2) Rearrange some styles to reduce redundancy, and allow overflow + where possible. + + 3) Change the selected highlight to look a little better. + + Signed-off-by: Dan Wells + Signed-off-by: Ben Shum + +15 29 Open-ILS/src/templates/opac/css/style.css.tt2 + +commit 7de0e1f55055f9afebab2b122ec3dd49e4c7bb26 +Author: Mike Rylander +Date: Wed Nov 20 14:45:18 2013 -0500 + + Pulling in new version upgrade + + Signed-off-by: Mike Rylander + +275 0 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql + +commit 916e8442af4d6bcca6a7397df7880dde942b0010 +Author: Bill Erickson +Date: Fri Nov 15 17:06:53 2013 -0500 + + LP#1251774 exit and alert on multiple payments per xact + + If more than one payment for a transaction is received, exit the API + call early and return a MULTIPLE_PAYMENTS_FOR_XACT event. + + Signed-off-by: Bill Erickson + Signed-off-by: Mike Rylander + +4 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm + +commit 8ea35f2e331e41e2198f71f205b3331277ef61fa +Author: Mike Rylander +Date: Fri Nov 15 16:40:36 2013 -0500 + + Enforce one-payment-per-xact-per-call + + There is no legitimate reason for a transaction to receive more than + one payment per call to open-ils.circ open-ils.circ.money.payment, + but we have seen the staff client generate such a data structure. This + leads to seemingly duplicate payments, and is bad all around. So, + we will enforce the restriction by taking only the first payment per + xact in the list of payments. + + Signed-off-by: Mike Rylander + Signed-off-by: Bill Erickson + +10 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm + +commit cdac86e1201d94b610678cdcf84e0e93107fdc05 +Author: Jason Stephenson +Date: Fri Nov 8 15:02:53 2013 -0500 + + Replace erroneous calls to $e->retrieve_authority_record($rec_id). + + On lines 153 and 175 of OpenILS::Application::Cat::Authority calls + like the above should be $e->retrieve_authority_record_entry($rec_id). + This branch replaces the two misspelled calls with the proper ones. + + Signed-off-by: Jason Stephenson + Signed-off-by: Mike Rylander + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm + +commit 95cbc4d3cc154fe3a503a261d3146b63fa3b491a +Author: Jason Etheridge +Date: Thu Sep 12 12:02:15 2013 -0400 + + LP1093856 fix Fast Item Add with Z39.50 import + + The first time I tried this fix I ran afoul of + https://bugs.launchpad.net/evergreen/+bug/787561 + + But a second attempt worked. So I didn't kill + two birds with one stone, but this should take + care of 1093856. + + Signed-off-by: Jason Etheridge + Signed-off-by: Mike Rylander + +12 3 Open-ILS/xul/staff_client/server/cat/marcedit.js + +commit 950dede4146fed9023f6fbf8d289b522bf615a6d +Author: Liam Whalen +Date: Sun Oct 6 22:11:56 2013 -0700 + + LP#1037171 Removed Expert Search paramters from subject links + + After performing an Expert Search, if a user visits a record and then + clicks on one of the author, subject, or series search links within that + record, then they are given the results of the Expert Search again + instead of the relevant subject or author search. + + This is happening because the Expert Search parameters are retained in + the URLs via the TT2 MACRO mkurl. In particular, the tag parameter is + used to identify an Expert Search, so if it is present in a URL, than an + Expert Search will be attempted regardless of which other paramaters are + in the URL. + + To fix this, I created two varialbes within header.tt2 above the + definition of mkurl. These variables group common URL paramters for + Expert Searches and General Search parameters together. These variables + can be used wherever mkurl is used to strip out unneeded search + paramters. + + There is a third variable that is already present within many of these + pages named stop_parms. While I initially tried to modify this + variable, I found that there are some instances where the general search + parameters should be retained while the Expert Search parameters must go. + + This commit uses these three variables togehter as input into the third + arugment of the mkurl MACRO. The third arugment specifies which + paramtes to remove from the previous URL before making a new URL based + on the pervious URL. + + I also added the query parameter to the Place Hold's hold_source_page + URL variable. I did this, so that the query terms would be preserved + once the user is done placing the hold or decides to cancle the placing + of the hold. + + As well, I used the new variables to remove Expert Search paramters + from the Advanced Search links on the results and record pages. + + Conflicts: + + Open-ILS/src/templates/opac/parts/searchbar.tt2 + + Signed-off-by: Liam Whalen + Signed-off-by: Mike Rylander + +4 0 Open-ILS/src/templates/opac/parts/header.tt2 +1 1 Open-ILS/src/templates/opac/parts/record/authors.tt2 +1 1 Open-ILS/src/templates/opac/parts/record/series.tt2 +1 1 Open-ILS/src/templates/opac/parts/record/subjects.tt2 +2 2 Open-ILS/src/templates/opac/parts/result/table.tt2 +1 1 Open-ILS/src/templates/opac/parts/searchbar.tt2 +1 1 Open-ILS/src/templates/opac/results.tt2 + +commit 7169398270feea25e79e4682dbde3029f7de083b +Author: Remington Steed +Date: Mon Nov 18 15:42:36 2013 -0500 + + Docs: Remove ref to missing included file + + This file was moved into the 2.5 release notes. If others believe it + belongs in the main documentation, it can easily be added in again. For + now, we will remove the reference because it only generates an asciidoc + warning. + + Signed-off-by: Remington Steed + +0 2 docs/root.txt + +commit 2f20d95461119fbe6360cc0eaa346d07ebaddd47 +Author: Remington Steed +Date: Mon Nov 18 15:21:09 2013 -0500 + + Docs: Fix leveloffset bug, raise REL NOTES level + + We should restrict our use of the asciidoc leveloffset command to the + root.txt file, since it is a global setting and cannot be set relative + to an existing offset. + + This commit also raises the Release Notes section to the highest level + in order to prevent the lowest level subsections within it from being + lost. This is in response to asciidoc errors: + + WARNING: RELEASE_NOTES_2_5.txt: line 950: missing section: [sect5] + + Signed-off-by: Remington Steed + +27 45 docs/RELEASE_NOTES_2_5.txt +0 4 docs/root.txt + +commit 6353e2b8b6e72e83ffb1513720faf1b6d7c78d2b +Author: Dan Scott +Date: Fri Nov 15 11:25:35 2013 -0500 + + Document how to load concerto sample data + + We might as well make it as easy as possible for people to use the + sample dataset that we created! + + Signed-off-by: Dan Scott + +13 0 docs/installation/server_installation.txt + +commit c925dc2564141656f41cd298de2ed031e0e55b6b +Author: Dan Scott +Date: Thu Nov 14 18:17:58 2013 -0500 + + Add basic docs for testing with pgTAP + + This can be expanded to describe how to create pgTAP tests later. For + now, let's help people actually set up their environment and test. + + Signed-off-by: Dan Scott + +39 0 docs/development/pgtap.txt +1 0 docs/root.txt + create mode 100644 docs/development/pgtap.txt + +commit b0711f572cab48341af687a80bf721241e616859 +Author: Pasi Kallinen +Date: Tue Jul 9 09:52:22 2013 +0300 + + Fix untranslatable strings in several dijits: + + AutoGrid, EditPane, FlattenerGrid, GridColumnPicker and HoldingCode. + + [LFW: One string amended in conflict resolution; commit message edited + to wrap; one line of code moved (this.nls assignment in + GridColumnPicker.js).] + + Signed-off-by: Pasi Kallinen + Signed-off-by: Lebbeous Fogle-Weekley + +9 0 Open-ILS/web/js/dojo/openils/serial/nls/serial.js +6 3 Open-ILS/web/js/dojo/openils/widget/AutoGrid.js +7 5 Open-ILS/web/js/dojo/openils/widget/EditPane.js +2 1 Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js +12 10 Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js +12 13 Open-ILS/web/js/dojo/openils/widget/HoldingCode.js +13 0 Open-ILS/web/js/dojo/openils/widget/nls/AutoFieldWidget.js + +commit 6ea75506c952a66d0f3aa98b5a662c3da91a8617 +Author: Steven Callender +Date: Thu Nov 14 15:42:12 2013 -0500 + + LP1251424 - Fix for submit button when placing holds in staff client + + I've moved the initializing of the cur_hold_barcode variable + to within the function rather than floating outside of it. + This seemed to fix an intermittent issue where the submit + button would not become activatable when first going to the + place hold screen via the staff client. To create the hold, + ths user had to cycle through the "Place hold by patron barcode" + option and then back to "Place hold for me" option. + + It looked like behind the scenes for certain org units that + variable would not be set and the button will not open until + it at least has something. This causes it to be set on the initial + loading of the screen. + + Signed-off-by: Steven Callender + Signed-off-by: Ben Shum + +1 1 Open-ILS/web/js/ui/default/opac/staff.js + +commit eaf9c8ec442c7da292ac377c6ccd83695920caf0 +Author: Garry Collum +Date: Mon Jul 22 14:30:04 2013 -0400 + + lp1012237 HOLD_ITEM_CHECKED_OUT display + + Added a definition to the HOLD_ITEM_CHECKED_OUT event in ils_events.xml. + Trying to be generic between the opac and the staff client the message + reads, "The item you have attempted to place on hold is already checked + out to the requestor." + + [LFW: I made a tiny spelling change to be consistent with other + appearances in Evergreen of the term "requestor".] + + Signed-off-by: Garry Collum + Signed-off-by: Lebbeous Fogle-Weekley + +3 0 Open-ILS/src/extras/ils_events.xml + +commit 7604c810051ec85cdcac40c69fde9cc4f8b930a0 +Author: Remington Steed +Date: Mon Nov 11 14:15:25 2013 -0500 + + Update version of release notes in 2.5 docs + + Signed-off-by: Remington Steed + +1 1 docs/root.txt + +commit 88ced5b157978dab2260296859319cadb7675e9d +Author: Lebbeous Fogle-Weekley +Date: Mon Oct 14 17:28:07 2013 -0400 + + Acq: Improvements to account-matching incoming EDI messages + + The way the EDI fetcher works gives us a problem. That process iterates + over EDI accounts for which it has FTP host and credential information, + downloads documents from each of those sites, and files the messages + within those documents under the EDI account from which the login + credentials came. The problem is that in practice the exact same host + and login information is used by multiple accounts under the same + vendor, and files relating to these sub-accounts are commingled, so that + you can't make the decision about which messages should be filed under + which accounts based on the name of the document or its location. You + have to make that decision later, based on its contents. + + We are already incompletely doing this, distinguishing between + sub-accounts under which we could file our messages when the vendor + specifies the buyer's SAN next to the specific sub-account number *and* + those sub-accounts belong to different Evergreen org units. We still + need ways to distinguish in other cases. + + This will do what is natural for at least one vendor, and match the + message content against the vendacct field of the acq.edi_account table. + + *Also,* + + We were re-retrieving the working acq.edi_message row from the database + before writing it, throwing away possible changes to the object in hand + made by O::A::Acq::EDI::process_parsed_msg(). We should only do that in + the case where that function has raised an exception. + + We were doing the same kind of thing in another place actually inside + process_parsed_msg() where we set the edi_message's purchase_order field + based on the first lineitem encountered if the message itself didn't + specify a valid PO identifier. + + This supports making account-correction work for ORDRSP messages in + addition to INVOIC messages. + + We also propagate that same correction to the provider and shipper + fields of any invoices that get created from said edi_message. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +56 13 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm + +commit b52e340ac3407558ebecace2334fb75dc9aaadea +Author: Dan Wells +Date: Mon Oct 28 11:23:08 2013 -0400 + + TPAC: Remove fixed height from 'View My List' button + + The TPAC button styles have been largely consolidated, but this little + outlier got missed. It doesn't do anything of noticeable value in + recent browsers, and in fact hurts the display by causing the "Sort by" + widget to "hang" when resizing the window to certain intermediate + sizes. Remove it. + + Signed-off-by: Dan Wells + Signed-off-by: Ben Shum + +0 2 Open-ILS/src/templates/opac/css/style.css.tt2 +1 1 Open-ILS/src/templates/opac/results.tt2 diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index d750216454..4c8c8de25d 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper; sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "HEAD"; + return "2-5-1"; } __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 2744e49650..92fb6d3b29 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0848', :eg_version); -- miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.5.1', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.5.0-2.5.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.5.0-2.5.1-upgrade-db.sql new file mode 100644 index 0000000000..61582adb67 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.5.0-2.5.1-upgrade-db.sql @@ -0,0 +1,173 @@ +--Upgrade Script for 2.5.0 to 2.5.1 +\set eg_version '''2.5.1''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.5.1', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('0848', :eg_version); + +CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT, no_thesaurus BOOL ) RETURNS TEXT AS $func$ +DECLARE + acsaf authority.control_set_authority_field%ROWTYPE; + tag_used TEXT; + nfi_used TEXT; + sf TEXT; + sf_node TEXT; + tag_node TEXT; + thes_code TEXT; + cset INT; + heading_text TEXT; + tmp_text TEXT; + first_sf BOOL; + auth_id INT DEFAULT COALESCE(NULLIF(oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml), ''), '0')::INT; +BEGIN + SELECT control_set INTO cset FROM authority.record_entry WHERE id = auth_id; + + IF cset IS NULL THEN + SELECT control_set INTO cset + FROM authority.control_set_authority_field + WHERE tag IN ( SELECT UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[])) + LIMIT 1; + END IF; + + thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj'); + IF thes_code IS NULL THEN + thes_code := '|'; + ELSIF thes_code = 'z' THEN + thes_code := COALESCE( oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml), '' ); + END IF; + + heading_text := ''; + FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset AND main_entry IS NULL LOOP + tag_used := acsaf.tag; + nfi_used := acsaf.nfi; + first_sf := TRUE; + + FOR tag_node IN SELECT unnest(oils_xpath('//*[@tag="'||tag_used||'"]',marcxml)) LOOP + FOR sf_node IN SELECT unnest(oils_xpath('//*[contains("'||acsaf.sf_list||'",@code)]',tag_node)) LOOP + + tmp_text := oils_xpath_string('.', sf_node); + sf := oils_xpath_string('./@code', sf_node); + + IF first_sf AND tmp_text IS NOT NULL AND nfi_used IS NOT NULL THEN + + tmp_text := SUBSTRING( + tmp_text FROM + COALESCE( + NULLIF( + REGEXP_REPLACE( + oils_xpath_string('./@ind'||nfi_used, tag_node), + $$\D+$$, + '', + 'g' + ), + '' + )::INT, + 0 + ) + 1 + ); + + END IF; + + first_sf := FALSE; + + IF tmp_text IS NOT NULL AND tmp_text <> '' THEN + heading_text := heading_text || E'\u2021' || sf || ' ' || tmp_text; + END IF; + END LOOP; + + EXIT WHEN heading_text <> ''; + END LOOP; + + EXIT WHEN heading_text <> ''; + END LOOP; + + IF heading_text <> '' THEN + IF no_thesaurus IS TRUE THEN + heading_text := tag_used || ' ' || public.naco_normalize(heading_text); + ELSE + heading_text := tag_used || '_' || COALESCE(nfi_used,'-') || '_' || thes_code || ' ' || public.naco_normalize(heading_text); + END IF; + ELSE + heading_text := 'NOHEADING_' || thes_code || ' ' || MD5(marcxml); + END IF; + + RETURN heading_text; +END; +$func$ LANGUAGE PLPGSQL IMMUTABLE; + +CREATE OR REPLACE FUNCTION authority.simple_heading_set( marcxml TEXT ) RETURNS SETOF authority.simple_heading AS $func$ +DECLARE + res authority.simple_heading%ROWTYPE; + acsaf authority.control_set_authority_field%ROWTYPE; + tag_used TEXT; + nfi_used TEXT; + sf TEXT; + cset INT; + heading_text TEXT; + sort_text TEXT; + tmp_text TEXT; + tmp_xml TEXT; + first_sf BOOL; + auth_id INT DEFAULT oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml)::INT; +BEGIN + + res.record := auth_id; + + SELECT control_set INTO cset + FROM authority.control_set_authority_field + WHERE tag IN ( SELECT UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[]) ) + LIMIT 1; + + FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset LOOP + + res.atag := acsaf.id; + tag_used := acsaf.tag; + nfi_used := acsaf.nfi; + + FOR tmp_xml IN SELECT UNNEST(XPATH('//*[@tag="'||tag_used||'"]', marcxml::XML)) LOOP + + heading_text := public.naco_normalize( + COALESCE( + oils_xpath_string('//*[contains("'||acsaf.sf_list||'",@code)]',tmp_xml::TEXT, ' '), + '' + ) + ); + + IF nfi_used IS NOT NULL THEN + + sort_text := SUBSTRING( + heading_text FROM + COALESCE( + NULLIF( + REGEXP_REPLACE( + oils_xpath_string('./@ind'||nfi_used, tmp_xml::TEXT), + $$\D+$$, + '', + 'g' + ), + '' + )::INT, + 0 + ) + 1 + ); + + ELSE + sort_text := heading_text; + END IF; + + IF heading_text IS NOT NULL AND heading_text <> '' THEN + res.value := heading_text; + res.sort_value := sort_text; + RETURN NEXT res; + END IF; + + END LOOP; + + END LOOP; + + RETURN; +END; +$func$ LANGUAGE PLPGSQL IMMUTABLE; + + +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..12027b95a2 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_5_1

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 0613a13ddf..c27c7167e4 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_5_1"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index a9543579a8..5ba81dff08 100644 --- a/Open-ILS/xul/staff_client/windowssetup.nsi +++ b/Open-ILS/xul/staff_client/windowssetup.nsi @@ -3,7 +3,7 @@ ; HM NIS Edit Wizard helper defines ; Old versions of makensis don't like this, moved to Makefile ;!define /file PRODUCT_VERSION "client/VERSION" -!define PRODUCT_TAG "Master" +!define PRODUCT_TAG "2.5" !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}" !define UI_IMAGESET "beta" ;!define UI_IMAGESET "release" diff --git a/README b/README deleted file mode 120000 index b57451acb4..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/installation/server_installation.txt \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000000..ee1fd98d2a --- /dev/null +++ b/README @@ -0,0 +1,551 @@ +Installing the Evergreen server +=============================== +:toc: +:numbered: + +Preamble: referenced user accounts +---------------------------------- + +In subsequent sections, we will refer to a number of different accounts, as +follows: + + * Linux user accounts: + ** The *user* Linux account is the account that you use to log onto the + Linux system as a regular user. + ** The *root* Linux account is an account that has system administrator + privileges. On Debian and Fedora you can switch to this account from + your *user* account by issuing the `su -` command and entering the + password for the *root* account when prompted. On Ubuntu you can switch + to this account from your *user* account using the `sudo su -` command + and entering the password for your *user* account when prompted. + ** The *opensrf* Linux account is an account that you create when installing + OpenSRF. You can switch to this account from the *root* account by + issuing the `su - opensrf` command. + ** The *postgres* Linux account is created automatically when you install + the PostgreSQL database server. You can switch to this account from the + *root* account by issuing the `su - postgres` command. + * PostgreSQL user accounts: + ** The *evergreen* PostgreSQL account is a superuser account that you will + create to connect to the PostgreSQL database server. + * Evergreen administrator account: + ** The *egadmin* Evergreen account is an administrator account for + Evergreen that you will use to test connectivity and configure your + Evergreen instance. + +Preamble: developer instructions +-------------------------------- + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +After running `make install`, developers also need to install the Dojo Toolkit +set of JavaScript libraries. The appropriate version of Dojo is included +in Evergreen release tarballs. Developers should install the Dojo 1.3.3 +version of Dojo by issuing the following commands as the *opensrf* Linux +account: + +[source, bash] +------------------------------------------------------------------------------ +wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz +tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz +cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/. +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + +Evergreen has a number of prerequisite packages that must be installed +before you can successfully configure, compile, and install Evergreen. + +1. Begin by installing the most recent version of OpenSRF (2.2.1 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/ +2. On many distributions, it is necessary to install PostgreSQL 9 from external + repositories. ++ + * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the + *root* Linux account and add the following line: ++ +[source, bash] +------------------------------------------------------------------------------ +deb http://backports.debian.org/debian-backports squeeze-backports main contrib +------------------------------------------------------------------------------ ++ + * On Ubuntu Lucid, you can use a PPA (personal package archive), which are + package sources hosted on Launchpad. The one most commonly used by Evergreen + Community members is maintained by Martin Pitt, who also maintains the + official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue + the following commands to add the PPA source: ++ +[source, bash] +------------------------------------------------------------------------------ +apt-get install python-software-properties +add-apt-repository ppa:pitti/postgresql +------------------------------------------------------------------------------ ++ + * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. ++ + * Fedora comes with PostgreSQL 9, so no additional steps are required. ++ +3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to + retrieve the new packages from the backports repository. +4. Issue the following commands as the *root* Linux account to install + prerequisites using the `Makefile.install` prerequisite installer, + substituting `debian-squeeze`, `fedora`, `ubuntu-lucid`, or + `ubuntu-precise` for below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +5. Add the libdbi-libdbd libraries to the system dynamic library path by + issuing the following commands as the *root* Linux account: ++ +[NOTE] +You should skip this step if installing on Ubuntu Precise. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ ++ +.Fedora +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ + +Configuration and compilation instructions +------------------------------------------ + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +These instructions assume that you have also installed OpenSRF under `/openils/`. +If not, please adjust PATH as needed so that the Evergreen `configure` script +can find `osrf_config`. + +Installation instructions +------------------------- + +1. Once you have configured and compiled Evergreen, issue the following + command as the *root* Linux account to install Evergreen, build the server + portion of the staff client, and copy example configuration files to + `/openils/conf`. + Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version + of the staff client that you will use to connect to the Evergreen server. ++ +[source, bash] +------------------------------------------------------------------------------ +make STAFF_CLIENT_STAMP_ID=rel_2_5_1 install +------------------------------------------------------------------------------ ++ +2. The server portion of the staff client expects `http://hostname/xul/server` + to resolve. Issue the following commands as the *root* Linux account to + create a symbolic link pointing to the `server` subdirectory of the server + portion of the staff client that we just built using the staff client ID + 'rel_name': ++ +[source, bash] +------------------------------------------------------------------------------ +cd /openils/var/web/xul +ln -sf rel_name/server server +------------------------------------------------------------------------------ + +Change ownership of the Evergreen files +--------------------------------------- + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +Configure the Apache Web server +------------------------------- + +1. Use the example configuration files in `Open-ILS/examples/apache/` (for +Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache +versions 2.4 or greater) to configure your Web server for the Evergreen +catalog, staff client, Web services, and administration interfaces. Issue the +following commands as the *root* Linux account: ++ +.Debian and Ubuntu +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/ +cp Open-ILS/examples/apache/eg_startup /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------ ++ +.Fedora +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/ +cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf +cp Open-ILS/examples/apache/eg_startup /etc/httpd/ +# Now set up SSL +mkdir /etc/httpd/ssl +cd /etc/httpd/ssl +------------------------------------------------------------------------------ ++ +2. The `openssl` command cuts a new SSL key for your Apache server. For a +production server, you should purchase a signed SSL certificate, but you can +just use a self-signed certificate and accept the warnings in the staff client +and browser during testing and development. Create an SSL key for the Apache +server by issuing the following command as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------ +openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key +------------------------------------------------------------------------------ ++ +3. As the *root* Linux account, edit the `eg.conf` file that you copied into +place. + a. To enable access to the offline upload / execute interface from any + workstation on any network, make the following change (and note that + you *must* secure this for a production instance): + * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all` + * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted` + b. (Fedora): Change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +4. Change the user for the Apache server. + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to + `export APACHE_RUN_USER=opensrf`. + * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`. + Change `User apache` to `User opensrf`. +5. Configure Apache with performance settings appropriate for Evergreen: + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/apache2.conf`: + * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`: + a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of + a request timing out unexpectedly, but increase the risk of using up + all available Apache child processes. + b. 'Optional': Change `MaxKeepAliveRequests` to `100` + c. Update the prefork configuration section to suit your environment. The + following settings apply to a busy system: ++ +[source,bash] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ ++ +6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf` + file to change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ + +Configure OpenSRF for the Evergreen application +----------------------------------------------- +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config`, described in the following section, sets the database +connection information in `opensrf.xml` for you. + +Creating the Evergreen database +------------------------------- + +By default, the `Makefile.install` prerequisite installer does not install +the PostgreSQL 9 database server required by every Evergreen system; +for production use, most libraries install the PostgreSQL database server on a +dedicated machine. You can install the packages required by Debian or Ubuntu Lucid +on the machine of your choice using the following commands as the *root* +Linux account: + +.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages + +Each OS build target provides the postgres server installation packages +required for each operating system. To install Postgres server packages, +use the make target 'postgres-server-'. Choose the most appropriate +command below based on your operating system. + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-lucid +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise +make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora +------------------------------------------------------------------------------ + +.(Fedora) Postgres initialization + +Installing Postgres on Fedora requires one additional step. + +[source, bash] +------------------------------------------------------------------------------ +postgresql-setup initdb +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules as the +*root* Linux account: + +.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +aptitude install gcc libxml-libxml-perl libxml-libxslt-perl +cpan Business::ISBN +cpan JSON::XS +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +cpan Rose::URI +------------------------------------------------------------------------------ + +.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN +yum install perl-Library-CallNumber-LC perl-MARC-Record perl-MARC-Charset +yum install perl-MARC-File-XML perl-UUID-Tiny +------------------------------------------------------------------------------ + +You need to create a PostgreSQL superuser to create and access the database. +Issue the following command as the *postgres* Linux account to create a new +PostgreSQL superuser named `evergreen`. When prompted, enter the new user's +password: + +[source, bash] +------------------------------------------------------------------------------ +createuser -s -P evergreen +------------------------------------------------------------------------------ + +Once you have created the *evergreen* PostgreSQL account, you also need to +create the database and schema, and configure your configuration files to point +at the database server. Issue the following command as the *root* Linux account +from inside the Evergreen source directory, replacing , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config --update-config \ + --service all --create-database --create-schema --create-offline \ + --user --password --hostname --port \ + --database --admin-user --admin-pass +------------------------------------------------------------------------------ + +This creates the database and schema and configures all of the services in +your `/openils/conf/opensrf.xml` configuration file to point to that database. +It also creates the configuration files required by the Evergreen `cgi-bin` +administration scripts, and sets the user name and password for the *egadmin* +Evergreen administrator account to your requested values. + +You can get a complete set of options for `eg_db_config.pl` by passing the +`--help` parameter. + +Loading sample data +~~~~~~~~~~~~~~~~~~~ +If you add the `--load-all-sample` parameter to the `eg_db_config` command, +a set of authority and bibliographic records, call numbers, copies, staff +and regular users, and transactions will be loaded into your target +database. This sample dataset is commonly referred to as the _concerto_ +sample data, and can be useful for testing out Evergreen functionality and +for creating problem reports that developers can easily recreate with their +own copy of the _concerto_ sample data. + +Creating the database on a remote server +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In a production instance of Evergreen, your PostgreSQL server should be +installed on a dedicated server. + +PostgreSQL 9.1 and later +^^^^^^^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.1 or later, simply use the `--create-database` flag on `eg_db_config`. + +Starting Evergreen +------------------ +1. As the *root* Linux account, start the `memcached` and `ejabberd` services +(if they aren't already running): ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/ejabberd start +/etc/init.d/memcached start +------------------------------------------------------------------------------ ++ +2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the +following command is only necessary if you want to force Evergreen to treat the +hostname as `localhost`; if you configured `opensrf.xml` using the real +hostname of your machine as returned by `perl -ENet::Domain 'print +Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag. ++ +[source, bash] +------------------------------------------------------------------------------ +osrf_ctl.sh -l -a start_all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_ctl.sh: command not found`, + then your environment variable `PATH` does not include the `/openils/bin` + directory; this should have been set in the *opensrf* Linux account's + `.bashrc` configuration file. To manually set the `PATH` variable, edit the + configuration file `~/.bashrc` as the *opensrf* Linux account and add the + following line: ++ +[source, bash] +------------------------------------------------------------------------------ +export PATH=$PATH:/openils/bin +------------------------------------------------------------------------------ ++ +3. As the *opensrf* Linux account, generate the Web files needed by the staff + client and catalogue and update the organization unit proximity (you need to do + this the first time you start Evergreen, and after that each time you change + the library hierarchy in `config.cgi`): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh -u +------------------------------------------------------------------------------ ++ +4. As the *root* Linux account, restart the Apache Web server: ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/apache2 restart +------------------------------------------------------------------------------ ++ +If the Apache Web server was running when you started the OpenSRF services, you +might not be able to successfully log in to the OPAC or staff client until the +Apache Web server is restarted. + +Testing connections to Evergreen +-------------------------------- + +Once you have installed and started Evergreen, test your connection to +Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following +commands to start `srfsh` and try to log onto the Evergreen server using the +*egadmin* Evergreen administrator user name and password that you set using the +`eg_db_config` command: + +[source, bash] +------------------------------------------------------------------------------ +/openils/bin/srfsh +srfsh% login +------------------------------------------------------------------------------ + +You should see a result like: + + Received Data: "250bf1518c7527a03249858687714376" + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 0.045286 + ------------------------------------ + + Received Data: { + "ilsevent":0, + "textcode":"SUCCESS", + "desc":" ", + "pid":21616, + "stacktrace":"oils_auth.c:304", + "payload":{ + "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a", + "authtime":420 + } + + } + + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 1.336568 + ------------------------------------ + +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux account, run the `settings-tester.pl` script to see + if it finds any system configuration problems. The script is found at + `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source + tree. + * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide]. + * If you have faithfully followed the entire set of installation steps + listed here, you are probably extremely close to a working system. + Gather your configuration files and log files and contact the + http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development +mailing list] for assistance before making any drastic changes to your system + configuration. + +Getting help +------------ + +Need help installing or using Evergreen? Join the mailing lists at +http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode +IRC network on the #evergreen channel. + +License +------- +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 +Unported License. To view a copy of this license, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. diff --git a/configure.ac b/configure.ac index 99370e4f2e..ce744f82e5 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.5.1, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.5.1]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])