Changeset 31571 for other-projects/hathitrust

Timestamp:

2017-04-03T23:23:59+12:00 (7 years ago)

Author:

davidb

Message:

Simple search-all-langs feature added

Location:

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/web-portal

Files:

• index.html (modified) (1 diff)
• index.js (modified) (6 diffs)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/web-portal/index.html

@@ -172 +172 @@
         <input type="text"   class="search-in-progress" id="q" name="q" style="width: 600px;"/>
         <input type="submit" class="search-in-progress" id="search-submit" />
-        <br><input type="checkbox" id="group-results-by-id" name="group-results-by-vol" value="on">Group by Volume
+        <br>
+          <input type="checkbox" id="group-results-by-id" name="group-results-by-vol" value="on">Group by Volume
+          <input type="checkbox" id="search-all-langs"    name="search-all-langs"     value="on">Search all Languages
         
         <div id="pos-fieldsets">

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/web-portal/index.js

@@ -406 +406 @@
         for (var li=0; li<langs_without_pos.length; li++) {
         var lang = langs_without_pos[li];
-        var lang_enabled_id = lang + "-enabled";
+        var lang_enabled_id = lang + "-enabled";
         var $lang_enabled_cb = $('#'+lang_enabled_id);
         
@@ -491 +491 @@
 
     group_by_vol_checked = $('#group-results-by-id:checked').length;
-
+    var search_all_checked = $('#search-all-langs:checked').length;
+    console.log("*** search all checked = " + search_all_checked);
     
     if (q_text === "") {
@@ -500 +501 @@
     
     var fields = [];
-    //var langs_with_pos = [ "da", "de", "en", "nl", "pt", "se" ];
     var universal_pos_tags = [ "VERB", "NOUN", "ADJ", "ADV", "ADP", "CONJ", "DET", "NUM", "PRT", "X" ];
     
@@ -514 +514 @@
         var lang_tag_id = lang+"-"+tag+"-htrctoken-cb";
         var $lang_tag_cb = $('#'+lang_tag_id);
-        if ($lang_tag_cb.is(':checked')) {
-            //var lang_tag_field = "xxxx"+lang+"_"+tag+"_htrctoken";
+        if (search_all_checked || ($lang_tag_cb.is(':checked'))) {          
             var lang_tag_field = lang+"_"+tag+"_htrctoken";
             fields.push(lang_tag_field+":"+q_text);
@@ -528 +527 @@
     var $lang_enabled_cb = $('#'+lang_enabled_id);
 
-    if ($lang_enabled_cb.is(':checked')) {
+    if (search_all_checked || ($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 = lang+"_htrctoken";
         fields.push(lang_tag_field+":"+q_text);     
@@ -537 +535 @@
 
     if (fields.length == 0) {
+    $('.search-in-progress').css("cursor","auto");
     alert("No languages selected");
     return;