logstash.js in logstash-lite-0.2.20110203130400

- old
+ new

@@ -8,26 +8,39 @@
 
     search: function(query) {
       if (query == undefined || query == "") {
         return;
       }
+      //console.log("Searching: " + query);
+
       var display_query = query.replace("<", "&lt;").replace(">", "&gt;")
       $("#querystatus").html("Loading query '" + display_query + "'")
+      //console.log(logstash.params)
       logstash.params.q = query;
       document.location.hash = escape(JSON.stringify(logstash.params));
       $("#results").load("/search/ajax", logstash.params);
       $("#query").val(logstash.params.q);
     }, /* search */
 
     parse_params: function(href) {
-      var params = href.replace(/^[^?]*\?/, "").split("&")
-      for (var p in params) {
-        var a = params[p].split("=");
-        var key = a[0]
-        var value = a[1]
-        logstash.params[key] = unescape(value)
+      var query = href.replace(/^[^?]*\?/, "");
+      if (query == href) {
+        //console.log("No query params in link " + href);
+        /* No query params */
+        return {};
       }
+
+      //console.log({ "query": query });
+      var param_list = query.split("&");
+      params = {};
+      //console.log({ "Parsed params": params });
+      for (var p in param_list) {
+        var a = param_list[p].split("=");
+        var key = a[0];
+        var value = a[1];
+        params[key] = unescape(value);
+      }
       return params;
     },
 
     appendquery: function(query) {
       var newquery = $("#query").val();
@@ -87,10 +100,11 @@
       }
       logstash.search(logstash.params.q);
     } else {
       /* No hash. See if there's a query param. */
       var params = logstash.parse_params(location.href);
+      //console.log(params)
       for (var p in params) {
         logstash.params[p] = params[p];
       }
       logstash.search(logstash.params.q)
     }
@@ -102,26 +116,17 @@
         scroll(0, 0); 
         logstash.search(query);
       }
     });
 
-    $("a.pager").live("click", function() {
+    $("a.pager, a.querychanger").live("click", function() {
+      /* TODO(sissel): Allow 'control click' and 'middle click' to act normally */
       var href = $(this).attr("href");
-      var params = logstash.parse_params(location.href);
+      var params = logstash.parse_params(href);
       for (var p in params) {
         logstash.params[p] = params[p];
       }
       logstash.search(logstash.params.q)
-      return false;
-    });
-
-    $("a.querychanger").live("click", function() {
-      var href = $(this).attr("href");
-      var re = new RegExp("[&?]q=([^&]+)");
-      var match = re.exec(href);
-      if (match) {
-        logstash.search(match[1]);
-      }
       return false;
     });
 
     var result_row_selector = "table.results tr.event";
     $(result_row_selector).live("click", function() {