X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=92fbfd0750a3f8f0f5684b6192d7d204a35ece1a;hb=8dda95d66aaa1e5aaab7d2bf67e4ec1a13201b24;hp=94ad399c2ef29e913236aec928fd4d63d95621bc;hpb=0d14485c0b5f0a819df352229c4a5a5995de5d34;p=mkws-moved-to-github.git

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 94ad399..92fbfd0 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -16,7 +16,8 @@ if (!mkws_config)
 if (typeof mkws_config.use_service_proxy === 'undefined')
     mkws_config.use_service_proxy = true;
 
-var mkws_debug = 1;
+// global debug flag
+var mkws_debug;
 
 var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
 var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
@@ -115,13 +116,13 @@ function my_onshow(data) {
     // move it out
     var pager = document.getElementById("mkwsPager");
     pager.innerHTML = "";
-    pager.innerHTML +='<hr/><div style="float: right">' + M('Displaying') + ': '
+    pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
                     + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
                      ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
                      + data.total + ')</div>';
     drawPager(pager);
     // navi
-    var results = document.getElementById("mkwsResults");
+    var results = document.getElementById("mkwsRecords");
 
     var html = [];
     for (var i = 0; i < data.hits.length; i++) {
@@ -160,12 +161,12 @@ function my_onstat(data) {
 function my_onterm(data) {
     // no facets
     if (!mkws_config.facets || mkws_config.facets.length == 0) {
-	$("#mkwsTermlists").parent().hide();
+	$("#mkwsTermlists").hide();
 	return;
     }
 
     // display if we first got results
-    $("#mkwsTermlists").parent().show();
+    $("#mkwsTermlists").show();
 
     var acc = [];
     acc.push('<div class="title">' + M('Termlists') + '</div>');
@@ -244,10 +245,14 @@ function my_onbytarget(data) {
 // wait until the DOM is ready
 function domReady ()
 {
-    document.search.onsubmit = onFormSubmitEventHandler;
-    document.search.mkwsQuery.value = '';
-    document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
-    document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
+    document.mkwsSearchForm.onsubmit = onFormSubmitEventHandler;
+    document.mkwsSearchForm.mkwsQuery.value = '';
+    if (document.mkwsSelect) {
+	if (document.mkwsSelect.mkwsSort)
+	    document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
+	if (document.mkwsSelect.mkwsPerpage)
+	    document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
+    }
 }
 
 // when search button pressed
@@ -278,19 +283,23 @@ function resetPage()
 
 function triggerSearch ()
 {
-    my_paz.search(document.search.mkwsQuery.value, recPerPage, curSort, curFilter);
+    my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter);
 }
 
 function loadSelect ()
 {
-    curSort = document.mkwsSelect.mkwsSort.value;
-    recPerPage = document.mkwsSelect.mkwsPerpage.value;
+    if (document.mkwsSelect) {
+	if (document.mkwsSelect.mkwsSort)
+	    curSort = document.mkwsSelect.mkwsSort.value;
+	if (document.mkwsSelect.mkwsPerpage)
+	    recPerPage = document.mkwsSelect.mkwsPerpage.value;
+    }
 }
 
 // limit the query after clicking the facet
 function limitQuery (field, value)
 {
-    document.search.query.value += ' and ' + field + '="' + value + '"';
+    document.mkwsSearchForm.query.value += ' and ' + field + '="' + value + '"';
     onFormSubmitEventHandler();
 }
 
@@ -301,7 +310,6 @@ function limitTarget (id, name)
     navi.innerHTML =
         'Source: <a class="crossout" href="#" onclick="delimitTarget();return false;">'
         + name + '</a>';
-    navi.innerHTML += '<hr/>';
     curFilter = 'pz:id=' + id;
     resetPage();
     loadSelect();
@@ -363,7 +371,7 @@ function drawPager (pagerDiv)
         postdots = '...';
 
     pagerDiv.innerHTML += '<div style="float: clear">'
-        + prev + predots + middle + postdots + next + '</div><hr/>';
+        + prev + predots + middle + postdots + next + '</div>';
 }
 
 function showPage (pageNum)
@@ -386,29 +394,28 @@ function pagerPrev() {
         curPage--;
 }
 
-// swithing view between targets and records
+// switching view between targets and records
 
 function switchView(view) {
-
     var targets = document.getElementById('mkwsTargets');
-    var records = document.getElementById('mkwsRecords');
+    var results = document.getElementById('mkwsResults');
     var blanket = document.getElementById('mkwsBlanket');
 
     switch(view) {
         case 'targets':
-            targets.style.display = "block";
-            records.style.display = "none";
-            if (blanket) { blanket.style.display = "none"; }
+            if (targets) targets.style.display = "block";
+            if (results) results.style.display = "none";
+            if (blanket) blanket.style.display = "none";
             break;
-        case 'records':
-            targets.style.display = "none";
-            records.style.display = "block";
-            if (blanket) { blanket.style.display = "block"; }
+        case 'results':
+            if (targets) targets.style.display = "none";
+            if (results) results.style.display = "block";
+            if (blanket) blanket.style.display = "block";
             break;
 	case 'none':
-            targets.style.display = "none";
-            records.style.display = "none";
-            if (blanket) { blanket.style.display = "none"; }
+            if (targets) targets.style.display = "none";
+            if (results) results.style.display = "none";
+            if (blanket) blanket.style.display = "none";
             break;
         default:
             alert('Unknown view.');
@@ -501,22 +508,22 @@ function mkws_html_all(config) {
 	sort_default: "relevance",
 	perpage_default: 20,
 	query_width: 50,
-	switch_menu: true, 	/* show/hide Records|Targets menu */
+	switch_menu: false, 	/* show/hide Records|Targets menu */
 	lang_menu: true, 	/* show/hide language menu */
+	sort_menu: true, 	/* show/hide sort menu */
+	perpage_menu: true, 	/* show/hide perpage menu */
 	lang_display: [], 	/* display languages links for given languages, [] for all */
 	facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
-	responsive_design_width: 980, /* a page with less pixel width considered as mobile */	
-
-	debug: 0,     /* debug level for development: 0..2 */
-
+	responsive_design_width: 980, /* a page with less pixel width considered as mobile */
+	debug: 1,     /* debug level for development: 0..2 */
 
 	dummy: "dummy"
     };
 
     /* set global debug flag early */
-    if (config.debug !== 'undefined') {
+    if (typeof config.debug !== 'undefined') {
 	mkws_debug = config.debug;
-    } else if (mkws_config_default.debug !== 'undefined') {
+    } else if (typeof mkws_config_default.debug !== 'undefined') {
 	mkws_debug = mkws_config_default.debug;
     }
 
@@ -537,35 +544,53 @@ function mkws_html_all(config) {
 	mkws_html_lang(mkws_config);
 
     // For some reason, doing this programmatically results in
-    // document.search.mkwsQuery being undefined, hence the raw HTML.
+    // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
     debug("HTML search form");
     $("#mkwsSearch").html('\
-    <form name="search" action="" >\
+    <form name="mkwsSearchForm" action="" >\
       <input id="mkwsQuery" type="text" size="' + mkws_config.query_width + '" />\
       <input id="mkwsButton" type="submit" value="' + M('Search') + '" />\
     </form>');
 
     debug("HTML records");
-    $("#mkwsRecords").html('\
+    // If the application has an #mkwsResults, populate it in the
+    // usual way. If not, assume that it's a smarter application that
+    // defines its own subcomponents:
+    //	#mkwsTermlists
+    //	#mkwsRanking
+    //	#mkwsPager
+    //	#mkwsNavi
+    //	#mkwsRecords
+    if ($("#mkwsResults").length) {
+	$("#mkwsResults").html('\
       <table width="100%" border="0" cellpadding="6" cellspacing="0">\
         <tr>\
           <td width="250" valign="top">\
             <div id="mkwsTermlists"></div>\
           </td>\
           <td valign="top">\
-            <div id="mkwsRanking">\
-              <form name="mkwsSelect" id="mkwsSelect" action="" >\
-        ' + M('Sort by') + ' ' + mkws_html_sort(config) + '\
-        ' + M('and show') + ' ' + mkws_html_perpage(config) + '\
-        ' + M('per page') + '.\
-       </form>\
-            </div>\
+            <div id="mkwsRanking"></div>\
             <div id="mkwsPager"></div>\
             <div id="mkwsNavi"></div>\
-            <div id="mkwsResults"></div>\
+            <div id="mkwsRecords"></div>\
           </td>\
         </tr>\
       </table>');
+    }
+
+    if ($("#mkwsRanking").length) {
+	var ranking_data = '';
+	ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
+	if (config.sort_menu) {
+	    ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
+	}
+	if (config.perpage_menu) {
+	    ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
+	}
+        ranking_data += '</form>';
+
+	$("#mkwsRanking").html(ranking_data);
+    }
 
     mkws_html_switch(config);
 
@@ -578,7 +603,7 @@ function mkws_html_all(config) {
     domReady();
 
     // on first page, hide the termlist
-    $(document).ready(function() { $("#mkwsTermlists").parent().hide(); } );
+    $(document).ready(function() { $("#mkwsTermlists").hide(); } );
 }
 
 /* Responsive web design - change layout on the fly depending on
@@ -754,14 +779,14 @@ function mkws_mobile_resize () {
 	    $("#" + list[i]).hide();
 	}
 
-	$("#mkwsTermlists").parent().hide();
-	obj = $("#mkwsTermlists").parent().html();
-        $("#mkwsShiftedTermlists").html("<hr/>" + obj);
+	$("#mkwsTermlists").hide();
+	obj = $("#mkwsTermlists").html();
+        $("#mkwsShiftedTermlists").html(obj);
     } else {
 	for(var i = 0; i < list.length; i++) {
 	    $("#" + list[i]).show();
 	}
-	$("#mkwsTermlists").parent().show();
+	$("#mkwsTermlists").show();
 	$("#mkwsShiftedTermlists").html("");
     }
 };
@@ -792,7 +817,7 @@ jQuery.extend({
 	document.write('<div id="mkwsSwitch"></div>\
     <div id="mkwsLang"></div>\
     <div id="mkwsSearch"></div>\
-    <div id="mkwsRecords"></div>\
+    <div id="mkwsResults"></div>\
     <div id="mkwsTargets"></div>\
     <div id="mkwsFooter">\
       <div id="mkwsStat"></div>\