1) {
+
+ if (pi==0) {
+ html_item += '';
+ html_item += 'Loading ...
';
+
+
+ html_item += id + ': page ' + page + ' ';
+ }
+ else {
+ html_item += ', page ' + page + ' ';
+
+ //var result_item = '' + id + ', page ' + page + '';
+ //result_item += ' Loading ...';
+ //html_item += '
'+result_item+'
';
+ }
+ }
+ else {
+ html_item += '';
+ html_item += ' Loading ...
';
+ html_item += '' + id + ', page ' + page + '';
+ html_item += '
';
+ }
+
+ }
+
+ if (id_pages_len>1) {
+ html_item += "";
+ }
+
+ return html_item;
+}
+
function show_results(jsonData) {
var response = jsonData.response;
@@ -61,13 +111,16 @@
var num_docs = docs.length;
+ $('.search-in-progress').css("cursor","auto");
+
var $search_results = $('#search-results');
+
if (num_docs>0) {
- $search_results.html("Results: " + num_found + " volumes/documents matched
");
- var from = parseInt(store_search_args.start)+1;
+ $search_results.html("Results: " + num_found + " pages matched
");
+ var from = parseInt(store_search_args.start);
var to = from + num_rows;
$search_results.append("Showing matches: "+from+"-" + to + "
");
}
else {
- $search_results.html("No volumes/documents matched your query
");
+ $search_results.html("No pages matched your query
");
}
@@ -76,25 +129,49 @@
var htids = [];
-
- for (var i=0; i' + id + ', page ' + page + '';
- result_item += ' Loading ...';
- $search_results.append(''+result_item+'
');
+ var seqnum = parseInt(id_and_page[1]);
+ var page = seqnum+1;
+
+ if ((prev_id != null) && (id != prev_id)) {
+ // time to output previous item
+ var html_item = generate_item(line_num,prev_id,prev_pages);
+ $search_results.append(html_item);
+ line_num++;
+ prev_pages = [page];
+ }
+ else {
+ // accumulate pages
+ prev_pages.push(page)
+ }
+
+// var css_class = (i%2 == 0) ? 'class="evenline"' : 'class="oddline"';
+// //var restful_safe_id = id.replace(/\./g,",").replace(/:/g, "+").replace(/\//g, "=");
+
+// var babel_url = "https://babel.hathitrust.org/cgi/pt?id="+id+";view=1up;seq="+seqnum;
+
+// var result_item = '' + id + ', page ' + page + '';
+// result_item += ' Loading ...';
+// $search_results.append(''+result_item+'
');
htids.push("htid:"+id);
- }
-
+ prev_id = id;
+ i++;
+ }
+
+ var html_item = generate_item(line_num,prev_id,prev_pages);
+ $search_results.append(html_item);
+
+
document.location.href="#search-results-anchor";
@@ -129,8 +206,12 @@
var store_search_action = null;
+var group_by_vol_checked = 0;
+
function submit_action(event)
{
event.preventDefault();
+ $('.search-in-progress').css("cursor","wait");
+
store_search_action = $('#search-form').attr("action");
@@ -140,6 +221,10 @@
var arg_rows = $('#rows').attr('value');
var q_text = $('#q').val();
+
+ group_by_vol_checked = $('#group-results-by-id:checked').length;
+
if (q_text === "") {
+ $('.search-in-progress').css("cursor","auto");
alert("No query term entered");
return;
@@ -162,5 +247,6 @@
var $lang_tag_cb = $('#'+lang_tag_id);
if ($lang_tag_cb.is(':checked')) {
- var lang_tag_field = "xxxx"+lang+"_"+tag+"_htrctoken";
+ //var lang_tag_field = "xxxx"+lang+"_"+tag+"_htrctoken";
+ var lang_tag_field = lang+"_"+tag+"_htrctoken";
fields.push(lang_tag_field+":"+q_text);
}
@@ -176,5 +262,6 @@
if ($lang_enabled_cb.is(':checked')) {
console.log("Adding in non-POS field for: " + lang);
- var lang_tag_field = "xxxx"+lang+"_htrctoken";
+ //var lang_tag_field = "xxxx"+lang+"_htrctoken";
+ var lang_tag_field = lang+"_htrctoken";
fields.push(lang_tag_field+":"+q_text);
}
@@ -190,7 +277,12 @@
// Example search on one of the htrc-full-ef fields is:
- // q=xxxxen_NOUN_htrctoken:farming
+ // q=en_NOUN_htrctoken:farming
store_search_args = { q: arg_q, indent: arg_indent, wt: arg_wt, start: arg_start, rows: arg_rows };
+
+ if (group_by_vol_checked) {
+ store_search_args.sort="id asc";
+ }
+
$.ajax({
@@ -255,5 +347,11 @@
var fieldset = "";
- fieldset += '