From 0e43a8f89835c166468956031f3194a5ab8051f0 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 5 Sep 2008 12:05:24 +0000
Subject: [PATCH] cleaning up the Evergreen repo area; adding Overlay as an
 option to Vandelay upload; fix thinko in in-db circ to load the circ test

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10540 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../src/extras/import/quick_metarecord_map.sql                  | 0
 {Evergreen => Open-ILS}/src/extras/import/user_import.pl        | 0
 {Evergreen => Open-ILS}/src/extras/report-fail                  | 0
 {Evergreen => Open-ILS}/src/extras/report-success               | 0
 Open-ILS/src/sql/Pg/100.circ_matrix.sql                         | 2 ++
 .../import => Open-ILS/src/support-scripts}/object_dumper.pl    | 0
 Open-ILS/web/vandelay/vandelay.html                             | 1 +
 7 files changed, 3 insertions(+)
 rename {Evergreen => Open-ILS}/src/extras/import/quick_metarecord_map.sql (100%)
 rename {Evergreen => Open-ILS}/src/extras/import/user_import.pl (100%)
 rename {Evergreen => Open-ILS}/src/extras/report-fail (100%)
 rename {Evergreen => Open-ILS}/src/extras/report-success (100%)
 rename {Evergreen/src/extras/import => Open-ILS/src/support-scripts}/object_dumper.pl (100%)

diff --git a/Evergreen/src/extras/import/quick_metarecord_map.sql b/Open-ILS/src/extras/import/quick_metarecord_map.sql
similarity index 100%
rename from Evergreen/src/extras/import/quick_metarecord_map.sql
rename to Open-ILS/src/extras/import/quick_metarecord_map.sql
diff --git a/Evergreen/src/extras/import/user_import.pl b/Open-ILS/src/extras/import/user_import.pl
similarity index 100%
rename from Evergreen/src/extras/import/user_import.pl
rename to Open-ILS/src/extras/import/user_import.pl
diff --git a/Evergreen/src/extras/report-fail b/Open-ILS/src/extras/report-fail
similarity index 100%
rename from Evergreen/src/extras/report-fail
rename to Open-ILS/src/extras/report-fail
diff --git a/Evergreen/src/extras/report-success b/Open-ILS/src/extras/report-success
similarity index 100%
rename from Evergreen/src/extras/report-success
rename to Open-ILS/src/extras/report-success
diff --git a/Open-ILS/src/sql/Pg/100.circ_matrix.sql b/Open-ILS/src/sql/Pg/100.circ_matrix.sql
index 1aa7d69f81..50593513f0 100644
--- a/Open-ILS/src/sql/Pg/100.circ_matrix.sql
+++ b/Open-ILS/src/sql/Pg/100.circ_matrix.sql
@@ -288,6 +288,8 @@ BEGIN
 	SELECT INTO matchpoint_id action.find_circ_matrix_matchpoint(circ_ou, match_item, match_user, renewal);
 	result.matchpoint := matchpoint_id;
 
+	SELECT INTO circ_test * from config.circ_matrix_test WHERE matchpoint = result.matchpoint;
+
 	-- Fail if we couldn't find a set of tests
 	IF result.matchpoint IS NULL THEN
 		result.fail_part := 'no_matchpoint';
diff --git a/Evergreen/src/extras/import/object_dumper.pl b/Open-ILS/src/support-scripts/object_dumper.pl
similarity index 100%
rename from Evergreen/src/extras/import/object_dumper.pl
rename to Open-ILS/src/support-scripts/object_dumper.pl
diff --git a/Open-ILS/web/vandelay/vandelay.html b/Open-ILS/web/vandelay/vandelay.html
index 415a6a2e79..c83303b74e 100644
--- a/Open-ILS/web/vandelay/vandelay.html
+++ b/Open-ILS/web/vandelay/vandelay.html
@@ -73,6 +73,7 @@
                         <td>
                             <select name='purpose' dojoType='dijit.form.FilteringSelect'>
                                 <option value='import'>Import</option>
+                                <option value='overlay'>Overlay</option>
                             </select>
                         </td>
                     </tr>
-- 
2.43.2