[myexperiment-hackers] [3703] branches/packs: reverted to generic workflow run type as resource type

[noreply]

Revision

3703

Author

dgc

Date

2013-09-11 09:27:32 +0000 (Wed, 11 Sep 2013)

Log Message

reverted to generic workflow run type as resource type

Modified Paths

• branches/packs/app/controllers/packs_controller.rb
• branches/packs/config/default_settings.yml

Diff

Modified: branches/packs/app/controllers/packs_controller.rb (3702 => 3703)

--- branches/packs/app/controllers/packs_controller.rb	2013-09-11 08:49:34 UTC (rev 3702)
+++ branches/packs/app/controllers/packs_controller.rb	2013-09-11 09:27:32 UTC (rev 3703)
@@ -12,11 +12,8 @@
   ## NOTE: URI must match config/default_settings.yml ro_resource_types
   WORKFLOW_DEFINITION = "http://purl.org/wf4ever/wfdesc#WorkflowDefinition"
   RO_RESOURCE = "http://purl.org/wf4ever/ro#Resource"
+  WORKFLOW_RUN = ["http://purl.org/wf4ever/roterms#WorkflowRunBundle"]
 
-  WORKFLOW_RUN = ["http://purl.org/wf4ever/roterms#ResultGenerationRun",
-                  "http://purl.org/wf4ever/roterms#ExampleRun",
-                  "http://purl.org/wf4ever/roterms#ProspectiveRun"]
-
   before_filter :login_required, :except => [:index, :show, :search, :items, :download, :statistics]
   
   before_filter :find_pack_auth, :except => [:index, :new, :create, :search]

Modified: branches/packs/config/default_settings.yml (3702 => 3703)

--- branches/packs/config/default_settings.yml	2013-09-11 08:49:34 UTC (rev 3702)
+++ branches/packs/config/default_settings.yml	2013-09-11 09:27:32 UTC (rev 3703)
@@ -1462,15 +1462,10 @@
   - label:  "Example outputs"
     uri:    "http://purl.org/wf4ever/roterms#ExampleOutputs"
 
-  - label:  "Example Workflow Run"
-    uri:    "http://purl.org/wf4ever/roterms#ExampleRun"
+  - label:  "Workflow run"
+    uri:    "http://purl.org/wf4ever/roterms#WorkflowRunBundle"
+    folder: "datasets/results"
 
-  - label:  "Prospective Workflow Run"
-    uri:    "http://purl.org/wf4ever/roterms#ProspectiveRun"
-
-  - label:  "Results Generating Workflow Run"
-    uri:    "http://purl.org/wf4ever/roterms#ResultGenerationRun"
-
   - label:  "Paper"
     uri:    "http://purl.org/wf4ever/roterms#Paper"
     folder: "biblio"
@@ -1697,15 +1692,9 @@
       - - "Example outputs"
         - "http://purl.org/wf4ever/roterms#ExampleOutputs"
 
-      - - "Example Workflow Run"
-        - "http://purl.org/wf4ever/roterms#ExampleRun"
+      - - "Workflow run"
+        - "http://purl.org/wf4ever/roterms#WorkflowRunBundle"
 
-      - - "Prospective Workflow Run"
-        - "http://purl.org/wf4ever/roterms#ProspectiveRun"
-
-      - - "Results Generating Workflow Run"
-        - "http://purl.org/wf4ever/roterms#ResultGenerationRun"
-
       - - "Paper"
         - "http://purl.org/wf4ever/roterms#Paper"