Changeset 5015

Timestamp:

04/22/14 08:14:00 (10 years ago)

Author:

Twan Goosen

Message:

added search word highlighting to record page

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (added)
• java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) (5 diffs)
• resources/eu/clarin/cmdi/vlo/wicket/pages/clarin-d/colour.css (modified) (1 diff)
• resources/eu/clarin/cmdi/vlo/wicket/pages/colour.css (modified) (1 diff)
• resources/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (copied) (copied from vlo/tags/vlo-2.18/vlo_web_app/src/main/webapp/javascript/searchhi.js) (1 diff)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -23 +23 @@
 import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
+import eu.clarin.cmdi.vlo.wicket.HighlightSearchTermBehavior;
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
@@ -62 +63 @@
 public class RecordPage extends VloBasePage<SolrDocument> {
 
-    @SpringBean(name="documentParamsConverter")
+    @SpringBean(name = "documentParamsConverter")
     private PageParametersConverter<SolrDocument> documentParamConverter;
-    @SpringBean(name="queryParametersConverter")
+    @SpringBean(name = "queryParametersConverter")
     private PageParametersConverter<QueryFacetsSelection> selectionParametersConverter;
-    @SpringBean(name="searchContextParamsConverter")
+    @SpringBean(name = "searchContextParamsConverter")
     private PageParametersConverter<SearchContext> contextParamConverter;
     @SpringBean(name = "basicPropertiesFilter")
@@ -113 +114 @@
 
         addComponents();
+        add(new HighlightSearchTermBehavior());
     }
 
@@ -225 +227 @@
         final IModel<String> locationModel = new SolrFieldStringModel(getModel(), FacetConstants.FIELD_FILENAME);
         final UrlFromStringModel locationUrlModel = new UrlFromStringModel(locationModel);
-        return new TogglePanel(id, Model.of("Show all metadata fields"), Model.of("Hide all metadata fields")) {
+        final TogglePanel togglePanel = new TogglePanel(id, Model.of("Show all metadata fields"), Model.of("Hide all metadata fields")) {
 
             @Override
@@ -234 +236 @@
             }
         };
+        // highlight search terms when panel becomes visible
+        togglePanel.add(new HighlightSearchTermBehavior());
+        return togglePanel;
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/clarin-d/colour.css

@@ -115 +115 @@
 }
 
+#record .attributeValues .searchword, #recordcmdi .searchword {
+    background: yellow;
+}
+
 li.searchresultitem:nth-child(even), #record .recorddetailstable tr:nth-child(odd) {
     background: #f1f3f6;

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/colour.css

@@ -107 +107 @@
 }
 
+#record .attributeValues .searchword, #recordcmdi .searchword {
+    background: yellow;
+}
+
 li.searchresultitem:nth-child(even), #record .recorddetailstable tr:nth-child(odd) {
     background: #ccd6e8;

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js

