From 1f8c5adf353e679e8683e7ef69932a0ab5902958 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Mon, 23 May 2011 10:15:52 -0400 Subject: [PATCH] Bumping version numbers and... Reapplication of: Address LP#779975; Status of Available (0) not honored because 0==false -- use ternary op with defined() instead git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20454 dcc99617-32d9-48b4-a31d-7c20da2025e4 (cherry picked from commit 2d96fea0800a99092acdc97330b33b3d421f3098) Signed-off-by: Mike Rylander --- Open-ILS/src/perlmods/OpenILS/Application.pm | 2 +- Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm | 2 -- Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + README | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application.pm b/Open-ILS/src/perlmods/OpenILS/Application.pm index 8b77ab03dd..1ff8648539 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application.pm @@ -5,7 +5,7 @@ use base qw/OpenSRF::Application/; sub ils_version { # version format is "x-y-z-p", for example "1-2-1-0" for Evergreen 1.2.1.0 - return "1-6"; + return "1-6-2-4"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm index d27e6a82de..343eae6530 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm @@ -196,10 +196,8 @@ sub calc_proximity { actor.org_unit r; SQL - $self->method_lookup('open-ils.storage.transaction.begin')->run; actor::org_unit_proximity->db_Main->do($delete_sql); actor::org_unit_proximity->db_Main->do($insert_sql); - $self->method_lookup('open-ils.storage.transaction.commit')->run; return 1; } diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm index 570eeab249..35287a97c6 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm @@ -928,7 +928,7 @@ sub import_record_asset_list_impl { $copy->barcode($item->barcode); $copy->location($item->location); $copy->circ_lib($item->circ_lib || $item->owning_lib); - $copy->status($item->status || OILS_COPY_STATUS_IN_PROCESS); + $copy->status( defined($item->status) ? $item->status : OILS_COPY_STATUS_IN_PROCESS ); $copy->circulate($item->circulate); $copy->deposit($item->deposit); $copy->deposit_amount($item->deposit_amount); diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 46a7ad57e9..48fc73e612 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -51,6 +51,7 @@ CREATE TABLE config.upgrade_log ( install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() ); +INSERT INTO config.upgrade_log (version) VALUES ('1.6.2.4'); INSERT INTO config.upgrade_log (version) VALUES ('0485'); -- dbs CREATE TABLE config.bib_source ( diff --git a/README b/README index 0243787daf..66aa634e40 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for Evergreen 1.6 +README for Evergreen 1.6.2.4 Installing prerequisites: ======================== @@ -40,7 +40,7 @@ Installation instructions: Once you have configured and compiled Evergreen, issue the following command as the root user to install Evergreen: -make STAFF_CLIENT_BUILD_ID=rel_1_6_0_0 install +make STAFF_CLIENT_BUILD_ID=rel_1_6_2_4 install This will install Evergreen, including example configuration files in /openils/conf/ that you can use as templates for your own configuration files. -- 2.11.0