myexperiment-hackers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myexperiment-hackers] [3766] branches/packs: added exception to catch m


From: noreply
Subject: [myexperiment-hackers] [3766] branches/packs: added exception to catch misconfigured templates
Date: Fri, 1 Nov 2013 15:56:04 +0000 (UTC)

Revision
3766
Author
dgc
Date
2013-11-01 15:56:03 +0000 (Fri, 01 Nov 2013)

Log Message

added exception to catch misconfigured templates

Modified Paths

Diff

Modified: branches/packs/app/models/research_object.rb (3765 => 3766)


--- branches/packs/app/models/research_object.rb	2013-11-01 15:55:21 UTC (rev 3765)
+++ branches/packs/app/models/research_object.rb	2013-11-01 15:56:03 UTC (rev 3766)
@@ -854,6 +854,8 @@
 
     parameter = template["parameters"].find { |p| p["symbol"] == symbol }
 
+    throw "No template match for #{symbol.inspect}" if parameter.nil?
+
     # No problem if the parameter type isn't a select.
     return true unless parameter["type"] == "select"
 

Modified: branches/packs/app/views/items/show.html.erb (3765 => 3766)


--- branches/packs/app/views/items/show.html.erb	2013-11-01 15:55:21 UTC (rev 3765)
+++ branches/packs/app/views/items/show.html.erb	2013-11-01 15:56:03 UTC (rev 3766)
@@ -120,6 +120,15 @@
       </ul>
     <% end %>
 
+    <% unless @wsdl_uris.empty? %>
+      <h2>Web services</h2>
+      <ul>
+        <% @wsdl_uris.each do |wsdl_uri| %>
+          <li><%=h wsdl_uri -%></li>
+        <% end %>
+      </ul>
+    <% end %>
+
     <% unless @workflow_runs.empty? %>
       <h2>Workflow runs</h2>
       <ul>

Modified: branches/packs/config/default_settings.yml (3765 => 3766)


--- branches/packs/config/default_settings.yml	2013-11-01 15:55:21 UTC (rev 3765)
+++ branches/packs/config/default_settings.yml	2013-11-01 15:56:03 UTC (rev 3766)
@@ -1587,9 +1587,11 @@
 
     parameters:
 
-    - label:  Resource
-      type:   resource 
-      symbol: :resource
+    - label:     Workflow
+      type:      select
+      symbol:    :workflow
+      node_type: resource
+      special:   wfdesc_workflow
 
     - label:  Hardware
       type:   string 
@@ -1602,7 +1604,7 @@
 
     required_statements:
 
-    - template: [:resource, "<http://purl.org/wf4ever/roterms#requiresHardware>", :b1]
+    - template: [:workflow, "<http://purl.org/wf4ever/roterms#requiresHardware>", :b1]
 
     - template: [:b1, "<http://purl.org/dc/terms/description>", :description]
 
@@ -1610,10 +1612,8 @@
       depends:  [:link]
 
     targets:
-    - :resource
+    - :workflow
 
-    redirect: :resource
-
   requires_software:
 
     label: requires software
@@ -1622,9 +1622,11 @@
 
     parameters:
 
-    - label:  Resource
-      type:   resource 
-      symbol: :resource
+    - label:     Workflow
+      type:      select
+      symbol:    :workflow
+      node_type: resource
+      special:   wfdesc_workflow
 
     - label:  Software
       type:   string 
@@ -1637,7 +1639,7 @@
 
     required_statements:
 
-    - template: [:resource, "<http://purl.org/wf4ever/roterms#requiresSoftware>", :b1]
+    - template: [:workflow, "<http://purl.org/wf4ever/roterms#requiresSoftware>", :b1]
 
     - template: [:b1, "<http://purl.org/dc/terms/description>", :description]
 
@@ -1645,10 +1647,8 @@
       depends:  [:link]
 
     targets:
-    - :resource
+    - :workflow
 
-    redirect: :resource
-
   resource_type:
 
     label: resource type
@@ -1998,6 +1998,28 @@
 
     redirect: :resource
 
+# service:
+
+#   label: service
+
+#   parameters:
+
+#   - label:     Workflow
+#     type:      select
+#     symbol:    :workflow
+#     node_type: resource
+#     special:   wfdesc_workflow
+
+#   required_statements:
+
+#   - template: [:resource, "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>", :type]
+
+#   targets:
+
+#   - :workflow
+
+#   redirect: :resource
+
 wf_ro_service_uri: "http://www.example.com/wf-ro/jobs"
 wf_ro_service_bearer_token: "bearer-token"
 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]