added dependants and through for relationships

app/models/accession.rb

@@ -1,7 +1,15 @@
 class Accession < ActiveRecord::Base
   attr_accessible :accession_date, :comments, :donor, :donor_contact_info, :donor_notes, :enabled, :expected_completion_date, :identifier, :inclusive_dates, :material_type_id, :physical_description, :processing_priority_id, :received_extent, :received_extent_unit_id, :scope_content, :title, :unprocessed_extent, :unprocessed_extent_unit_id
   belongs_to :material_type
-  has_many :accessionLocationEntries
-  has_many :creator_accession_relationships
+  belongs_to :processing_priority
+  belongs_to :extent_unit
+  has_many :accession_location_entries ,:dependent => :destroy
+  has_many :creator_accession_relationships,:dependent => :destroy
+  has_many :accession_subject_relationships, :dependent => :destroy
+  has_many :accession_collection_relationships, :dependent => :destroy
+  has_many :locations, :through => :accession_location_entries
+  has_many :subjects, :through => :accession_subject_relationships
+  has_many :creators, :through => :creator_accession_relationships
+  has_many :collections, :through => :accession_collection_relationships
 
 end

app/models/accession_collection_relationship.rb

@@ -0,0 +1,5 @@
+ class AccessionCollectionRelationship < ActiveRecord::Base
+  belongs_to :accessions
+  belongs_to :collections
+  belongs_to :classifications
+end

app/models/accession_subject_relationship.rb

@@ -0,0 +1,4 @@
+ class AccessionSubjectRelationship < ActiveRecord::Base
+  belongs_to :accession
+  belongs_to :subject
+end

app/models/book.rb

@@ -1,5 +1,6 @@
 class Book < ActiveRecord::Base
   attr_accessible :copy_edition, :description, :edition, :notes, :number_of_pages, :place_of_publication, :publication_date, :publisher, :series, :title
   belongs_to :collection
-  has_many :creatorBookRelationships
+  has_many :creator_book_relationships ,:dependent => :destroy
+  has_many :creators , :through =>  :creator_book_relationships
 end

app/models/classification.rb

@@ -1,5 +1,8 @@
 class Classification < ActiveRecord::Base
   attr_accessible :classification_identifier, :creator_id, :description, :parent_id, :title
   belongs_to :creator
+  belongs_to :classification, :foreign_key => "parent_id"
   has_many :collections
+  has_many :accession_collection_relationships, :dependent => :destroy
+  has_many :accessions, :through => :accession_collection_relationships
 end

app/models/collection.rb

@@ -1,10 +1,23 @@
 class Collection < ActiveRecord::Base
   attr_accessible :abstract, :access_restrictions, :accrual_info, :acquisition_date, :acquisition_method, :acquisition_source, :alt_extent_statement, :appraisal_info, :arrangement, :biog_hist, :biog_hist_author, :classification_id, :collection_identifier, :custodial_history, :descpriptive_rules_id, :enabled, :extent, :extent_unit_id, :finding_aid_author, :finding_language_id, :inclusive_dates, :material_type_id, :normal_date_begin, :normal_date_end, :orig_copies_note, :orig_copies_url, :other_note, :other_url, :physical_access, :predominant_dates, :preferred_citation, :processing_info, :publication_date, :publication_note, :related_materials, :related_materials_url, :related_publications, :repository_id, :revision_history, :scope, :separated_materials, :sort_title, :technical_access, :title, :use_restrictions
-  has_many :collection_contents
+  has_many :collection_contents, :dependent => :destroy
   belongs_to :classification
-  has_one :collection_creator_relationship
-  has_one :collectionLocationEntry
-  has_many :digitalContents
-  has_many :resarchCarts
+  belongs_to :repository
+  belongs_to :material_type
+  belongs_to :language
+  belongs_to :extent_unit
+  belongs_to :descriptive_rule
+  has_many :collection_creator_relationships, :dependent => :destroy
+  has_one :collection_location_entry,:dependent => :destroy
+  has_many :accession_collection_relationships, :dependent => :destroy
+  has_many :collection_subject_relationships, :dependent => :destroy
+  has_many :collection_language_relationships, :dependent => :destroy
+  has_many :digital_contents
+  has_many :resarch_carts
   has_many :research_appointment_materials
-end
+  has_many :subjects, :through => :collection_subject_relationships
+  has_many :languages, :through => :collection_language_relationships
+  has_many :locations, :through => :collection_location_entries
+  has_many  :creators, :through => :collection_creator_relationships
+  has_many :accessions, :through => :accession_collection_relationships
+end

app/models/collection_content.rb

@@ -2,8 +2,13 @@ class CollectionContent < ActiveRecord::Base
   attr_accessible :collection_id, :contains_content, :date, :description, :enabled, :level_container_id, :level_container_identifier, :parent_id, :private_title, :root_content_id, :sort_order, :title
   belongs_to :collection
   belongs_to :level_container
+  belongs_to :collection_content, :foreign_key="parent_id"
   has_many :digitalContents
-  has_many :resarchCarts
+  has_many :resarch_carts
   has_many :research_appointment_materials
-  has_one :userField
+  has_one :user_field, :dependent => :destroy
+  has_many :collection_content_subject_relationships, :dependent => :destroy
+  has_many :collection_content_creator_relationships, :dependent => :destroy
+  has_many :subjects, :through => :collection_content_subject_relationships
+  has_many :creators, :through => :collection_content_creator_relationships
 end

app/models/collection_content_creator_relationship.rb

@@ -0,0 +1,4 @@
+ class CollectionContentCreatorRelationship < ActiveRecord::Base
+  belongs_to :collection_content
+  belongs_to :creator
+end

app/models/collection_content_subject_relationship.rb

@@ -0,0 +1,4 @@
+ class CollectionContentSubjectRelationship < ActiveRecord::Base
+  belongs_to :collection_content
+  belongs_to :subject
+end

app/models/collection_creator_relationship.rb

@@ -1,7 +1,7 @@
 class CollectionCreatorRelationship < ActiveRecord::Base
   attr_accessible :collection_id, :creator_id, :primary_creator
-  has_one :collection
-  has_one :creator
+  belongs_to :collection
+  belongs_to :creator
   validates_presence_of :collection_id
   validates_presence_of :creator_id
 end

app/models/collection_language_relationship.rb

@@ -0,0 +1,4 @@
+ class CollectionLanguageRelationship < ActiveRecord::Base
+  belongs_to :collection
+  belongs_to :language
+end

app/models/collection_location_entry.rb

@@ -1,7 +1,6 @@
 class CollectionLocationEntry < ActiveRecord::Base
   attr_accessible :collection_id, :content, :extent, :extent_unit_id, :location_id, :range_value, :section, :shelf
-  has_one :location
-  has_one :collection
-  validates_presence_of :location
-  validates_presence_of :collection
+  belongs_to :location
+  belongs_to :collection
+  belongs_to :extent_unit
 end

app/models/collection_subject_relationship.rb

@@ -0,0 +1,4 @@
+ class CollectionSubjectRelationship < ActiveRecord::Base
+  belongs_to :collection
+  belongs_to :subject
+end