reverting some changes

app/models/media_object.rb

@@ -342,23 +342,22 @@ def update_attribute_in_metadata(attribute, value = [], attributes = [])
   end
 
   def set_media_types!
-    resource_type_names = { 
-      'audio' => 'sound recording',
-      'video' => 'moving image'
-    }
     mime_types = parts.collect { |mf| 
       mf.file_location.nil? ? nil : Rack::Mime.mime_type(File.extname(mf.file_location)) 
     }.compact.uniq
-
-    master_file_media_type_map = {'Moving image' => 'moving image', 'Sound' => 'sound recording'}
-    resource_types = self.parts.collect{|master_file| master_file_media_type_map[master_file.file_format] }.uniq
+    
+    resource_type_to_formatted_text_map = {'Moving image' => 'Moving image', 'Sound' => 'Sound recording'}
+    resource_types = self.parts.collect{|master_file| resource_type_to_formatted_text_map[master_file.file_format] }.uniq
 
     mime_types = nil if mime_types.empty?
     resource_types = nil if resource_types.empty?
 
-    descMetadata.find_by_terms(:physical_description).remove
+    descMetadata.ensure_root_term_exists!(:physical_description)
+    descMetadata.ensure_root_term_exists!(:resource_type)
+
+    descMetadata.find_by_terms(:physical_description, :internet_media_type).remove
     descMetadata.find_by_terms(:resource_type).remove
-    descMetadata.ensure_physical_description_exists!
+
     descMetadata.update_values([:physical_description, :internet_media_type] => mime_types, [:resource_type] => resource_types)
   end
 

app/models/mods_behaviors.rb

@@ -89,9 +89,9 @@ def update_change_date!(t=Time.now.iso8601)
     self.record_change_date = t
   end
 
-  def ensure_physical_description_exists!
-    if find_by_terms(:physical_description).empty?
-      ng_xml.root.add_child('<physicalDescription/>')
+  def ensure_root_term_exists!(term)
+    if find_by_terms(term).empty?
+      ng_xml.root.add_child("<#{term.to_s.camelcase(first_letter = :lower)}/>")
     end
   end