Diff
Modified: branches/packs/app/models/blob.rb (3779 => 3780)
--- branches/packs/app/models/blob.rb 2013-11-12 13:12:55 UTC (rev 3779)
+++ branches/packs/app/models/blob.rb 2013-11-12 13:56:15 UTC (rev 3780)
@@ -121,10 +121,9 @@
slug = "File#{self.id}"
slug = SecureRandom.uuid if ResearchObject.find_by_slug_and_version(slug, nil)
- ro = ResearchObject.create(:slug => slug, :user => self.contributor)
+ ro = build_research_object(:slug => slug, :user => self.contributor)
+ ro.save
- update_attribute(:research_object, ro)
-
file_resource = ro.create_aggregated_resource(
:user_uri => user_path,
:path => local_name, # FIXME - where should these be URL encoded?
Modified: branches/packs/app/models/pack.rb (3779 => 3780)
--- branches/packs/app/models/pack.rb 2013-11-12 13:12:55 UTC (rev 3779)
+++ branches/packs/app/models/pack.rb 2013-11-12 13:56:15 UTC (rev 3780)
@@ -1159,13 +1159,9 @@
slug = "Pack#{self.id}"
slug = SecureRandom.uuid if ResearchObject.find_by_slug_and_version(slug, nil)
- ro = ResearchObject.create(:slug => slug, :user => self.contributor)
+ ro = build_research_object(:slug => slug, :user => self.contributor)
+ ro.save
- update_attributes( {
- :ro_uri => relative_uri(ro.uri, Conf.base_uri),
- :research_object => ro
- })
-
# Create the folder structure
user_path = "/users/#{contributor.id}"
Modified: branches/packs/app/models/resource.rb (3779 => 3780)
--- branches/packs/app/models/resource.rb 2013-11-12 13:12:55 UTC (rev 3779)
+++ branches/packs/app/models/resource.rb 2013-11-12 13:56:15 UTC (rev 3780)
@@ -219,13 +219,11 @@
if path == ResearchObject::MANIFEST_PATH
- research_object.resources.reload
-
# The manifest should contain the metadata for every resource, so we need
# to know the metrics of each. This means that we must ensure that all
# RDF is generated before we create the manifest.
- research_object.resources.each do |resource|
+ research_object.resources(true).each do |resource|
unless resource.path == ResearchObject::MANIFEST_PATH
resource.generate_graph! if resource.content_blob.nil?
end
Modified: branches/packs/app/models/workflow.rb (3779 => 3780)
--- branches/packs/app/models/workflow.rb 2013-11-12 13:12:55 UTC (rev 3779)
+++ branches/packs/app/models/workflow.rb 2013-11-12 13:56:15 UTC (rev 3780)
@@ -454,9 +454,8 @@
slug = "Workflow#{self.id}"
slug = SecureRandom.uuid if ResearchObject.find_by_slug_and_version(slug, nil)
- ro = ResearchObject.create(:slug => slug, :user => self.contributor)
-
- update_attribute(:research_object, ro)
+ ro = build_research_object(:slug => slug, :user => self.contributor)
+ ro.save
workflow_resource = ro.create_aggregated_resource(
:user_uri => user_path,
Modified: branches/packs/db/migrate/20130520145900_create_research_objects.rb (3779 => 3780)
--- branches/packs/db/migrate/20130520145900_create_research_objects.rb 2013-11-12 13:12:55 UTC (rev 3779)
+++ branches/packs/db/migrate/20130520145900_create_research_objects.rb 2013-11-12 13:56:15 UTC (rev 3780)
@@ -53,21 +53,12 @@
t.string "resource_path"
end
- add_column :packs, :ro_uri, :text
- add_column :packs, :research_object_id, :text
- add_column :pack_contributable_entries, :resource_id, :integer
- add_column :pack_remote_entries, :resource_id, :integer
end
def self.down
drop_table :research_objects
drop_table :resources
drop_table :annotation_resources
-
- remove_column :packs, :ro_uri
- remove_column :packs, :research_object_id
- remove_column :pack_contributable_entries, :resource_id
- remove_column :pack_remote_entries, :resource_id
end
end
Modified: branches/packs/db/schema.rb (3779 => 3780)
--- branches/packs/db/schema.rb 2013-11-12 13:12:55 UTC (rev 3779)
+++ branches/packs/db/schema.rb 2013-11-12 13:56:15 UTC (rev 3780)
@@ -520,7 +520,6 @@
t.datetime "updated_at"
t.integer "current_version"
t.integer "license_id"
- t.text "ro_uri"
end
create_table "pending_invitations", :force => true do |t|