X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/545282711fe66e35cc486243e41b70cc82551e21..aa66a90eecda1fc79f869ceee36eaed12d806145:/apps/workbench/app/controllers/collections_controller.rb

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index bf7dde0a0e..caf49baa74 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,11 +1,7 @@
 class CollectionsController < ApplicationController
-  skip_before_filter :find_object_by_uuid, :only => [:graph]
+  skip_before_filter :find_object_by_uuid, :only => [:provenance]
   skip_before_filter :check_user_agreements, :only => [:show_file]
 
-  def graph
-    index
-  end
-
   def index
     if params[:search].andand.length.andand > 0
       tags = Link.where(any: ['contains', params[:search]])
@@ -56,141 +52,6 @@ class CollectionsController < ApplicationController
     self.response_body = FileStreamer.new opts
   end
 
-  def describe_node(uuid)
-    rsc = ArvadosBase::resource_class_for_uuid uuid
-    if rsc
-      "\"#{uuid}\" [label=\"#{rsc}\\n#{uuid}\",href=\"#{url_for rsc}/#{uuid}\"];"
-    else
-      ""
-    end
-  end
-
-  def describe_script(job)
-    #"""\"#{job.script_version}\" [label=\"#{job.script}: #{job.script_version}\"];
-    #   \"#{job.uuid}\" -> \"#{job.script_version}\" [label=\"script\"];"""
-    "\"#{job.uuid}\" [label=\"#{job.script}\\n#{job.script_version}\"];"
-  end
-
-  def job_uuid(job)
-    "#{job.script}\\n#{job.script_version}"
-  end
-
-  def collection_uuid(uuid)
-    m = /([a-f0-9]{32}(\+[0-9]+)?)(\+.*)?/.match(uuid)
-    if m
-      m[1]
-    else
-      nil
-    end
-  end
-
-  def script_param_edges(visited, job, prefix, sp)
-    gr = ""
-    if sp and not sp.empty?
-      case sp
-      when Hash
-        sp.each do |k, v|
-          if prefix.size > 0
-            k = prefix + "::" + k.to_s
-          end
-          gr += script_param_edges(visited, job, k.to_s, v)
-        end
-      when Array
-        sp.each do |v|
-          gr += script_param_edges(visited, job, prefix, v)
-        end
-      else
-        m = collection_uuid(sp)
-        if m
-          gr += "\"#{job_uuid(job)}\" -> \"#{m}\" [label=\" #{prefix}\"];"
-          gr += generate_provenance_edges(visited, m)
-        end
-      end
-    end
-    gr
-  end
-
-  def generate_provenance_edges(visited, uuid)
-    gr = ""
-    m = collection_uuid(uuid)
-
-    if not uuid or uuid.empty? or visited[uuid] or visited[m]
-      return ""
-    end
-
-    #puts "visiting #{uuid}"
-
-    if m  
-      # uuid is a collection
-      uuid = m
-      visited[uuid] = true
-
-      gr += describe_node(uuid)
-
-      Job.where(output: uuid).each do |job|
-        #gr += describe_node(job_uuid(job)) 
-        gr += "\"#{uuid}\" -> \"#{job_uuid(job)}\" [label=\" output\"];"
-        gr += generate_provenance_edges(visited, job.uuid)
-      end
-
-      Job.where(log: uuid).each do |job|
-        #gr += describe_node(job_uuid(job))
-        gr += "\"#{uuid}\" -> \"#{job_uuid(job)}\" [label=\" log\"];"
-        gr += generate_provenance_edges(visited, job.uuid)
-      end
-      
-    else
-      visited[uuid] = true
-
-      # uuid is something else
-      rsc = ArvadosBase::resource_class_for_uuid uuid
-
-      if rsc == Job
-        Job.where(uuid: uuid).each do |job|
-          gr += script_param_edges(visited, job, "", job.script_parameters)
-          #gr += describe_script(job)
-        end
-      else
-        gr += describe_node(uuid)
-      end
-    end
-
-    Link.where(head_uuid: uuid, link_class: "provenance").each do |link|
-      gr += describe_node(link.tail_uuid)
-      gr += "\"#{link.head_uuid}\" -> \"#{link.tail_uuid}\" [label=\" #{link.name}\", href=\"/links/#{link.uuid}\"];"
-      gr += generate_provenance_edges(visited, link.tail_uuid)
-    end
-
-    #puts "finished #{uuid}"
-
-    gr
-  end
-
-  def create_provenance_graph(uuid)
-    require 'open3'
-    
-    gr = """strict digraph {
-//rankdir=LR;
-node [fontsize=8,shape=box];
-edge [dir=back,fontsize=8];"""
-
-    visited = {}
-    gr += generate_provenance_edges(visited, uuid)
-
-    gr += "}"
-    svg = ""
-
-    Open3.popen2("dot", "-Tsvg") do |stdin, stdout, wait_thr|
-      stdin.print(gr)
-      stdin.close
-      svg = stdout.read()
-      wait_thr.value
-      stdout.close()
-    end
-
-    svg = svg.sub(/<\?xml.*?\?>/m, "")
-    svg = svg.sub(/<!DOCTYPE.*?>/m, "")
-  end
 
   def show
     return super if !@object
@@ -236,8 +97,10 @@ edge [dir=back,fontsize=8];"""
         @sourcedata[collection.uuid][:collection] = collection
       end
     end
-
-    @prov_svg = create_provenance_graph(@object.uuid)
+    
+    Collection.where(uuid: @object.uuid).each do |u|
+      @prov_svg = ProvenanceHelper::create_provenance_graph u.provenance, {:direction => :bottom_up, :combine_jobs => true}
+    end
   end
 
   protected