@@ -4 +4 @@
 /* Modified 20081217 to do in-page searching and wrap up in an object */
 /* Modified 20081218 to scroll to first hit like 
-   http://www.woolyss.free.fr/js/searchhi_Woolyss.js and say when not found */
+ http://www.woolyss.free.fr/js/searchhi_Woolyss.js and say when not found */
 /* Modified 20120112 to use the URL instead of referrer */
 
 searchhi = {
-  highlightWord: function(node,word) {
-    // Iterate into this nodes childNodes
-    if (node.hasChildNodes) {
-            for (var hi_cn=0;hi_cn<node.childNodes.length;hi_cn++) {
-                    searchhi.highlightWord(node.childNodes[hi_cn],word);
-            }
+    highlightWord: function(node, word) {
+        // Iterate into this nodes childNodes
+        if (node.hasChildNodes) {
+            for (var hi_cn = 0; hi_cn < node.childNodes.length; hi_cn++) {
+                searchhi.highlightWord(node.childNodes[hi_cn], word);
+            }
+        }
+
+        // And do this node itself
+        if (node.nodeType == 3) { // text node
+            tempNodeVal = node.nodeValue.toLowerCase();
+            tempWordVal = word.toLowerCase();
+            if (tempNodeVal.indexOf(tempWordVal) != -1) {
+                var pn = node.parentNode;
+                // check if we're inside a "nosearchhi" zone
+                var checkn = pn;
+                while (checkn.nodeType != 9 &&
+                        checkn.nodeName.toLowerCase() != 'body') {
+                    // 9 = top of doc
+                    if (checkn.className.match(/\bnosearchhi\b/)) {
+                        return;
+                    }
+                    checkn = checkn.parentNode;
+                }
+                if (pn.className != "searchword") {
+                    // word has not already been highlighted!
+                    var nv = node.nodeValue;
+                    var ni = tempNodeVal.indexOf(tempWordVal);
+                    // Create a load of replacement nodes
+                    var before = document.createTextNode(nv.substr(0, ni));
+                    var docWordVal = nv.substr(ni, word.length);
+                    var after = document.createTextNode(nv.substr(ni + word.length));
+                    var hiwordtext = document.createTextNode(docWordVal);
+                    var hiword = document.createElement("span");
+                    hiword.className = "searchword";
+                    hiword.appendChild(hiwordtext);
+                    pn.insertBefore(before, node);
+                    pn.insertBefore(hiword, node);
+                    pn.insertBefore(after, node);
+                    pn.removeChild(node);
+                    searchhi.found += 1;
+                    if (searchhi.found == 1)
+                        pn.scrollIntoView();
+                }
+            }
+        }
+    },
+    googleSearchHighlight: function() {
+        var ref = document.URL;
+        if (ref.indexOf('?') == -1)
+            return;
+        var qs = ref.substr(ref.indexOf('?') + 1);
+        var qsa = qs.split('&');
+        for (var i = 0; i < qsa.length; i++) {
+            var qsip = qsa[i].split('=');
+            if (qsip.length == 1)
+                continue;
+            if (qsip[0] == 'q' || qsip[0] == 'p') { // q= for Google, p= for Yahoo
+                var wordstring = unescape(qsip[1].replace(/\+/g, ' '));
+                searchhi.process(wordstring);
+            }
+        }
+    },
+    process: function(wordstring) {
+        searchhi.found = 0;
+        var words = wordstring.split(/\s+/);
+        for (w = 0; w < words.length; w++) {
+            searchhi.highlightWord(document.getElementsByTagName("body")[0], words[w]);
+        }
+        if (searchhi.found === 0) {
+            searchhi.nohits();
+        }
+    },
+    nohits: function() {
+    },
+    init: function() {
+        if (!document.createElement || !document.getElementsByTagName)
+            return;
+        // hook up forms of type searchhi
+        var frms = document.getElementsByTagName("form");
+        for (var i = 0; i < frms.length; i++) {
+            if (frms[i].className.match(/\bsearchhi\b/)) {
+                frms[i].onsubmit = function() {
+                    var inps = this.getElementsByTagName("input");
+                    for (var j = 0; j < inps.length; j++) {
+                        if (inps[j].type == "text") {
+                            searchhi.process(inps[j].value);
+                            return false;
+                        }
+                    }
+                };
+            }
+        }
+        // highlight search engine referrer results
+        searchhi.googleSearchHighlight();
     }
-
-    // And do this node itself
-    if (node.nodeType == 3) { // text node
-            tempNodeVal = node.nodeValue.toLowerCase();
-            tempWordVal = word.toLowerCase();
-            if (tempNodeVal.indexOf(tempWordVal) != -1) {
-                    var pn = node.parentNode;
-                    // check if we're inside a "nosearchhi" zone
-                    var checkn = pn;
-                    while (checkn.nodeType != 9 && 
-                    checkn.nodeName.toLowerCase() != 'body') { 
-                    // 9 = top of doc
-                            if (checkn.className.match(/\bnosearchhi\b/)) { return; }
-                            checkn = checkn.parentNode;
-                    }
-                    if (pn.className != "searchword") {
-                            // word has not already been highlighted!
-                            var nv = node.nodeValue;
-                            var ni = tempNodeVal.indexOf(tempWordVal);
-                            // Create a load of replacement nodes
-                            var before = document.createTextNode(nv.substr(0,ni));
-                            var docWordVal = nv.substr(ni,word.length);
-                            var after = document.createTextNode(nv.substr(ni+word.length));
-                            var hiwordtext = document.createTextNode(docWordVal);
-                            var hiword = document.createElement("span");
-                            hiword.className = "searchword";
-                            hiword.appendChild(hiwordtext);
-                            pn.insertBefore(before,node);
-                            pn.insertBefore(hiword,node);
-                            pn.insertBefore(after,node);
-                            pn.removeChild(node);
-                            searchhi.found += 1;
-                            if (searchhi.found == 1) pn.scrollIntoView();
-                    }
-            }
-    }
-  },
-
-  googleSearchHighlight: function() {
-    var ref = document.URL;
-    if (ref.indexOf('?') == -1) return;
-    var qs = ref.substr(ref.indexOf('?')+1);
-    var qsa = qs.split('&');
-    for (var i=0;i<qsa.length;i++) {
-            var qsip = qsa[i].split('=');
-      if (qsip.length == 1) continue;
-      if (qsip[0] == 'q' || qsip[0] == 'p') { // q= for Google, p= for Yahoo
-                    var wordstring = unescape(qsip[1].replace(/\+/g,' '));
-                    searchhi.process(wordstring);
-      }
-    }
-  },
-  
-  process: function(wordstring) {
-    searchhi.found = 0;
-    var words = wordstring.split(/\s+/);
-    for (w=0;w<words.length;w++) {
-            searchhi.highlightWord(document.getElementsByTagName("body")[0],words[w]);
-    }
-    if (searchhi.found === 0) {
-      searchhi.nohits();
-    }
-  },
-  
-  nohits: function() {
-  },
-  
-  init: function() {
-    if (!document.createElement || !document.getElementsByTagName) return;
-    // hook up forms of type searchhi
-    var frms = document.getElementsByTagName("form");
-    for (var i=0; i<frms.length; i++) {
-      if (frms[i].className.match(/\bsearchhi\b/)) {
-        frms[i].onsubmit = function() {
-          var inps = this.getElementsByTagName("input");
-          for (var j=0; j<inps.length; j++) {
-            if (inps[j].type == "text") {
-              searchhi.process(inps[j].value);
-              return false;
-            }
-          }
-        };
-      }
-    }
-    // highlight search engine referrer results
-    searchhi.googleSearchHighlight();
-  }
 };
-
-(function(i) {var u =navigator.userAgent;var e=/*@cc_on!@*/false; var st =
-setTimeout;if(/webkit/i.test(u)){st(function(){var dr=document.readyState;
-if(dr=="loaded"||dr=="complete"){i()}else{st(arguments.callee,10);}},10);}
-else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
-document.addEventListener("DOMContentLoaded",i,false); } else if(e){     (
-function(){var t=document.createElement('doc:rdy');try{t.doScroll('left');
-i();t=null;}catch(e){st(arguments.callee,0);}})();}else{window.onload=i;}})(searchhi.init);
+//
+//(function(i) {
+//    var u = navigator.userAgent;
+//    var e = /*@cc_on!@*/false;
+//    var st =
+//            setTimeout;
+//    if (/webkit/i.test(u)) {
+//        st(function() {
+//            var dr = document.readyState;
+//            if (dr == "loaded" || dr == "complete") {
+//                i()
+//            } else {
+//                st(arguments.callee, 10);
+//            }
+//        }, 10);
+//    }
+//    else if ((/mozilla/i.test(u) && !/(compati)/.test(u)) || (/opera/i.test(u))) {
+//        document.addEventListener("DOMContentLoaded", i, false);
+//    } else if (e) {
+//        (
+//                function() {
+//                    var t = document.createElement('doc:rdy');
+//                    try {
+//                        t.doScroll('left');
+//                        i();
+//                        t = null;
+//                    } catch (e) {
+//                        st(arguments.callee, 0);
+//                    }
+//                })();
+//    } else {
+//        window.onload = i;
+//    }
+//})
+//
+//(searchhi.init);