omf_web 0.9.5 → 0.9.6

data/lib/omf-web/data_source_proxy.rb

@@ -135,7 +135,7 @@ module OMF::Web
       dsp
     end
     
-    def to_javascript(opts)
+    def to_javascript(opts = {})
       #puts "to_java>>>>> #{opts.inspect}"
       sid = Thread.current["sessionID"]
       opts = opts.dup

data/lib/omf-web/version.rb

@@ -1,7 +1,8 @@
 
 module OMF
   module Web
-    VERSION = '0.9.5'
+    VERSION = '0.9.6'
+    # Used for finding the example directory
     TOP_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))
   end
 end

data/lib/omf_common/lobject.rb

@@ -59,8 +59,9 @@ module OMF::Common
     #
     def self.init_log(appName, opts = {})
   	  
-      @@logger = ::Log4r::Logger.new(appName)
+      #@@logger = ::Log4r::Logger.new(appName)
       set_environment(opts[:environment] || 'development')
+      @@logger = ::Log4r::Logger.new(@@rootLoggerName)
       
       configFile = opts[:configFile]
       if (configFile == nil && logEnv = opts[:env])
@@ -82,10 +83,6 @@ module OMF::Common
       end
       #puts "config file '#{configFile}'"
       if !(configFile || '').empty?
-        # if (appInstance == nil)
-          # appInstance = DateTime.now.strftime("%F-%T").split(':').join('-')
-        # end
-        # ::Log4r::Configurator['appInstance'] = opts[:appInstance] || 'default'
         ::Log4r::Configurator['appName'] = appName
         begin
           ycfg = YAML.load_file(configFile)
@@ -98,7 +95,12 @@ module OMF::Common
         end
       else
         # set default behavior
-        @@logger.outputters = ::Log4r::Outputter.stdout
+        ::Log4r::Logger.global.level = ::Log4r::ALL
+        formatter = ::Log4r::PatternFormatter.new(:pattern => "%l %c: %m")
+        ::Log4r::StdoutOutputter.new('console', :formatter => formatter)
+        @@logger.add 'console'
+        #@@logger.outputters = ::Log4r::StdoutOutputter.new('console') #Outputter.stdout
+        ##@@logger.outputters = ::Log4r::Outputter.stdout
       end
     end
     

data/share/htdocs/js/data_source2.js

@@ -38,7 +38,8 @@ OML.data_source = function(opts) {
   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 offset = opts.offset || -1; // Number of (initial) rows skipped (count towards 'max_rows')
+  var offset = opts.offset || 0; // Number of (initial) rows skipped (count towards 'max_rows')  
   var schema = opts.schema;
   
   var data_source = {
@@ -103,7 +104,7 @@ OML.data_source = function(opts) {
   function start_web_socket() {
     if (ws) return; // already running
     
-    var url = 'ws://' + window.location.host + '/_ws?sid=' + opts.sid;
+    var url = 'ws://' + window.location.host + '/_ws?sid=' + (opts.sid || OML.session_id);
     ws = new WebSocket(url);
     ws.onopen = on_open;
     ws.onmessage = on_message;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_web
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf-oml
@@ -2347,3 +2347,4 @@ signing_key:
 specification_version: 3
 summary: OMF's web frontend.
 test_files: []
+has_rdoc: