X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=3eb49314ef48bce9c291c56fcfec99488ee9da24;hb=6984baaeb6b56dbdcefe67490581dd18d4a6ce91;hp=9e14bdb329f246898b48b2d530ce44fb819bca80;hpb=fcc0cd41a84c5669f6a74bc3836e8ea86eb855f1;p=mkws-moved-to-github.git

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 9e14bdb..3eb4931 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -384,7 +384,7 @@ function mkws_html_all(data) {
 	sort_default: "relevance",
 	perpage_default: 20,
 	query_width: 50,
-	mkws_switch: true, /* show/hide Records|Targets menu */
+	switch: true, /* show/hide Records|Targets menu */
 
 	dummy: "dummy"
     };
@@ -394,7 +394,43 @@ function mkws_html_all(data) {
 	config[k] = data[k];
     }
 
+    // For some reason, doing this programmatically results in
+    // document.search.query being undefined, hence the raw HTML.
+    $("#mkwsSearch").html('\
+    <form id="searchForm" name="search">\
+      <input id="query" type="text" size="50" />\
+      <input id="button" type="submit" value="Search" />\
+    </form>');
 
+    $("#mkwsRecords").html('\
+      <table width="100%" border="0" cellpadding="6" cellspacing="0">\
+        <tr>\
+          <td width="250" valign="top">\
+            <div id="termlist"></div>\
+          </td>\
+          <td valign="top">\
+            <div id="ranking">\
+              <form name="select" id="select">\
+        Sort by' + mkws_html_sort(config) + '\
+        and show ' + mkws_html_perpage(config) + '\
+        per page.\
+       </form>\
+            </div>\
+            <div id="pager"></div>\
+            <div id="navi"></div>\
+            <div id="results"></div>\
+          </td>\
+        </tr>\
+      </table>\
+    </div>');
+
+    mkws_html_switch(config);
+    mkws_service_proxy_auth(config.service_proxy_auth);
+
+    domReady();
+}
+
+function mkws_html_switch(config) {
     $("#mkwsSwitch").html($("<a/>", {
 	href: '#',
 	onclick: "switchView(\'records\')",
@@ -407,11 +443,20 @@ function mkws_html_all(data) {
 	text: "Targets"
     }));
 
-    if (!config.mkws_switch) {
+    $("#mkwsTargets").html('\
+      <div id="bytarget">\
+       No information available yet.\
+      </div>');
+    $("#mkwsTargets").css("display", "none");
+
+    if (!config.switch) {
         $("#mkwsSwitch").css("display", "none");
     }
+}
 
+function mkws_html_sort(config) {
     var sort_html = '<select name="sort" id="sort">';
+
     for(var i = 0; i < config.sort.length; i++) {
 	var key = config.sort[i][0];
 	var val = config.sort[i].length == 1 ? config.sort[i][0] : config.sort[i][1];
@@ -424,7 +469,12 @@ function mkws_html_all(data) {
     }
     sort_html += '</select>';
 
+    return sort_html;
+}
+
+function mkws_html_perpage(config) {
     var perpage_html = '<select name="perpage" id="perpage">';
+
     for(var i = 0; i < config.perpage.length; i++) {
 	var key = config.perpage[i];
 
@@ -436,43 +486,7 @@ function mkws_html_all(data) {
     }
     perpage_html += '</select>';
 
-    // For some reason, doing this programmatically results in
-    // document.search.query being undefined, hence the raw HTML.
-    $("#mkwsSearch").html('\
-    <form id="searchForm" name="search">\
-      <input id="query" type="text" size="50" />\
-      <input id="button" type="submit" value="Search" />\
-    </form>');
-
-    $("#mkwsRecords").html('\
-      <table width="100%" border="0" cellpadding="6" cellspacing="0">\
-        <tr>\
-          <td width="250" valign="top">\
-            <div id="termlist"></div>\
-          </td>\
-          <td valign="top">\
-            <div id="ranking">\
-              <form name="select" id="select">\
-        Sort by' + sort_html + '\
-        and show ' + perpage_html + '\
-        per page.\
-       </form>\
-            </div>\
-            <div id="pager"></div>\
-            <div id="navi"></div>\
-            <div id="results"></div>\
-          </td>\
-        </tr>\
-      </table>\
-    </div>');
-
-    $("#mkwsTargets").html('\
-      <div id="bytarget">\
-       No information available yet.\
-      </div>');
-    $("#mkwsTargets").css("display", "none");
-
-    domReady();
+    return perpage_html;
 }
 
 /*
@@ -480,8 +494,11 @@ function mkws_html_all(data) {
  * The username/password is configured in the apache config file
  * for the site.
  */
-function mkws_service_proxy_auth() {
-    var jqxhr = jQuery.get("/service-proxy-auth")
+function mkws_service_proxy_auth(auth_url) {
+    if (!auth_url)
+	auth_url = "/service-proxy-auth";
+
+    var jqxhr = jQuery.get(auth_url)
 	.fail(function() {
 	    alert("service proxy authentication failed, give up!");
 	})
@@ -498,5 +515,5 @@ function mkws_service_proxy_auth() {
 	});
 }
 
+/* magic */
 $(document).ready(function() { mkws_html_all(mkws_config) });
-$(document).ready(function() { mkws_service_proxy_auth(); });