X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=21cd04b3d1d57c059bc81f96f961666de0af9239;hb=1f5c472fe0aad8f7c9526fc24b8d2626774cf5a5;hp=fa4b5de0faa91fc00dcbef7ad110d54939640c3e;hpb=46ada66e14a066e7594d78783360ae4d83932f9c;p=mkws-moved-to-github.git

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index fa4b5de..21cd04b 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -377,8 +377,9 @@ function renderDetails(data, marker)
  */
 function mkws_html_all(data) {
 
+    /* default config */
     var config = {
-	sort: [ ["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+	sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
 	perpage: [10, 20, 30, 50],
 	sort_default: "relevance",
 	perpage_default: 20,
@@ -393,22 +394,7 @@ function mkws_html_all(data) {
 	config[k] = data[k];
     }
 
-
-    $("#mkwsSwitch").html($("<a/>", {
-	href: '#',
-	onclick: "switchView(\'records\')",
-	text: "Records",
-    }));
-    $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-    $("#mkwsSwitch").append($("<a/>", {
-	href: '#',
-	onclick: "switchView(\'targets\')",
-	text: "Targets",
-    }));
-
-    if (!config.mkws_switch) {
-        $("#mkwsSwitch").css("display", "none");
-    }
+    mkws_html_switch(config);
 
     // For some reason, doing this programmatically results in
     // document.search.query being undefined, hence the raw HTML.
@@ -427,10 +413,8 @@ function mkws_html_all(data) {
           <td valign="top">\
             <div id="ranking">\
               <form name="select" id="select">\
-        Sort by\
-        <select name="sort" id="sort"><option value="relevance" selected="selected">relevance</option><option value="title:1">title</option><option value="date:0">newest</option><option value="date:1">oldest</option></select>\
-        and show \
-        <select name="perpage" id="perpage"><option value="10">10</option><option value="20" selected="selected">20</option><option value="30">30</option><option value="50">50</option></select>\
+        Sort by' + mkws_html_sort(config) + '\
+        and show ' + mkws_html_perpage(config) + '\
         per page.\
        </form>\
             </div>\
@@ -448,16 +432,73 @@ function mkws_html_all(data) {
       </div>');
     $("#mkwsTargets").css("display", "none");
 
+    mkws_service_proxy_auth(config.service_proxy_auth);
     domReady();
 }
 
-/* 
+function mkws_html_switch(config) {
+    $("#mkwsSwitch").html($("<a/>", {
+	href: '#',
+	onclick: "switchView(\'records\')",
+	text: "Records"
+    }));
+    $("#mkwsSwitch").append($("<span/>", { text: " | " }));
+    $("#mkwsSwitch").append($("<a/>", {
+	href: '#',
+	onclick: "switchView(\'targets\')",
+	text: "Targets"
+    }));
+
+    if (!config.mkws_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];
+
+	sort_html += '<option value="' + key + '"';
+	if (key == config.sort_default) {
+	    sort_html += ' selected="selected"';
+	}
+	sort_html += '>' + val + '</option>';
+    }
+    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];
+
+	perpage_html += '<option value="' + key + '"';
+	if (key == config.perpage_default) {
+	    perpage_html += ' selected="selected"';
+	}
+	perpage_html += '>' + key + '</option>';
+    }
+    perpage_html += '</select>';
+
+    return perpage_html;
+}
+
+/*
  * Run service-proxy authentication in background (after page load).
  * 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!");
 	})
@@ -474,6 +515,5 @@ function mkws_service_proxy_auth() {
 	});
 }
 
+/* magic */
 $(document).ready(function() { mkws_html_all(mkws_config) });
-$(document).ready(function() { mkws_service_proxy_auth(); });
-