Diff
Modified: branches/versions/config/schema.d/workflows.xml (3055 => 3056)
--- branches/versions/config/schema.d/workflows.xml 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/config/schema.d/workflows.xml 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,28 +1,6 @@
<?xml version="1.0"?>
<schema>
- <table name="workflows">
-
- <column type="integer" name="contributor_id"/>
- <column type="string" name="contributor_type"/>
- <column type="string" name="title"/>
- <column type="string" name="unique_name"/>
- <column type="text" name="body"/>
- <column type="text" name="body_html"/>
- <column type="datetime" name="created_at"/>
- <column type="datetime" name="updated_at"/>
- <column type="string" name="image"/>
- <column type="string" name="svg"/>
- <column type="integer" name="current_version"/>
- <column type="integer" name="content_blob_id"/>
- <column type="string" name="file_ext"/>
- <column type="string" name="last_edited_by"/>
- <column type="integer" name="content_type_id"/>
- <column type="integer" name="license_id"/>
- <column type="integer" name="preview_id"/>
-
- </table>
-
<table name="workflow_processors">
<column type="integer" name="workflow_id"/>
Modified: branches/versions/db/migrate/013_create_workflows.rb (3055 => 3056)
--- branches/versions/db/migrate/013_create_workflows.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/013_create_workflows.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -5,27 +5,30 @@
class CreateWorkflows < ActiveRecord::Migration
def self.up
-# create_table :workflows do |t|
-# t.column :contributor_id, :integer
-# t.column :contributor_type, :string
-#
-# t.column :scufl, :binary
-# t.column :image, :string
-# t.column :svg, :string
-#
-# t.column :title, :string
-# t.column :unique_name, :string
-#
-# t.column :body, :text
-# t.column :body_html, :text
-#
-# t.column :created_at, :datetime
-# t.column :updated_at, :datetime
-#
-# t.column :license, :string,
-# :limit => 10, :null => false,
-# :default => "by-sa"
-# end
+ create_table :workflows do |t|
+ t.column :contributor_id, :integer
+ t.column :contributor_type, :string
+
+ t.column :scufl, :binary
+ t.column :image, :string
+ t.column :svg, :string
+
+ t.column :title, :string
+ t.column :unique_name, :string
+
+ t.column :body, :text
+ t.column :body_html, :text
+
+ t.column :version, :integer
+ t.column :preview_id, :integer
+
+ t.column :created_at, :datetime
+ t.column :updated_at, :datetime
+
+ t.column :license, :string,
+ :limit => 10, :null => false,
+ :default => "by-sa"
+ end
create_table :workflow_versions do |t|
t.column "workflow_id", :integer
@@ -34,17 +37,11 @@
t.column "contributor_type", :string
t.column "title", :string
t.column "unique_name", :string
+ t.column "scufl", :text
t.column "body", :text
t.column "body_html", :text
t.column "created_at", :datetime
t.column "updated_at", :datetime
- t.column "image", :string
- t.column "svg", :string
- t.column "revision_comments", :text
- t.column "content_blob_id", :integer
- t.column "file_ext", :string
- t.column "last_edited_by", :string
- t.column "content_type_id", :integer
t.column "license", :string
t.column "preview_id", :integer
end
@@ -53,7 +50,7 @@
end
def self.down
-# drop_table :workflows
+ drop_table :workflows
drop_table :workflow_versions
end
end
Modified: branches/versions/db/migrate/034_update_for_new_versioning.rb (3055 => 3056)
--- branches/versions/db/migrate/034_update_for_new_versioning.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/034_update_for_new_versioning.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,17 +1,17 @@
class UpdateForNewVersioning < ActiveRecord::Migration
def self.up
-# rename_column :workflows, :version, :current_version
+ rename_column :workflows, :version, :current_version
-# add_column :workflow_versions, :image, :string
-# add_column :workflow_versions, :svg, :string
-# add_column :workflow_versions, :revision_comments, :text
+ add_column :workflow_versions, :image, :string
+ add_column :workflow_versions, :svg, :string
+ add_column :workflow_versions, :revision_comments, :text
end
def self.down
-# rename_column :workflows, :current_version, :version
+ rename_column :workflows, :current_version, :version
-# remove_column :workflow_versions, :image
-# remove_column :workflow_versions, :svg
-# remove_column :workflow_versions, :revision_comments
+ remove_column :workflow_versions, :image
+ remove_column :workflow_versions, :svg
+ remove_column :workflow_versions, :revision_comments
end
end
Modified: branches/versions/db/migrate/035_increase_workflow_size.rb (3055 => 3056)
--- branches/versions/db/migrate/035_increase_workflow_size.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/035_increase_workflow_size.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,22 +1,22 @@
class IncreaseWorkflowSize < ActiveRecord::Migration
def self.up
-# rename_column :workflows, :scufl, :temp
-# add_column :workflows, :scufl, :binary, :limit => 1073741824
-# execute 'UPDATE workflows SET scufl = temp'
-# remove_column :workflows, :temp
+ rename_column :workflows, :scufl, :temp
+ add_column :workflows, :scufl, :binary, :limit => 1073741824
+ execute 'UPDATE workflows SET scufl = temp'
+ remove_column :workflows, :temp
-# execute 'ALTER TABLE workflow_versions CHANGE COLUMN scufl scufl LONGBLOB'
+ execute 'ALTER TABLE workflow_versions CHANGE COLUMN scufl scufl LONGBLOB'
end
def self.down
-# rename_column :workflows, :scufl, :temp
-# add_column :workflows, :scufl, :binary
-# execute 'UPDATE workflows SET scufl = temp'
-# remove_column :workflows, :temp
+ rename_column :workflows, :scufl, :temp
+ add_column :workflows, :scufl, :binary
+ execute 'UPDATE workflows SET scufl = temp'
+ remove_column :workflows, :temp
-# execute 'ALTER TABLE workflow_versions CHANGE COLUMN scufl scufl BLOB'
+ execute 'ALTER TABLE workflow_versions CHANGE COLUMN scufl scufl BLOB'
end
end
Modified: branches/versions/db/migrate/046_add_type_to_workflows.rb (3055 => 3056)
--- branches/versions/db/migrate/046_add_type_to_workflows.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/046_add_type_to_workflows.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -2,16 +2,16 @@
class AddTypeToWorkflows < ActiveRecord::Migration
def self.up
-# add_column :workflows, :content_type, :string
-# add_column :workflow_versions, :content_type, :string
+ add_column :workflows, :content_type, :string
+ add_column :workflow_versions, :content_type, :string
-# # Currently, all workflows are scufl workflows
-# execute 'UPDATE workflows SET content_type = "application/vnd.taverna.scufl+xml"'
-# execute 'UPDATE workflow_versions SET content_type = "application/vnd.taverna.scufl+xml"'
+ # Currently, all workflows are scufl workflows
+ execute 'UPDATE workflows SET content_type = "application/vnd.taverna.scufl+xml"'
+ execute 'UPDATE workflow_versions SET content_type = "application/vnd.taverna.scufl+xml"'
end
def self.down
-# remove_column :workflows, :content_type
-# remove_column :workflow_versions, :content_type
+ remove_column :workflows, :content_type
+ remove_column :workflow_versions, :content_type
end
end
Modified: branches/versions/db/migrate/055_modify_workflows_and_workflow_versions_for_content_blobs.rb (3055 => 3056)
--- branches/versions/db/migrate/055_modify_workflows_and_workflow_versions_for_content_blobs.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/055_modify_workflows_and_workflow_versions_for_content_blobs.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,11 +1,11 @@
class ModifyWorkflowsAndWorkflowVersionsForContentBlobs < ActiveRecord::Migration
def self.up
-# add_column :workflows, :content_blob_id, :integer
-# add_column :workflow_versions, :content_blob_id, :integer
+ add_column :workflows, :content_blob_id, :integer
+ add_column :workflow_versions, :content_blob_id, :integer
end
def self.down
-# remove_column :workflows, :content_blob_id
-# remove_column :workflow_versions, :content_blob_id
+ remove_column :workflows, :content_blob_id
+ remove_column :workflow_versions, :content_blob_id
end
end
Modified: branches/versions/db/migrate/056_move_scufl_data_to_content_blobs.rb (3055 => 3056)
--- branches/versions/db/migrate/056_move_scufl_data_to_content_blobs.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/056_move_scufl_data_to_content_blobs.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,41 +1,41 @@
class MoveScuflDataToContentBlobs < ActiveRecord::Migration
def self.up
-# ActiveRecord::Base.record_timestamps = false
+ ActiveRecord::Base.record_timestamps = false
-# Workflow.find(:all).each do |w|
+ Workflow.find(:all).each do |w|
-# w.versions.each do |wv|
-# wv.content_blob = ContentBlob.new(:data ="" wv.scufl)
-# wv.save
-# end
+ w.versions.each do |wv|
+ wv.content_blob = ContentBlob.new(:data ="" wv.scufl)
+ wv.save
+ end
-# current = w.find_version(w.current_version)
-# w.content_blob = current.content_blob
+ current = w.find_version(w.current_version)
+ w.content_blob = current.content_blob
-# w.save
-# end
+ w.save
+ end
-# remove_column :workflows, :scufl
-# remove_column :workflow_versions, :scufl
+ remove_column :workflows, :scufl
+ remove_column :workflow_versions, :scufl
-# ActiveRecord::Base.record_timestamps = true
+ ActiveRecord::Base.record_timestamps = true
end
def self.down
-# ActiveRecord::Base.record_timestamps = false
+ ActiveRecord::Base.record_timestamps = false
-# add_column :workflows, :scufl, :binary, :limit => 1073741824
-# add_column :workflow_versions, :scufl, :binary, :limit => 1073741824
+ add_column :workflows, :scufl, :binary, :limit => 1073741824
+ add_column :workflow_versions, :scufl, :binary, :limit => 1073741824
-# execute 'UPDATE workflows,content_blobs SET workflows.scufl = content_blobs.data WHERE workflows.content_blob_id = content_blobs.id'
-# execute 'UPDATE workflow_versions,content_blobs SET workflow_versions.scufl = content_blobs.data WHERE workflow_versions.content_blob_id = content_blobs.id'
+ execute 'UPDATE workflows,content_blobs SET workflows.scufl = content_blobs.data WHERE workflows.content_blob_id = content_blobs.id'
+ execute 'UPDATE workflow_versions,content_blobs SET workflow_versions.scufl = content_blobs.data WHERE workflow_versions.content_blob_id = content_blobs.id'
-# Workflow.find(:all).each do |w|
-# w.versions.each do |wv|
-# wv.content_blob.destroy
-# end
-# end
+ Workflow.find(:all).each do |w|
+ w.versions.each do |wv|
+ wv.content_blob.destroy
+ end
+ end
-# ActiveRecord::Base.record_timestamps = true
+ ActiveRecord::Base.record_timestamps = true
end
end
Modified: branches/versions/db/migrate/066_add_file_ext_to_workflow.rb (3055 => 3056)
--- branches/versions/db/migrate/066_add_file_ext_to_workflow.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/066_add_file_ext_to_workflow.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,15 +1,15 @@
class AddFileExtToWorkflow < ActiveRecord::Migration
def self.up
-# add_column :workflows, :file_ext, :string
-# add_column :workflow_versions, :file_ext, :string
+ add_column :workflows, :file_ext, :string
+ add_column :workflow_versions, :file_ext, :string
# Currently, we assume that all workflows are scufl workflows!
-# execute 'UPDATE workflows SET file_ext = "xml"'
-# execute 'UPDATE workflow_versions SET file_ext = "xml"'
+ execute 'UPDATE workflows SET file_ext = "xml"'
+ execute 'UPDATE workflow_versions SET file_ext = "xml"'
end
def self.down
-# remove_column :workflows, :file_ext
-# remove_column :workflow_versions, :file_ext
+ remove_column :workflows, :file_ext
+ remove_column :workflow_versions, :file_ext
end
end
Modified: branches/versions/db/migrate/067_add_last_edited_by_to_workflows.rb (3055 => 3056)
--- branches/versions/db/migrate/067_add_last_edited_by_to_workflows.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/067_add_last_edited_by_to_workflows.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,14 +1,14 @@
class AddLastEditedByToWorkflows < ActiveRecord::Migration
def self.up
-# add_column :workflows, :last_edited_by, :string
-# add_column :workflow_versions, :last_edited_by, :string
+ add_column :workflows, :last_edited_by, :string
+ add_column :workflow_versions, :last_edited_by, :string
-# execute 'UPDATE workflows SET last_edited_by=contributor_id'
-# execute 'UPDATE workflow_versions SET last_edited_by=contributor_id'
+ execute 'UPDATE workflows SET last_edited_by=contributor_id'
+ execute 'UPDATE workflow_versions SET last_edited_by=contributor_id'
end
def self.down
-# remove_column :workflows, :last_edited_by
-# remove_column :workflow_versions, :last_edited_by
+ remove_column :workflows, :last_edited_by
+ remove_column :workflow_versions, :last_edited_by
end
end
Modified: branches/versions/db/migrate/076_create_content_types.rb (3055 => 3056)
--- branches/versions/db/migrate/076_create_content_types.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/076_create_content_types.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -15,8 +15,8 @@
# t.column :updated_at, :datetime
# end
-# add_column :workflows, :content_type_id, :integer
-# add_column :workflow_versions, :content_type_id, :integer
+ add_column :workflows, :content_type_id, :integer
+ add_column :workflow_versions, :content_type_id, :integer
add_column :blobs, :content_type_id, :integer
# Create ContentType records for workflows with processors
@@ -94,19 +94,19 @@
# execute("UPDATE blobs SET content_type_id = #{blob_type_to_content_type_id[b.attributes["content_type"].strip]} WHERE id = #{b.id}")
# end
-# remove_column :workflows, :content_type
-# remove_column :workflow_versions, :content_type
+ remove_column :workflows, :content_type
+ remove_column :workflow_versions, :content_type
remove_column :blobs, :content_type
end
def self.down
-# add_column :workflows, :content_type, :string
-# add_column :workflow_versions, :content_type, :string
+ add_column :workflows, :content_type, :string
+ add_column :workflow_versions, :content_type, :string
add_column :blobs, :content_type, :string
-# remove_column :workflows, :content_type_id
-# remove_column :workflow_versions, :content_type_id
+ remove_column :workflows, :content_type_id
+ remove_column :workflow_versions, :content_type_id
remove_column :blobs, :content_type_id
# drop_table :content_types
Modified: branches/versions/db/migrate/080_add_license_id_to_workflows_and_blobs.rb (3055 => 3056)
--- branches/versions/db/migrate/080_add_license_id_to_workflows_and_blobs.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/080_add_license_id_to_workflows_and_blobs.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -1,37 +1,37 @@
class AddLicenseIdToWorkflowsAndBlobs < ActiveRecord::Migration
def self.up
#Need to rename columns so that license method and license field do not get confused
-# rename_column :workflows, :license, :license_name
+ rename_column :workflows, :license, :license_name
rename_column :blobs, :license, :license_name
-#
-# add_column :workflows, :license_id, :integer, :default => nil
+
+ add_column :workflows, :license_id, :integer, :default => nil
add_column :blobs, :license_id, :integer, :default => nil
-# Workflow.find(:all).each do |w|
-# execute("UPDATE workflows SET license_id = #{License.find(:first,:conditions=>[ 'unique_name = ?', w.license_name ]).id } WHERE id = #{w.id}")
-# end
+ Workflow.find(:all).each do |w|
+ execute("UPDATE workflows SET license_id = #{License.find(:first,:conditions=>[ 'unique_name = ?', w.license_name ]).id } WHERE id = #{w.id}")
+ end
Blob.find(:all).each do |b|
execute("UPDATE blobs SET license_id = #{License.find(:first,:conditions=>[ 'unique_name = ?', b.license_name ]).id } WHERE id = #{b.id}")
end
-# remove_column :workflows, :license_name
+ remove_column :workflows, :license_name
remove_column :blobs, :license_name
end
def self.down
-# add_column :workflows, :license, :string,
-# :limit => 10, :null => false,
-# :default => "by-sa"
-#
+ add_column :workflows, :license, :string,
+ :limit => 10, :null => false,
+ :default => "by-sa"
+
add_column :blobs, :license, :string,
:limit => 10, :null => false,
:default => "by-sa"
-# Workflow.find(:all).each do |w|
-# execute("UPDATE workflows SET license = '#{License.find(w.license_id).unique_name }' WHERE id = #{w.id}")
-# end
+ Workflow.find(:all).each do |w|
+ execute("UPDATE workflows SET license = '#{License.find(w.license_id).unique_name }' WHERE id = #{w.id}")
+ end
Blob.find(:all).each do |b|
execute("UPDATE blobs SET license = '#{License.find(b.license_id).unique_name }' WHERE id = #{b.id}")
end
-# remove_column :workflows, :license_id
+ remove_column :workflows, :license_id
remove_column :blobs, :license_id
end
end
Modified: branches/versions/db/migrate/090_adjust_pictures.rb (3055 => 3056)
--- branches/versions/db/migrate/090_adjust_pictures.rb 2012-07-28 22:37:44 UTC (rev 3055)
+++ branches/versions/db/migrate/090_adjust_pictures.rb 2012-07-30 15:29:06 UTC (rev 3056)
@@ -20,7 +20,7 @@
workflow_svg[workflow.id] = workflow.svg_fc
end
- Workflow::Version.find(:all, :select => 'id, image AS image_fc, svg AS svg_fc').each do |workflow_version|
+ WorkflowVersion.find(:all, :select => 'id, image AS image_fc, svg AS svg_fc').each do |workflow_version|
workflow_version_image[workflow_version.id] = workflow_version.image_fc
workflow_version_svg[workflow_version.id] = workflow_version.svg_fc
end
@@ -44,7 +44,7 @@
end
end
- Workflow::Version.find(:all).each do |workflow_version|
+ WorkflowVersion.find(:all).each do |workflow_version|
if workflow_version_image[workflow_version.id] || workflow_version_svg[workflow_version.id]