Changeset 35171 for main

Timestamp:

2021-05-20T14:14:47+12:00 (3 years ago)

Author:

kjdon

Message:

when we are doing search term highlighting, and we want it in the section titles, need to make sure that p.s argument is added, otherwise the ajax calls don't know that they should be doing search term highlighting

File:

• main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -115 +115 @@
 
     template = makeURLComponentSafe(template);
-    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ilt=" + template;
+    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ilt=" + template;
+
+    if (gs.cgiParams.p_s && gs.cgiParams.p_s.length > 0) {
+    url += "&p.s=" + gs.cgiParams.p_s;
+    }
 
        if(gs.documentMetadata.docType == "paged")
@@ -443 +447 @@
         if(gs.cgiParams.d && gs.cgiParams.d.length > 0)
         {
-            url += "&d=" + gs.cgiParams.d.replace(/([^.]*)\..*/, "$1");
+            url += "&d=" + gs.cgiParams.d.replace(/([^.]*)\..*/, "$1");
+            // in case we are doing search term highlighting, want p.s here too (e/g/ p.s=TextQuery)
+            if (gs.cgiParams.p_s && gs.cgiParams.p_s.length > 0) {
+            url += "&p.s=" + gs.cgiParams.p_s;
+            }
+            
         }
         else if(gs.cgiParams.href && gs.cgiParams.href.length > 0)
@@ -688 +697 @@
     ilt = makeURLComponentSafe(ilt);
 
-
-    var url = gs.xsltParams.library_name + "?a=d&ec=1&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&ilt=" + ilt;
+    var url = gs.xsltParams.library_name + "?a=d&ec=1&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&ilt=" + ilt;
+
+    if (gs.cgiParams.p_s && gs.cgiParams.p_s.length > 0) {
+    url += "&p.s=" + gs.cgiParams.p_s;
+    }
 
     $.ajax(url)