using new ml search aggregator method

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9624 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/picklist/bib_search.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/picklist/bib_search.js
index 3b4ef40..3785c34 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/picklist/bib_search.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/picklist/bib_search.js
@@ -38,7 +38,6 @@ function drawForm() {
         }
     );
 
-    //alert(dojo.query('[name=label]', 'oils-acq-search-fields-template'));
     var tbody = dojo.byId('oils-acq-search-fields-tbody');
     var tmpl = tbody.removeChild(dojo.byId('oils-acq-search-fields-template'));
 
@@ -83,63 +82,19 @@ function doSearch(values) {
     }
 
     fieldmapper.standardRequest(
-        ['open-ils.search', 'open-ils.search.z3950.search_class'],
+        ['open-ils.acq', 'open-ils.acq.picklist.search.z3950'],
         {   async: true,
             params: [user.authtoken, search],
             onresponse: handleResult,
-            oncomplete: viewPicklist
         }
     );
 }
 
 function handleResult(r) {
     var result = r.recv().content();
-    if(!resultPicklist)
-        createResultPicklist();
-
-    searchProgress.update({maximum: sourceCount*searchLimit+1, progress: ++recvCount});
-
-    for(var idx in result.records) {
-        searchProgress.update({progress: ++recvCount});
-        var rec = result.records[idx];
-        var lineitem =  new jub()
-
-        lineitem.picklist(resultPicklist.id());
-        lineitem.source_label(result.service)
-        lineitem.marc(rec.marcxml)
-        lineitem.eg_bib_id(rec.bibid)
-
-        var id = fieldmapper.standardRequest(
-            ['open-ils.acq', 'open-ils.acq.lineitem.create'],
-            [user.authtoken, lineitem]
-        );
-    }
-}
-
-function createResultPicklist() {
-    resultPicklist = new acqpl();
-    resultPicklist.name('');
-    resultPicklist.owner(user.user.id());
-
-    /* delete the old picklist with name = '' */
-    var pl = fieldmapper.standardRequest(
-        ['open-ils.acq', 'open-ils.acq.picklist.name.retrieve'],
-        [user.authtoken, '']
-    );
-
-    if(pl) {
-        fieldmapper.standardRequest(
-            ['open-ils.acq', 'open-ils.acq.picklist.delete'],
-            [user.authtoken, pl.id()]
-        );
-    }
-
-    resultPicklist.id(
-        fieldmapper.standardRequest(
-            ['open-ils.acq', 'open-ils.acq.picklist.create'],
-            [user.authtoken, resultPicklist]
-        )
-    );
+    if(result.complete)
+        return viewPicklist(result.picklist_id);
+    searchProgress.update({maximum: result.total, progress: result.progress});
 }
 
 dojo.addOnLoad(drawForm);

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
index 1cf2e08..efa95a9 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
@@ -12,8 +12,8 @@
     <script>
         var searchLimit = ${c.oils.acq.limit.value} || 10;
         var searchOffset = ${c.oils.acq.offset.value} || 0;
-        function viewPicklist() {
-            location.href = '${c.oils.acq.prefix.value}/picklist/view/' + resultPicklist.id();
+        function viewPicklist(id) {
+            location.href = '${c.oils.acq.prefix.value}/picklist/view/' + id;
         }
     </script>