rbbt-util 5.14.30 → 5.14.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 961b2aefbda7865869a3c58926e8b14ecde80ecb
-  data.tar.gz: def79057ef14b73031ec710b40b420f4e5356350
+  metadata.gz: 46eae28f0f87b59568cc6001d10928f1c68a8a31
+  data.tar.gz: a42bff80be14564d5852808dddf130319b713866
 SHA512:
-  metadata.gz: 691ab8d3aec9159ba632b5124a2f00dbadd8bb661e20d9e2c3999d54df939bec38042acdfbcde49474ce476056ca2c458c4019287ad9a4e014e5ee5a814d7732
-  data.tar.gz: 3813a6152181ca3e3d59248adc13e28189d9dac7ed8efaa5df1c30c3e41df4d79091692ce415c9529c24fc94a723e9558821a681d08585d596810c510eb86cb2
+  metadata.gz: 3a11deee4e5cea8f891b9602e28f0b2466b3eb9933cfc8116b029653977a2e24e562b25103524a61597324437271f5c8099625e7a4f99f60104ebf0030ff04f4
+  data.tar.gz: e030e147a235c09419ff66eca1568ad1fe61ec61847ff075d4f743f87e14014127811c009ea004d38fc2fd97a212eafc50e37c9c15cff1a555eb5673bdea7d0f

data/lib/rbbt/knowledge_base.rb

@@ -121,43 +121,6 @@ class KnowledgeBase
     {:namespace => namespace, :format => @format}
   end
  
-  #def get_database(name, options = {})
-  #  @databases[Misc.fingerprint([name, options])] ||= \
-  #    begin 
-  #      Persist.memory("Database:" <<[name, self.dir] * "@") do
-  #        options = Misc.add_defaults options, :persist_dir => dir.databases
-  #        persist_options = Misc.pull_keys options, :persist
-
-  #        file, registered_options = registry[name]
-  #        options = open_options.merge(registered_options || {}).merge(options)
-  #        raise "Repo #{ name } not found and not registered" if file.nil?
-
-  #        Log.low "Opening database #{ name } from #{ Misc.fingerprint file }. #{options}"
-  #        Association.open(file, options, persist_options).
-  #          tap{|tsv| tsv.namespace = self.namespace}
-  #      end
-  #    end
-  #end
-
-
-  #def get_index(name, options = {})
-  #  @indices[Misc.fingerprint([name, options])] ||= \
-  #    begin 
-  #      Persist.memory("Index:" <<[name, self.dir] * "@") do
-  #        options = Misc.add_defaults options, :persist_dir => dir.indices
-  #        persist_options = Misc.pull_keys options, :persist
-
-  #        file, registered_options = registry[name]
-  #        options = open_options.merge(registered_options || {}).merge(options)
-  #        raise "Repo #{ name } not found and not registered" if file.nil?
-
-  #        Log.low "Opening index #{ name } from #{ Misc.fingerprint file }. #{options}"
-  #        Association.index(file, options, persist_options).
-  #          tap{|tsv| tsv.namespace = self.namespace}
-  #      end
-  #    end
-  #end
-
   def get_database(name, options = {})
     key = name.to_s + "_" + Misc.digest(Misc.fingerprint([name,options,format,namespace]))
     @databases[key] ||= 
@@ -192,6 +155,7 @@ class KnowledgeBase
   end
 
   def get_index(name, options = {})
+    name = name.to_s
     key = name.to_s + "_" + Misc.digest(Misc.fingerprint([name,options]))
     @indices[key] ||= 
       begin 
@@ -384,18 +348,7 @@ class KnowledgeBase
 
     repo = get_index name
 
-    matches = begin
-                s = repo.subset_entities(entities, &block)
-                setup(name, s)
-              rescue Exception
-                target = entities[:target]
-                source = entities[:source]
-                if target or source
-                  entities[:target] = source 
-                  entities[:source] = target
-                end
-                setup(name, repo.reverse.subset_entities(entities, &block), true)
-              end
+    matches = setup(name, repo.subset_entities(entities))
 
     block_given? ? matches.select(&block) : matches
   end

data/lib/rbbt/util/R/eval.rb

@@ -37,6 +37,9 @@ module R
                        begin
                         i = Rserve::Connection.new :hostname => @@socket_file
                         i.eval "source('#{UTIL}');" 
+                        wdir = @@socket_file + '.wd'
+                        FileUtils.mkdir wdir unless File.exists? wdir
+                        i.eval "setwd('#{wdir}');"
                         i
                        rescue Exception
                          raise TryAgain

data/lib/rbbt/util/misc/exceptions.rb

@@ -1,19 +1,20 @@
 class ParameterException < Exception; end
 class FieldNotFoundError < Exception;end
-class Aborted < Exception
-  def initialize(*args)
-    super(*args)
-  end
-end
 class TryAgain < Exception; end
 class ClosedStream < Exception; end
+
 class ProcessFailed < Exception; end
+class Aborted < Exception; end
+
+class RemoteServerError < Exception; end
+
 class KeepLocked < Exception
   attr_accessor :payload
   def initialize(payload)
     @payload = payload
   end
 end
+
 class KeepBar < Exception
   attr_accessor :payload
   def initialize(payload)

data/share/rbbt_commands/workflow/knowledge_base

@@ -51,6 +51,9 @@ when :subset
   source_entities = options[:source_entities] || :all
   target_entities = options[:target_entities] || :all
 
+  source_entities = :all if source_entities == "all"
+  target_entities = :all if target_entities == "all"
+
   source_entities = source_entities.split(/[,|]/) if String === source_entities
   target_entities = target_entities.split(/[,|]/) if String === target_entities
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.14.30
+  version: 5.14.31
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake