From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 11 Mar 2010 23:38:32 +0000 (+0000)
Subject: added auto-overlay-exact option to queue import
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=365dacb3545f8d763cdf0c16a0e988cccfe8487a;p=evergreen%2Ftadl.git

added auto-overlay-exact option to queue import

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15814 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index cb0b2ff02d..5c2ab31b91 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -825,10 +825,16 @@ function vlImportRecordQueue(type, queueId, noMatchOnly, onload) {
     if(type == 'auth')
         method = method.replace('bib', 'auth');
 
+    var options = {};
+    if(vlUploadQueueAutoOverlayExact.checked) {
+        options.auto_overlay_exact = true;
+        vlUploadQueueAutoOverlayExact.checked = false;
+    }
+
     fieldmapper.standardRequest(
         ['open-ils.vandelay', method],
         {   async: true,
-            params: [authtoken, queueId],
+            params: [authtoken, queueId, options],
             onresponse: function(r) {
                 var resp = r.recv().content();
                 if(e = openils.Event.parse(resp))
@@ -864,8 +870,12 @@ function batchUpload() {
     currentType = dijit.byId('vl-record-type').getValue();
 
     var handleProcessSpool = function() {
-        if(vlUploadQueueAutoImport.checked) {
-            vlImportRecordQueue(currentType, currentQueueId, true,  
+        if(vlUploadQueueAutoImport.checked || vlUploadQueueAutoOverlayExact.checked) {
+
+            vlImportRecordQueue(
+                currentType, 
+                currentQueueId, 
+                vlUploadQueueAutoImport.checked,  
                 function() {
                     if(vlUploadQueueHoldingsImport.checked) {
                         vlImportHoldings(
diff --git a/Open-ILS/web/opac/locale/en-US/vandelay.dtd b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
index 93e07f2017..8f0ca15bf5 100644
--- a/Open-ILS/web/opac/locale/en-US/vandelay.dtd
+++ b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
@@ -2,6 +2,7 @@
 <!ENTITY vandelay.auth.attrs "Authority attributes">
 <!ENTITY vandelay.auth.records "Authority Records">
 <!ENTITY vandelay.auto.import.noncolliding "Auto-Import Non-Colliding Records">
+<!ENTITY vandelay.auto.import.auto_overlay_exact "Auto Merge/Overlay Exact Matches">
 <!ENTITY vandelay.auto.width "Auto Width">
 <!ENTITY vandelay.back.to.import.queue "Back To Import Queue">
 <!ENTITY vandelay.bib.attrs "Bibliographic attributes">
diff --git a/Open-ILS/web/templates/default/vandelay/inc/upload.tt2 b/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
index f3802291d9..8691c4dce2 100644
--- a/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
+++ b/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
@@ -30,6 +30,12 @@
             </td>
         </tr>
         <tr>
+            <td>&vandelay.auto.import.auto_overlay_exact;</td>
+            <td colspan='4'>
+                <input jsId='vlUploadQueueAutoOverlayExact' dojoType='dijit.form.CheckBox'/>
+            </td>
+        </tr>
+        <tr>
             <td>Import Attached Holdings</td>
             <td colspan='4'>
                 <input jsId='vlUploadQueueHoldingsImport' dojoType='dijit.form.CheckBox'/>