[open-ils-commits] r16365 - in trunk/Open-ILS: src/perlmods/OpenILS/Application/Acq web/js/ui/default/acq/search web/templates/default/acq/search (senator)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Apr 30 17:18:03 EDT 2010
Author: senator
Date: 2010-04-30 17:17:57 -0400 (Fri, 30 Apr 2010)
New Revision: 16365
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Acq/Search.pm
trunk/Open-ILS/web/js/ui/default/acq/search/unified.js
trunk/Open-ILS/web/templates/default/acq/search/unified.tt2
Log:
Acq: Towards a working lineitems + bibs search, but still not really there
At least these things still need done:
1) Need to find out how to combine search terms correctly for the
open-ils.search multiclass method.
2) Need either to find out how to negate multiclass search terms or
to disable not- based searching for lineitem+bib
3) Need to make uploaded file-of-terms work.
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Acq/Search.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Acq/Search.pm 2010-04-30 20:49:28 UTC (rev 16364)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Acq/Search.pm 2010-04-30 21:17:57 UTC (rev 16365)
@@ -11,6 +11,7 @@
use OpenILS::Application::Acq::Financials;
use OpenILS::Application::Acq::Picklist;
use OpenILS::Application::Acq::Invoice;
+use OpenILS::Application::Acq::Order;
my %RETRIEVERS = (
"lineitem" =>
@@ -364,10 +365,7 @@
my $hint = F("acq::$ret_type")->{"hint"};
my $query = {
- "select" => {
- $hint =>
- [{"column" => "id", "transform" => "distinct"}]
- },
+ "select" => {$hint => [{"column" => "id", "transform" => "distinct"}]},
"from" => {
"jub" => {
"acqpo" => {
@@ -394,12 +392,18 @@
}
}
},
- "order_by" => { $hint => {"id" => {}}},
+ "order_by" => {$hint => {"id" => {}}},
"offset" => ($options->{"offset"} || 0)
};
$query->{"limit"} = $options->{"limit"} if $options->{"limit"};
+ # XXX for the future? but it doesn't quite work as is.
+# # Remove anything in temporary picklists from search results.
+# $and_terms ||= {};
+# $and_terms->{"acqpl"} ||= [];
+# push @{$and_terms->{"acqpl"}}, {"name" => "", "__not" => 1};
+
$and_terms = prepare_terms($and_terms, 1);
$or_terms = prepare_terms($or_terms, 0) and do {
$query->{"from"}->{"jub"}->{"acqlia"} = {
@@ -425,17 +429,82 @@
my $results = $e->json_query($query) or return $e->die_event;
if ($options->{"id_list"}) {
- foreach (@$results) {
- $conn->respond($_->{"id"}) if $_->{"id"};
- }
+ $conn->respond($_->{"id"}) foreach (grep { $_->{"id"} } @$results);
} else {
- foreach (@$results) {
- $conn->respond($retriever->($e, $_->{"id"}, $options))
- if $_->{"id"};
- }
+ $conn->respond($retriever->($e, $_->{"id"}, $options))
+ foreach (grep { $_->{"id"} } @$results);
}
+
$e->disconnect;
- undef;
+ $conn->respond_complete;
}
+__PACKAGE__->register_method(
+ method => "bib_search",
+ api_name => "open-ils.acq.biblio.wrapped_search",
+ stream => 1,
+ signature => {
+ desc => q/Returns new lineitems for each matching bib record/,
+ params => [
+ {desc => "Authentication token", type => "string"},
+ {desc => "search string", type => "string"},
+ {desc => "search options", type => "object"}
+ ],
+ return => {desc => "A stream of LIs on success, Event on failure"}
+ }
+);
+
+# This is very similar to zsearch() in Order.pm
+sub bib_search {
+ my ($self, $conn, $auth, $search, $options) = @_;
+
+ my $e = new_editor("authtoken" => $auth, "xact" => 1);
+ return $e->die_event unless $e->checkauth;
+ return $e->die_event unless $e->allowed("CREATE_PICKLIST");
+
+ my $mgr = new OpenILS::Application::Acq::BatchManager(
+ "editor" => $e, "conn" => $conn
+ );
+
+ $options ||= {};
+ $options->{"limit"} ||= 10;
+
+ my $ses = create OpenSRF::AppSession("open-ils.search");
+ my $req = $ses->request(
+ "open-ils.search.biblio.multiclass.query.staff", $options, $search
+ );
+
+ my $count = 0;
+ my $picklist;
+ while (my $resp = $req->recv("timeout" => 60)) {
+ $picklist = OpenILS::Application::Acq::Order::zsearch_build_pl(
+ $mgr, undef # XXX could have per-user name for temp picklist here?
+ ) unless $count++;
+
+ my $result = $resp->content;
+
+ # The result object contains a whole heck of a lot more information
+ # than just bib IDs, so maybe we could tell the client something
+ # useful (progress meter at least) in the future...
+ foreach my $id (@{$result->{"ids"}}) {
+ $id = $id->[0];
+ $conn->respond(
+ $RETRIEVERS{"lineitem"}->(
+ $e, OpenILS::Application::Acq::Order::create_lineitem(
+ $mgr,
+ "picklist" => $picklist->id,
+ "source_label" => $resp->content->{"service"},
+ "marc" => $e->retrieve_biblio_record_entry($id)->marc,
+ "eg_bib_id" => $id
+ )->id, $options
+ )
+ );
+ }
+ }
+
+ $ses->disconnect;
+ $e->commit;
+ $conn->respond_complete;
+}
+
1;
Modified: trunk/Open-ILS/web/js/ui/default/acq/search/unified.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/search/unified.js 2010-04-30 20:49:28 UTC (rev 16364)
+++ trunk/Open-ILS/web/js/ui/default/acq/search/unified.js 2010-04-30 21:17:57 UTC (rev 16365)
@@ -11,7 +11,6 @@
var uriManager;
var pcrud = new openils.PermaCrud();
var cgi = new openils.CGI();
-var keys = openils.Util.objectProperties;
/* typing save: add {get,set}Value() to all HTML <select> elements */
HTMLSelectElement.prototype.getValue = function() {
@@ -88,6 +87,7 @@
},
"valueToTerm": function(value) {
var parts = value.split(":");
+ if (!parts || parts.length != 2) return null;
return dojo.mixin(
self.terms[parts[0]][parts[1]],
{"hint": parts[0], "field": parts[1]}
@@ -208,7 +208,14 @@
function TermManager() {
var self = this;
- this.bibFriendlyAttrNames = ["author", "title", "isbn", "issn", "upc"];
+ /* All the keys in this object are bib-search-friendly attributes, but the
+ * boolean values indicate whether they should be searched by their
+ * field name as such, or simply mapped to "keyword". */
+ this.bibFriendlyAttrNames = {
+ "author": true, "title": true,
+ "isbn": false, "issn": false, "upc": false
+ };
+
this.terms = {};
["jub", "acqpl", "acqpo", "acqinv"].forEach(
function(hint) {
@@ -230,13 +237,16 @@
this.terms.acqlia = {"__label": fieldmapper.IDL.fmclasses.acqlia.label};
pcrud.retrieveAll("acqliad", {"order_by": {"acqliad": "id"}}).forEach(
function(def) {
- var o = {
+ self.terms.acqlia[def.id()] = {
"label": def.description(),
"datatype": "text",
"bib_friendly":
- (self.bibFriendlyAttrNames.indexOf(def.code()) >= 0)
+ (typeof(self.bibFriendlyAttrNames[def.code()]) !=
+ "undefined"),
+ "bib_attr_name":
+ self.bibFriendlyAttrNames[def.code()] ?
+ def.code() : "keyword"
};
- self.terms.acqlia[def.id()] = o;
}
);
@@ -254,6 +264,11 @@
self.resultTypeChange(this.getValue());
};
+ this.allRowIds = function() {
+ return dojo.query("tr[id^='term-row-']", "acq-unified-terms-tbody").
+ map(function(o) { return o.id.match(/^term-row-(\d+)$/)[1]; });
+ };
+
this._row = function(id) { return dojo.byId("term-row-" + id); };
this._selector = function(id) { return dojo.byId("term-" + id); };
this._match_how = function(id) { return dojo.byId("term-match-" + id); };
@@ -330,33 +345,40 @@
) {
/* Re-enable all non-bib-friendly fields in all search term
* field selectors. */
- keys(this.widgets).forEach(
+ this.allRowIds().forEach(
function(id) { self._selector(id).onlyBibFriendly(false); }
);
/* Tell the selector factory to create new search term field
* selectors with all fields, not just bib-friendly ones. */
this.selectorFactory.onlyBibFriendly = false;
+ /* Allow either "any" or "all" searching. */
+ dojo.byId("acq-unified-conjunction").options[1].disabled = false;
} else if (
this.lastResultType != "lineitem_and_bib" &&
resultType == "lineitem_and_bib"
) {
/* Remove all search term rows set to non-bib-friendly fields. */
- keys(this.widgets).forEach(
+ this.allRowIds().forEach(
function(id) {
var term = self._selector(id).getTerm();
- if (!self.terms[term.hint][term.field].bib_friendly) {
+ if (!term ||
+ !self.terms[term.hint][term.field].bib_friendly) {
self.removeRow(id);
}
}
);
/* Disable all non-bib-friendly fields in all remaining search term
* field selectors. */
- keys(this.widgets).forEach(
+ this.allRowIds().forEach(
function(id) { self._selector(id).onlyBibFriendly(true); }
);
/* Tell the selector factory to create new search term field
* selectors with only bib friendly options. */
this.selectorFactory.onlyBibFriendly = true;
+ /* Force an "any" search; I'm not sure we can do "all"
+ * searches yet. */
+ dojo.byId("acq-unified-conjunction").selectedIndex = 0;
+ dojo.byId("acq-unified-conjunction").options[1].disabled = true;
}
this.lastResultType = resultType;
};
@@ -493,6 +515,21 @@
}
return so;
};
+
+ this.buildBibSearchString = function() {
+ var sso = {};
+ for (var id in this.widgets) {
+ var term = this._selector(id).getTerm();
+ var attr = term.bib_attr_name;
+
+ if (!sso[attr]) sso[attr] = [];
+ sso[attr].push(this.widgets[id].value);
+ }
+ var ssa = [];
+ for (var attr in sso)
+ ssa.push(attr + ": " + sso[attr].join(" || "));
+ return ssa.join(" || ");
+ };
}
/* The result manager is used primarily when the users submits a search. It
@@ -615,16 +652,31 @@
"&c=" + dojo.byId("acq-unified-conjunction").getValue();
};
- this.search = function(search_object) {
+ this.search = function(search_object, bib_search_string) {
var count_results = 0;
+ var tasks = 1;
+ var bibs_too = false;
var result_type = dojo.byId("acq-unified-result-type").getValue();
var conjunction = dojo.byId("acq-unified-conjunction").getValue();
+ /* lineitem_and_bib: a special case */
+ if (result_type == "lineitem_and_bib") {
+ result_type = "lineitem";
+ tasks++;
+ bibs_too = true;
+ }
+
+ function result_completion() {
+ if (!count_results)
+ self.show("no_results");
+ else
+ self.finish(result_type);
+ }
+
var method_name = "open-ils.acq." + result_type + ".unified_search";
/* Except for building the API method name that we want to call,
* we want to treat lineitem_and_bib the same way as lineitem from
* here forward. */
- result_type = result_type.replace(/_and_bib/, "");
var params = [
openils.User.authtoken,
@@ -646,13 +698,34 @@
}
},
"oncomplete": function() {
- if (!count_results)
- self.show("no_results");
- else
- self.finish(result_type);
+ if (tasks > 1) tasks--;
+ else result_completion();
}
}
);
+
+ if (bibs_too) {
+ fieldmapper.standardRequest(
+ ["open-ils.acq", "open-ils.acq.biblio.wrapped_search"], {
+ "params": [
+ openils.User.authtoken,
+ bib_search_string,
+ this.result_types.lineitem.search_options
+ ],
+ "async": true,
+ "onresponse": function(r) {
+ if (r = openils.Util.readResponse(r)) {
+ if (!count_results++) self.show("lineitem");
+ self.add("lineitem", r);
+ }
+ },
+ "oncomplete": function() {
+ if (tasks > 1) tasks--;
+ else result_completion();
+ }
+ }
+ );
+ }
}
}
@@ -664,8 +737,10 @@
this.search_object = base64Decode(this.search_object);
this.result_type = cgi.param("rt");
- if (this.result_type)
+ if (this.result_type) {
dojo.byId("acq-unified-result-type").setValue(this.result_type);
+ dojo.byId("acq-unified-result-type").onchange();
+ }
this.conjunction = cgi.param("c");
if (this.conjunction)
@@ -688,7 +763,9 @@
hideForm();
openils.Util.show("acq-unified-body");
termManager.reflect(uriManager.search_object);
- resultManager.search(uriManager.search_object);
+ resultManager.search(
+ uriManager.search_object, termManager.buildBibSearchString()
+ );
} else {
termManager.addRow();
openils.Util.show("acq-unified-body");
Modified: trunk/Open-ILS/web/templates/default/acq/search/unified.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/search/unified.tt2 2010-04-30 20:49:28 UTC (rev 16364)
+++ trunk/Open-ILS/web/templates/default/acq/search/unified.tt2 2010-04-30 21:17:57 UTC (rev 16365)
@@ -146,11 +146,11 @@
<option value="">is</option>
<option value="__not">is NOT</option>
<option value="__fuzzy" disabled="disabled">
- contains
+ contains the term
</option>
<option value="__not,__fuzzy"
disabled="disabled">
- does NOT contain
+ does NOT contain the term
</option>
<option value="__lte" disabled="disabled">
is on or BEFORE
More information about the open-ils-commits
mailing list