rbbt-rest 1.8.31 → 1.8.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789edcb774536a07b918951440c7150312a58313
-  data.tar.gz: 5c39a7b0157d6e5c825125bbad3c578039925cb1
+  metadata.gz: dc8e0ad6d95947ae667ea5612d2e43426356d7fc
+  data.tar.gz: c3fb0452be95c7c364c0c7f4613599d109f41280
 SHA512:
-  metadata.gz: 87c1c2465deb8abf238270933df0b25f30225e497d64b2a693c2f7e42a4eb3ae20e894ef1dc6caf79a16847d1f6dd51dd04d51c43d3481dc9f2803f589802b4b
-  data.tar.gz: 17ec51cb37b07363bd5a76d79c45ec22cebe6ab5e1115b983f9ae35a9d83029abbf696e2136a6b453f6bd2cb5378746b8b5c6e14438e7a804d16a3634e125c0a
+  metadata.gz: 7a39687837b66dd779aecb8d13f6e4f668141196b4eb1fac2b34474c5231244232943c2198caf31ec66ac21a49b2c4921a50ef9e12a16f85de41e4c202dc9ee2
+  data.tar.gz: d9722b304c146f4a9f16eb8f1779601d55b65d8a3cf018441e016e08b4b67f53895ec354ab6e502868e5d3fc9a7df1fde1f8f794572ae49998f83c46d2bcaab3

data/lib/rbbt/rest/entity/rest.rb

@@ -185,7 +185,7 @@ module Entity
       reuse = options.delete("reuse") if reuse.nil?
       reuse = true if reuse.nil?
 
-      Entity::List.save_list(entity_type.to_s, id, self) unless reuse and File.exists?(Entity::List.list_file(entity_type.to_s, id, self))
+      Entity::List.save_list(entity_type.to_s, id, self) unless reuse and File.exists?(Entity::List.list_file(entity_type.to_s, id))
 
       klasses = self.klasses
       klasses << 'entity_list'

data/lib/rbbt/rest/workflow/jobs.rb

@@ -227,7 +227,7 @@ module WorkflowRESTHelpers
       end
 
       begin
-        job.fork unless job.started?
+        job.fork(true) unless job.started?
 
         job_url = to(File.join("/", workflow.to_s, task, job.name)) 
         job_url += "?_format=#{@format}" if @format

data/share/views/form.haml

@@ -44,7 +44,7 @@
             var link = $(this);
             var name = $(link).attr('name');
             var inputs = example_inputs[name];
-            form[0].reset()
+            //form[0].reset()
 
             for (var input in inputs){
               var value = inputs[input]

data/share/views/public/js/rbbt.plots/rbbt.plots.graph.adapters.js

@@ -113,6 +113,7 @@ rbbt.plots.graph.view_cytoscapejs = function(graph_model, elem, style, layout, e
   rbbt.plots.graph.update(graph_model).then(function(updated_model){
     var cy_model = rbbt.plots.graph.build_cytoscapejs(updated_model)
 
+    console.log(cy_model)
     require_js(['/plugins/cytoscapejs/cytoscape.js'], function(){
       var cy_params = {
         container: elem,
@@ -214,6 +215,7 @@ rbbt.plots.graph.view_d3js_graph = function(graph_model, elem, node_obj){
 
   })
 }
+
 rbbt.plots.graph.view_mithril = function(graph_model, elem, container_obj, produce_obj){
   rbbt.plots.graph.update(graph_model).then(function(updated_model){
     var obj = $(elem)[0]

data/share/views/public/js/rbbt.plots/rbbt.plots.graph.kb.js

@@ -76,3 +76,58 @@ rbbt.plots.graph.parents = function(db, source, type){
     return rbbt.plots.graph.prepare_associations(db, associations, info)
   })
 }
+
+rbbt.plots.graph.filter_associations = function(associations,func){
+  var good = [];
+  var good_codes = [];
+  var codes = associations.codes
+  var source = associations.source
+  var target = associations.target
+  var length = codes.length
+  var info = associations.info
+  var aes = associations.aes
+
+  var fields = Object.keys(info)
+  var aes_fields = Object.keys(aes)
+
+  aes_fields = remove_from_array(aes_fields, 'database')
+  fields = remove_from_array(fields, 'database')
+  fields = remove_from_array(fields, 'undirected')
+
+  for (i = 0; i < length; i++){
+    var a_info = {};
+    for (f in fields){
+      var field = fields[f];
+      a_info[field] = info[field][i];
+    }
+
+    if (func(a_info)){
+      good.push(i);
+      good_codes.push(codes[i]);
+    }
+  }
+
+  var good_info = {}
+  for (f in fields){
+    var field = fields[f];
+    good_info[field] = []
+    for (p = 0; p < good.length; p++){
+      var i = good[p];
+      good_info[field].push(info[field][i])
+    }
+  }
+  var good_aes = {}
+  for (f in aes_fields){
+    var field = aes_fields[f];
+    good_aes[field] = []
+    for (p = 0; p < good.length; p++){
+      var i = good[p];
+      good_aes[field].push(aes[field][i])
+    }
+  }
+
+  associations.codes = good_codes
+  associations.info = good_info
+  associations.aes = good_aes
+  return associations
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.31
+  version: 1.8.32
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1804,7 +1804,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Rbbt Web and REST interfaces