omf_web 0.9.1 → 0.9.3

data/share/htdocs/js/data_source2.js

@@ -5,8 +5,8 @@ OML.data_sources = function() {
   
   function context() {};
   
-  context.register = function(name, updateURL, schema, events) {
-    sources[name] = new OML.data_source(name, updateURL, schema, events);
+  context.register = function(opts) {
+    sources[opts.id || opts.name] = new OML.data_source(opts);
     return context;
   };
   
@@ -15,14 +15,14 @@ OML.data_sources = function() {
     var dynamic = false;
     
     if (typeof(ds_descr) == 'object') {
-      name = ds_descr.name;
+      name = ds_descr.id || ds_descr.name;
       dynamic = ds_descr.dynamic;
     } else {
       name = ds_descr;
     } 
     var source = sources[name];
     if (! source) {
-      raise("Unknown data source '" + name + "'.");
+      throw("Unknown data source '" + name + "'.");
     }
     if (dynamic) {
       source.is_dynamic(dynamic);
@@ -33,48 +33,51 @@ OML.data_sources = function() {
   return context;
 }();
 
-OML.data_source = function(name, updateURL, schema, events) {
-  var event_name = "data_source." + this.name + ".changed";
-  var indexes = [];
-  var update_interval = -1;
-  var ws = null; // points to web socket instance
+OML.data_source = function(opts) {
   
-  function ds() {};
-  ds.version = "0.1";
+  var name = opts.id || opts.name;
+  var event_name = "data_source." + name + ".changed";
+  var rows = opts.rows || [];
+  var offset = opts.offset || -1; // Number of (initial) rows skipped (count towards 'max_rows')
+  var schema = opts.schema;
   
-  this.create_index = function(index) {
-    var idx = this.indexes[index];
-    if (idx) return;
-    
-    this._create_index(index);
-  };
-    
-  ds.create_index = function(index) {
-    var idx = indexes[index] = {};
-    // index ignores rows with identical index
-    _.map(events, function(r) {
-      idx[r[index]] = r;
-    });
-  };
+  var data_source = {
+    version: "0.1",
+    name: name,
+    schema: schema,
+    rows: function() {return rows},
+    index_for_column: index_for_column,
+    is_dynamic: is_dynamic,
+    event_name: event_name,
+  }
+  
+  var indexes = {};
+  var unique_index_check = null;
   
-  ds.get_indexed_row = function(index, key) {
-    var idx = indexes[index];
-    if (idx == undefined) {
-      throw "Need to create index first";
+  var update_interval = -1;
+  var ws = null; // points to web socket instance
+
+  function index_for_column(col_descr) {
+    var i = col_descr.index;
+    var index = indexes[i];
+    if (!index) {
+      index = indexes[i] = {};
+      _.each(rows, function(r) { index[r[i]] = r; })
+    }
+    return function(key) {
+      return indexes[i][key]; // need fresh lookup as we may redo index
     }
-    return idx[key];
   }
   
-  ds.update_indexes = function() {
-    var self = this;
-    _.each(indexes, function(value, key) {
-      var i = 0;
-      self._create_index(key);
+  function update_indexes() {
+    // This can most likley be done more efficiently if we consider what has changed
+    _.each(indexes, function(ignore, i) {
+      var index = indexes[i] = {};
+      _.each(rows, function(r) { index[r[i]] = r; })
     });
-    
   }
-  
-  ds.is_dynamic = function(_) {
+    
+  function is_dynamic(_) {
     if (!arguments.length) {
       return update_interval > 0 || ws;
     }
@@ -88,29 +91,22 @@ OML.data_source = function(name, updateURL, schema, events) {
     }
     if (interval < 0) return false;
 
-    //if (window.WebSocket) {
-    if (false) {  // web sockets don't work right now
-      _start_web_socket();
+    if (window.WebSocket) {
+    //if (false) {  // web sockets don't work right now
+      //start_web_socket();
     } else {
-      _start_polling_backend();
+      start_polling_backend();
     }
   }
     
-  ds._start_web_socket = function() {
+  var ws = null; // Websocket identifier
+  function start_web_socket() {
     if (ws) return; // already running
     
-    var url = 'ws://' + window.location.host + '/_ws';
-    var ws = new WebSocket(url);
-    var self = this;
-    ws.onopen = function() {
-      ws.send('id:' + name);
-    };
-    ws.onmessage = function(evt) {
-      // evt.data contains received string.
-      var msg = jQuery.parseJSON(evt.data);
-      var data = msg;
-      self.events.append(data);
-    };
+    var url = 'ws://' + window.location.host + '/_ws?sid=' + opts.sid;
+    ws = new WebSocket(url);
+    ws.onopen = on_open;
+    ws.onmessage = on_message;
     ws.onclose = function() {
       var status = "onclose";
     };
@@ -118,8 +114,81 @@ OML.data_source = function(name, updateURL, schema, events) {
       var status = "onerror";
     };
   } 
+  
+  // Send a message to the server
+  // 
+  // @params type - Type of message
+  // @params args - Hash of additional args ('ds_name' of this data source will be added)
+  //
+  // TODO: Would need to cache messages if connection isn't established yet
+  //
+  function send_server_msg(type, args) {
+    args.ds_name = name;
+    msg = {type: type, args: args}
+    ws.send(JSON.stringify(msg));
+  }
+
+  
+  function on_open() {
+    if (!active_slice_col_name) {
+      send_server_msg('register_data_source', {offset: offset + rows.length})
+    }
+  };
+  
+  function on_message(evt) {
+    // evt.data contains received string.
+    var msg = jQuery.parseJSON(evt.data);
+    switch(msg.type) {
+      case 'datasource_update':
+        on_update(msg);
+        break;
+      case 'reply':
+        // great
+        break;
+      default:
+        throw "Unknown message type '" + msg.type + "'.";
+    }
+  };
+  
+  function on_update(msg) {
+    if (unique_index_check) {
+      // Let's first see if we simply replace a row
+      _.each(msg.rows, function(r) {
+        if (!unique_index_check(r)) {
+          rows.push(r); // new index
+        }
+      });          
+    } else {
+      // need to append to 'rows' as it's referenced in other closures
+      _.each(msg.rows, function(r) { rows.push(r) });
+      var chop = msg.offset - offset;
+      if (offset >= 0 && chop > 0) {
+        rows = _.rest(rows, chop);
+      }
+    }
+    offset = msg.offset;
+      
+    update_indexes();
+    var evt = {data_source: data_source};
+    OHUB.trigger(event_name, evt);
+    OHUB.trigger("data_source.changed", evt);
+  }
+  
+  // Request a new slice from the server. Clear existing state
+  function set_slice_column(col_value) {
+    if (active_slice_value == col_value) return;
+    
+    active_slice_column_id = col_value;
+    // Reset state
+    rows = [];
+    update_indexes();
+    sm = {col_name: active_slice_col_name, col_value: col_value}
+    send_server_msg('request_slice', {slice: sm})
+  }
+  var active_slice_col_name = null;
+  var active_slice_value = null;
  
-  ds._start_polling_backend = function() {    
+  function start_polling_backend() {   
     var first_time = this.update_interval < 0;
     
     if (this.update_interval < 0 || this.update_interval > interval) {
@@ -128,7 +197,7 @@ OML.data_source = function(name, updateURL, schema, events) {
     
     if (first_time) {
       var self = this;
-      L.require(['/resource/vendor/jquery/jquery.js', '/resource/vendor/jquery/jquery.periodicalupdater.js'], function() {
+      L.require(['vendor/jquery/jquery.js', 'vendor/jquery/jquery.periodicalupdater.js'], function() {
         var update_interval = self.update_interval * 1000;
         if (update_interval < 1000) update_interval = 3000;
         var opts = {
@@ -152,10 +221,68 @@ OML.data_source = function(name, updateURL, schema, events) {
     return true;
   }
   
-  this.on_changed = function(update_f) {
-    OHUB.bind(this.event_name, update_f);
+  // Let's check if this data_source maintains uniqueness along one axis (column)
+  if (opts.unique_column) {
+    var col_name = opts.unique_column;
+    var index = -1;
+    _.find(schema, function(cd) {
+      index += 1;
+      return cd.name == col_name;
+    });
+    if (index >= 0) {
+      var key2row = {};
+      unique_index_check = function (row) {
+        var key = row[index];
+        var existing_row = key2row[key];
+        if (existing_row) {
+          // replace content of existing row with 'row'
+          // Need to replace in place, there may be a better way
+          existing_row.length = 0;
+          _.each(row, function(e) { existing_row.push(e); })
+          return true;
+        }
+        key2row[key] = row;
+        return false;
+      }
+      // pre-seed 
+      rows = _.uniq(rows, false, function(r) { return r[index]; });
+      _.each(rows, function(r) { key2row[r[index]] = r; });
+    } else {
+      throw "Error in processing option 'unique_column'. Unknown column '" + col_name + "'."
+    }
   }
   
-  return ds;
+  // In slice mode, only fetch a 'slice' of the underlying data source. A slice
+  // is defined by specific value in the 'slice_column' of all rows.
+  //
+  // opts.slice: 
+  //      slice_column: id
+  //      event:
+  //        name: graph.static_network.links.changed
+  //        key: id
+  if (opts.slice) {
+    var so = opts.slice;
+    active_slice_col_name = so.slice_column;
+    
+    if (so.event) {
+      var evt_name = so.event.name;
+      if (! evt_name) 
+        throw "Missing event name in slice definition for data source '" + name + "'.";
+      OHUB.bind(evt_name, function(evt) {
+        set_slice_column(evt.id);        
+      })
+    }
+  }
+  
+  if (window.WebSocket) {
+    start_web_socket();
+  }
+  
+  // Bind to event directly
+  // this.on_changed = function(update_f) {
+    // OHUB.bind(this.event_name, update_f);
+  // }
+  
+  return data_source;
 }
 

data/share/htdocs/js/require3.js

@@ -113,17 +113,36 @@ L = new function() {
       }; 
       
     } else { // css
-      sel = document.createElement("link");      
+      var sel = document.createElement("link");      
       sel.href = url;
       sel.rel = "stylesheet";
       sel.type ="text/css";
-      // there is no consistent support for detecting the successful loading of
-      // a css file. Not sure what happens if we simply don't care.
-      this._onLoad(url);
-      //this._css_el = sel;
+      this._monitor_css_loaded(sel, url)
     }
     return sel;
   }
+  
+  this._monitor_css_loaded = function(sel, url) {
+    var href = sel.href;
+    var self = this;
+    window.setTimeout(function() {
+      var sheets = document.styleSheets;
+      for (var i = 0; i < sheets.length; i++) {
+        var sheet = sheets[i];
+        if (sheet.href == href) {
+          // TODO: HACK ALLERT
+          // OK, stylesheet is loaded but we are having issues with SLickgrid and Chrome
+          // recoginisng it immediately, maybe a delay helps
+          window.setTimeout(function() {
+            self._onLoad(url);
+          }, 200);
+          return;
+        }
+      }
+      // still not loaded, try again
+      self._monitor_css_loaded(sel, url);
+    }, 100) ; 
+  }
 
   this._getAbsoluteUrl = function(url) {
     if (url.indexOf(':') < 0) { // don't change when it contains protocol
@@ -134,7 +153,8 @@ L = new function() {
           s.push('js');
         }
         var ext = s.pop();
-        url = this.baseURL + '/' + ext + "/" + url;
+        //url = this.baseURL + '/' + ext + "/" + url;
+        url = this.baseURL + '/' + url;
       }
     }
     return url;    
@@ -247,56 +267,7 @@ L = new function() {
     }
     return true;
   };
-  
-  // Report that an URL has been loaded through some other means
-  var self = this;
-  $(document).ready(function() {
-    self._loaded['#DOM_LOADED'] = true;
-    self._checkAllPending();
-  });
-  
-  
-  // this._checkOnePending = function(p) {
-    // var deps = p.deps;
-    // var loaded = this._loaded;
-    // var l = deps.length;
-    // for (; l;) {
-      // var name = deps[--l];
-      // if (loaded[name] != true) {
-        // return p;
-      // }
-    // }
-    // // OK, all dependencies fulfilled.
-    // var op = p.op;
-    // switch (op) {
-      // case "load":
-        // var next = p.next;
-        // var url = next.shift();
-        // var new_pending = null;
-        // if (next.length > 0) {
-          // // load next one
-          // new_pending = {op: 'load', deps: [url], next: next};
-        // }
-        // this._loadOne(url);
-        // return new_pending;
-      // case "provide":
-        // if (p.onReady) {
-          // p.onReady();
-        // }
-        // this._provided[p.obj_name] = true;
-        // return null;
-      // case "require":
-        // if (this._provided[p.obj_name] == true) {
-          // if (p.onReady) {
-            // p.onReady();
-          // }
-          // return null; // done
-        // }
-        // return p;
-    // }
-    // return null; // not sure what op that is, let's remove it    
-  // }
-  
+    
   this._arr_flatten = function(array) {
     // http://tech.karbassi.com/2009/12/17/pure-javascript-flatten-array/
     var flat = [];
@@ -306,6 +277,16 @@ L = new function() {
     }
     return flat;
   }
+  
+  // Report that an URL has been loaded through some other means
+  var self = this;
+  //this.require(['vendor/jquery/jquery.js'], function() {  
+    $(document).ready(function() {
+      self._loaded['#DOM_LOADED'] = true;
+      self._checkAllPending();
+    });
+  //});
+  
 };
-//L.deps = {};
+
 

data/share/htdocs/theme/bright/css/bright.css

@@ -233,19 +233,19 @@ ol.widget_tools_menu li.current a {
 }
 
 ol.widget_tools_menu li.data_line_chart2 a {
-  background: url(/resource/image/graph/line_chart.png) 0px -50px no-repeat;  
+  background: url(/resource/graph/img/line_chart.png) 0px -50px no-repeat;  
 }
 
 ol.widget_tools_menu li.data_scatter_plot a {
-  background: url(/resource/image/graph/scatter_plot.png) 0px 0px no-repeat;  
+  background: url(/resource/graph/img/scatter_plot.png) 0px 0px no-repeat;  
 }
 
 ol.widget_tools_menu li.data_table2 a {
-  background: url(/resource/image/graph/table.png) 0px -50px no-repeat;  
+  background: url(/resource/graph/img/table.png) 0px -50px no-repeat;  
 }
 
 ol.widget_tools_menu li.info a {
-  background: url(/resource/image/graph/info.png) 3px 3px no-repeat;
+  background: url(/resource/graph/img/info.png) 3px 3px no-repeat;
   margin-left: 10px  
 }