From 448320b66f671ad072fe53b21831b238ae32d2ff Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 12 May 2008 14:23:43 +0000 Subject: [PATCH] fully moving to new dojo-ized bib_search interface. removing python code that does the same thing git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9554 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../oilsweb/oilsweb/controllers/acq/picklist.py | 22 -------- Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py | 64 ---------------------- .../oils/default/acq/picklist/navigate.js | 2 +- .../oils/default/acq/picklist/search.html | 61 --------------------- 4 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py delete mode 100644 Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py index ef1e508df6..50a29121b5 100644 --- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py +++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py @@ -92,7 +92,6 @@ class PicklistController(BaseController): 'items': items }) - def list(self): r = RequestMgr() pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(r) @@ -105,31 +104,10 @@ class PicklistController(BaseController): r.ctx.acq.picklist_list.value = pl_manager.retrieve_list(all=True) return r.render('acq/picklist/view_listall.html') - def search(self): - r = RequestMgr() - r.ctx.acq.z39_sources.value = oilsweb.lib.acq.search.fetch_z39_sources(r.ctx) - - sc = {} - for data in r.ctx.acq.z39_sources.value.values(): - for key, val in data['attrs'].iteritems(): - sc[key] = val.get('label') or key - r.ctx.acq.search_classes.value = sc - keys = sc.keys() - keys.sort() - r.ctx.acq.search_classes_sorted.value = keys - - return r.render('acq/picklist/search.html') - def bib_search(self): r = RequestMgr() return r.render('acq/picklist/bib_search.html') - def do_search(self): - r = RequestMgr() - picklist_id = oilsweb.lib.acq.search.multi_search( - r, oilsweb.lib.acq.search.compile_multi_search(r)) - return redirect_to(controller='acq/picklist', action='view', id=picklist_id) - def delete(self, **kwargs): r = RequestMgr() pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(r, picklist_id=kwargs['id']) diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py b/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py deleted file mode 100644 index f78274dd15..0000000000 --- a/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py +++ /dev/null @@ -1,64 +0,0 @@ -import os, md5, time -import pylons.config -import osrf.ses, osrf.net_obj -import oils.const, oilsweb.lib.acq.picklist - -EG_Z39_SOURCES = 'open-ils.search.z3950.retrieve_services' -EG_Z39_SEARCH = 'open-ils.search.z3950.search_class' -_z_sources = None - -def fetch_z39_sources(ctx): - global _z_sources - if _z_sources: - return _z_sources - _z_sources = osrf.ses.ClientSession.atomic_request( - oils.const.OILS_APP_SEARCH, EG_Z39_SOURCES, ctx.core.authtoken.value) - return _z_sources - -def multi_search(request_mgr, search): - ses = osrf.ses.ClientSession(oils.const.OILS_APP_SEARCH) - req = ses.request(EG_Z39_SEARCH, request_mgr.ctx.core.authtoken.value, search) - - pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(request_mgr) - picklist_id = pl_manager.create_or_replace("") - - while not req.complete: - resp = req.recv() - if not resp: - break - - res = resp.content() - for record in res['records']: - lineitem = osrf.net_obj.NetworkObject.jub() - lineitem.picklist(picklist_id) - lineitem.source_label(res['service']) - lineitem.marc(record['marcxml']) - lineitem.eg_bib_id(record.get('bibid')) - pl_manager.create_lineitem(lineitem) - - return picklist_id - -def compile_multi_search(request_mgr): - - search = { - 'service' : [], - 'username' : [], - 'password' : [], - 'search' : {}, - 'limit' : request_mgr.ctx.acq.limit.value, - 'offset' : request_mgr.ctx.acq.offset.value - } - - # collect the sources and credentials - for src in request_mgr.ctx.acq.search_source.value: - search['service'].append(src) - search['username'].append("") # XXX config values? in-db? - search['password'].append("") # XXX config values? in-db? - - # collect the search classes - for cls in request_mgr.ctx.acq.search_class.value: - if request_mgr.request.params[cls]: - search['search'][cls] = request_mgr.request.params[cls] - - return search - diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js index 0a5ca03297..4fce98d906 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js @@ -5,7 +5,7 @@ }, { label : "${_('Search Titles')}", - dest : 'acq/picklist/search', + dest : 'acq/picklist/bib_search', id : 'acq-picklist-search' } diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html deleted file mode 100644 index b5c39e16da..0000000000 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html +++ /dev/null @@ -1,61 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file='../base.html'/> -<%def name="page_title()">${_('Evergreen Acquisitions Search')} - -<%def name="block_content()"> -
-
-
-
${_('Search Sources')}
-
    -
  • ${_('Evergreen Catalog')}
    • -
  • -
    ${_("Z39.50 Sources")}
    -
      - % for src,cfg in c.oils.acq.z39_sources.value.iteritems(): -
    • - - ${src} ${cfg["host"]}:${cfg["db"]} - % if cfg['auth'] == 't': - * - % endif - -
      • - % endfor -
    -
    • -
-
-
-
${_('Search Fields')}
- - % for cls in c.oils.acq.search_classes_sorted.value: - - - - - % endfor - - - - -
${c.oils.acq.search_classes.value[cls]} - - -
${_('Results Per Source')} - -
-
- -
-
-
-
- - -- 2.11.0