From: Lebbeous Fogle-Weekley Date: Tue, 28 Jun 2011 19:28:40 +0000 (-0400) Subject: closer to being able to get authority control set from thesaurus code X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a2cc05f1b71553bb1e8c8619e2ef916e3a28b8e5;p=evergreen%2Fequinox.git closer to being able to get authority control set from thesaurus code Signed-off-by: Lebbeous Fogle-Weekley --- diff --git a/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js b/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js index 9284094e2d..1de80d105f 100644 --- a/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js +++ b/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js @@ -162,8 +162,23 @@ if(!dojo._hasResource["openils.AuthorityControlSet"]) { } }, - _preFetchWithFielder: function(map) { - // TODO get pkeys from fieldmapper but use fielder to get everything + _preFetchWithFielder: function(cmap) { + for (var hint in cmap) { + var cache_key = cmap[hint]; + var method = "open-ils.fielder." + hint + ".atomic"; + var pkey = fieldmapper.IDL.fmclasses[hint].pkey; + + var query = {}; + query[pkey] = {"!=": null}; + + openils.AuthorityControlSet[cache_key] = dojo.map( + fieldmapper.standardRequest( + ["open-ils.fielder", method], + [{"cache": 1, "query" : query}] + ), + function(h) { return new fieldmapper[hint]().fromHash(h); } + ); + } }, controlSetId: function (x) { @@ -176,13 +191,13 @@ if(!dojo._hasResource["openils.AuthorityControlSet"]) { }, controlSetByThesaurusCode: function (x) { - console.log("1"); var thes = dojo.filter( openils.AuthorityControlSet._thesaurus_list, function (at) { return at.code() == x } )[0]; - console.log("2"); + console.log("thes is " + thes); + console.log("thes.controlSet() returns " + thes.controlSet()); return this.controlSet(thes.controlSet()); }, diff --git a/Open-ILS/web/opac/skin/default/js/authbrowse.js b/Open-ILS/web/opac/skin/default/js/authbrowse.js index 3aa8f2fb36..5fcb5ecf68 100644 --- a/Open-ILS/web/opac/skin/default/js/authbrowse.js +++ b/Open-ILS/web/opac/skin/default/js/authbrowse.js @@ -42,9 +42,7 @@ function displayAuthorityRecords(doc) { function(record) { console.log("record"); var m = new MARC.Record({"xml": record}); - console.log("got m"); var s = m.extractFixedField("Subj"); - console.log("got s"); var cs = acs_helper.controlSetByThesaurusCode(s); console.log("got cs"); dojo.create( diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml index 498e5df7ee..4fc46053a2 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml @@ -5,7 +5,7 @@ type='text/javascript'>