[myexperiment-hackers] [2266] trunk: revised taverna 2 breakdown from mannie

[noreply]

Revision

2266

Author

dgc

Date

2009-08-24 09:49:01 -0400 (Mon, 24 Aug 2009)

Log Message

revised taverna 2 breakdown from mannie

Modified Paths

• trunk/app/views/workflows/taverna2_beta/_internals.rhtml
• trunk/lib/workflow_processors/taverna2_beta.rb

Diff

Modified: trunk/app/views/workflows/taverna2_beta/_internals.rhtml (2265 => 2266)

--- trunk/app/views/workflows/taverna2_beta/_internals.rhtml	2009-08-21 15:09:19 UTC (rev 2265)
+++ trunk/app/views/workflows/taverna2_beta/_internals.rhtml	2009-08-24 13:49:01 UTC (rev 2266)
@@ -1,7 +1,72 @@
 <% cache(:controller => 'workflows_cache', :action ="" 'internals', :id => workflow.id, :version => version) do -%>
 
 	<% if (model = workflow.get_workflow_model_object(version)) -%>
-		    
+    <!-- Authors -->
+    <% authors = model.annotations.authors -%>
+    <div class="fold">
+      <div class="foldTitle">
+        <%= info_icon_with_tooltip "This is the author information extracted from the workflow version" %>
+        Authors (<%= authors.nil? ? 0 : authors.length -%>)
+      </div>
+      <div class="foldContent" style="display: none;">
+        <% unless authors.blank? -%>
+          <table class="simple">
+            <% authors.each do |a| -%>
+              <tr>
+                <td><%= h a -%></td>
+              </tr>
+            <% end %>
+          </table>
+        <% else %>
+          <p class="none_text">None</p>
+        <% end %>
+      </div>
+    </div>
+    
+    <!-- Titles -->
+    <% titles = model.annotations.titles -%>
+    <div class="fold">
+      <div class="foldTitle">
+        <%= info_icon_with_tooltip "These are the descriptive titles embedded within the workflow version" %>
+        Titles (<%= titles.nil? ? 0 : titles.length -%>)
+      </div>
+      <div class="foldContent" style="display: none;">
+        <% unless titles.blank? -%>
+          <table class="simple">
+            <% titles.each do |t| -%>
+              <tr>
+                <td><%= h t -%></td>
+              </tr>
+            <% end %>
+          </table>
+        <% else %>
+          <p class="none_text">None</p>
+        <% end %>
+      </div>
+    </div>
+
+    <!-- Descriptions -->
+    <% descriptions = model.annotations.descriptions -%>
+    <div class="fold">
+      <div class="foldTitle">
+        <%= info_icon_with_tooltip "These are the descriptions embedded within the workflow version" %>
+        Descriptions (<%= descriptions.nil? ? 0 : descriptions.length -%>)
+      </div>
+      <div class="foldContent" style="display: none;">
+        <% unless descriptions.blank? -%>
+          <table class="simple">
+            <% descriptions.each do |desc| -%>
+              <tr>
+                <td><%= h desc -%></td>
+              </tr>
+            <% end %>
+          </table>
+        <% else %>
+          <p class="none_text">None</p>
+        <% end %>
+      </div>
+    </div>
+        
     <!-- Sources -->
     <% sources = model.sources -%>
     <div class="fold">

Modified: trunk/lib/workflow_processors/taverna2_beta.rb (2265 => 2266)

--- trunk/lib/workflow_processors/taverna2_beta.rb	2009-08-21 15:09:19 UTC (rev 2265)
+++ trunk/lib/workflow_processors/taverna2_beta.rb	2009-08-24 13:49:01 UTC (rev 2266)
@@ -183,13 +183,23 @@
     def get_search_terms
       def get_scufl_metadata(model)
         words = StringIO.new
-
+        
+        model.annotations.descriptions.each { |desc|
+          words << " #{desc}"
+        } if model.annotations.descriptions
+        
         model.sources.each do |source|
           words << " #{source.name}" if source.name
+          source.descriptions.each { |desc|
+            words << " #{desc}"
+          } if source.descriptions
         end
 
         model.sinks.each do |sink|
           words << " #{sink.name}" if sink.name
+          sink.descriptions.each { |desc|
+            words << " #{desc}"
+          } if sink.descriptions
         end
 
         model.processors.each do |processor|