[open-ils-commits] r19104 - in branches/rel_2_0/Open-ILS: src/perlmods/OpenILS/Application web/js/ui/default/vandelay web/templates/default/vandelay/inc (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2011-01-04 11:30:05 -0500 (Tue, 04 Jan 2011)
New Revision: 19104

Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
   branches/rel_2_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js
   branches/rel_2_0/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
Log:
cleaned up vestigal item import API call; repaired some faulty assumptions in vandelay UI regarding which types of import to attempt based on user input

Signed-off-by: Bill Erickson <berick at esilibrary.com>

Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm	2011-01-04 16:28:56 UTC (rev 19103)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm	2011-01-04 16:30:05 UTC (rev 19104)
@@ -998,48 +998,6 @@
     };
 }
 
-
-__PACKAGE__->register_method(  
-    api_name    => "open-ils.vandelay.bib_record.list.asset.import",
-    method      => 'noop_import_items',
-    api_level   => 1,
-    argc        => 2,
-    stream      => 1,
-    record_type => 'bib'
-);
-__PACKAGE__->register_method(  
-    api_name    => "open-ils.vandelay.bib_record.queue.asset.import",
-    method      => 'noop_import_items',
-    api_level   => 1,
-    argc        => 2,
-    stream      => 1,
-    record_type => 'bib'
-);
-
-sub noop_import_items { return {complete => 1} }
-
-#sub import_record_list_assets {
-#    my($self, $conn, $auth, $import_def, $rec_ids) = @_;
-#    my $e = new_editor(xact=>1, authtoken => $auth);
-#    return $e->die_event unless $e->checkauth;
-#    my $err = import_record_asset_list_impl($conn, $import_def, $rec_ids, $e->requestor);
-#    $e->rollback;
-#    return $err if $err;
-#    return {complete => 1};
-#}
-#
-#sub import_record_queue_assets {
-#    my($self, $conn, $auth, $import_def, $q_id) = @_;
-#    my $e = new_editor(xact=>1, authtoken => $auth);
-#    return $e->die_event unless $e->checkauth;
-#    my $rec_ids = $e->search_vandelay_queued_bib_record(
-#        {queue => $q_id, import_time => {'!=' => undef}}, {idlist => 1});
-#    my $err = import_record_asset_list_impl($conn, $import_def, $rec_ids, $e->requestor);
-#    $e->rollback;
-#    return $err if $err;
-#    return {complete => 1};
-#}
-
 # --------------------------------------------------------------------------------
 # Given a list of queued record IDs, imports all items attached to those records
 # --------------------------------------------------------------------------------

Modified: branches/rel_2_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js	2011-01-04 16:28:56 UTC (rev 19103)
+++ branches/rel_2_0/Open-ILS/web/js/ui/default/vandelay/vandelay.js	2011-01-04 16:30:05 UTC (rev 19104)
@@ -941,21 +941,6 @@
 }
 
 
-function vlImportHoldings(queueId, importProfile, onload) {
-    displayGlobalDiv('vl-generic-progress-with-total');
-    fieldmapper.standardRequest(
-        ['open-ils.vandelay', 'open-ils.vandelay.bib_record.queue.asset.import'],
-        {   async: true,
-            params: [authtoken, importProfile, queueId],
-            onresponse: function(r) {
-                var resp = openils.Util.readResponse(r);
-                vlControlledProgressBar.update({maximum:resp.total, progress:resp.progress});
-            },
-            oncomplete: function() {onload();}
-        }
-    );
-}
-
 /**
   * Create queue, upload MARC, process spool, load the newly created queue 
   */
@@ -965,23 +950,13 @@
 
     var handleProcessSpool = function() {
         if(vlUploadQueueAutoImport.checked || vlUploadQueueAutoOverlayExact.checked || vlUploadQueueAutoOverlay1Match.checked) {
-
+            var noMatchOnly = !vlUploadQueueAutoOverlayExact.checked && !vlUploadQueueAutoOverlay1Match.checked;
             vlImportRecordQueue(
                 currentType, 
                 currentQueueId, 
-                vlUploadQueueAutoImport.checked,  
+                noMatchOnly,
                 function() {
-                    if(vlUploadQueueHoldingsImport.checked) {
-                        vlImportHoldings(
-                            currentQueueId, 
-                            vlUploadQueueHoldingsImportProfile.attr('value'), 
-                            function() { 
-                                retrieveQueuedRecords(currentType, currentQueueId, handleRetrieveRecords);
-                            }
-                        );
-                    } else {
-                        retrieveQueuedRecords(currentType, currentQueueId, handleRetrieveRecords);
-                    }
+                    retrieveQueuedRecords(currentType, currentQueueId, handleRetrieveRecords);
                 }
             );
         } else {
@@ -1025,15 +1000,6 @@
     vlUploadSourceSelector.setValue(vlBibSources[0].id());
     vlUploadQueueHoldingsImportProfile.store = 
         new dojo.data.ItemFileReadStore({data:viiad.toStoreData(importItemDefs)});
-    vlUploadQueueHoldingsImportProfile.attr('disabled', true);
-    dojo.connect(vlUploadQueueHoldingsImport, 'onChange',
-        function(val) {
-            if(val)
-                vlUploadQueueHoldingsImportProfile.attr('disabled', false);
-            else
-                vlUploadQueueHoldingsImportProfile.attr('disabled', true);
-        }
-    );
 }
 
 function vlShowQueueSelect() {

Modified: branches/rel_2_0/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/vandelay/inc/upload.tt2	2011-01-04 16:28:56 UTC (rev 19103)
+++ branches/rel_2_0/Open-ILS/web/templates/default/vandelay/inc/upload.tt2	2011-01-04 16:30:05 UTC (rev 19104)
@@ -48,12 +48,6 @@
             </td>
         </tr>
         <tr>
-            <td>Import Attached Holdings</td>
-            <td colspan='4'>
-                <input jsId='vlUploadQueueHoldingsImport' dojoType='dijit.form.CheckBox'/>
-            </td>
-        </tr>
-        <tr>
             <td>Holdings Import Profile</td>
             <td>
                 <input jsId='vlUploadQueueHoldingsImportProfile'