1 files changed, 20 insertions, 20 deletions
diff --git a/lib/sisu/v0/db_import.rb b/lib/sisu/v0/db_import.rb
index e30776c7..1e1e25d7 100644
--- a/lib/sisu/v0/db_import.rb
+++ b/lib/sisu/v0/db_import.rb
@@ -179,7 +179,7 @@ module SiSU_DB_import
         @@id_t+=1 #bug related, needs to be performed once at start of file, but consider moving, as, placed here it means program will fail if document header lacks 0~title
         puts %{\n#{@cX.grey}Processing file number#{@cX.off}: #{@cX.green}#{@@id_t}#{@@cX.off}} unless @opt.cmd =~/q/
       end
-      if @md.dc_title; @tp[:long_title]=@md.dc_title
+      if @md.full_title; @tp[:long_title]=@md.full_title #dc
         #sql='SELECT MAX(tid) FROM metadata'
         #id_t=@conn.execute( sql ) { |x| x.fetch_all.to_s.to_i }
         #@@id_t=id_t if id_t
@@ -191,11 +191,11 @@ module SiSU_DB_import
         special_character_escape(txt)
         @tp[:subtitle_f],@tp[:subtitle_i]='subtitle, ',"'#{txt}', "
       end
-      if @md.dc_creator; txt=@md.dc_creator
+      if @md.author; txt=@md.author #dc
         special_character_escape(txt)
         @tp[:creator_f],@tp[:creator_i]='creator, ',"'#{txt}', "
       end
-      if @md.dc_contributor; txt=@md.dc_contributor
+      if @md.contributor; txt=@md.contributor #dc
         special_character_escape(txt)
         @tp[:contributor_f],@tp[:contributor_i]='contributor, ',"'#{txt}', "
       end
@@ -207,7 +207,7 @@ module SiSU_DB_import
         special_character_escape(txt)
         @tp[:illustrator_f],@tp[:illustrator_i]='illustrator, ',"'#{txt}', "
       end
-      if @md.dc_publisher; txt=@md.dc_publisher
+      if @md.publisher; txt=@md.publisher #dc
         special_character_escape(txt)
         @tp[:publisher_f],@tp[:publisher_i]='publisher, ',"'#{txt}', "
       end
@@ -219,11 +219,11 @@ module SiSU_DB_import
         special_character_escape(txt)
         @tp[:digitized_by_f],@tp[:digitized_by_i]='digitized_by, ',"'#{txt}', "
       end
-      if @md.dc_subject; txt=@md.dc_subject
+      if @md.subject; txt=@md.subject #dc
         special_character_escape(txt)
         @tp[:subject_f],@tp[:subject_i]='subject, ',"'#{txt}', "
       end
-      if @md.dc_description; txt=@md.dc_description
+      if @md.description; txt=@md.description #dc
         special_character_escape(txt)
         @tp[:description_f],@tp[:description_i]='description, ',"'#{txt}', "
       end
@@ -231,7 +231,7 @@ module SiSU_DB_import
         special_character_escape(txt)
         @tp[:abstract_f],@tp[:abstract_i]='abstract, ',"'#{txt}', "
       end
-      if @md.dc_type; txt=@md.dc_type
+      if @md.type; txt=@md.type #dc
         special_character_escape(txt)
         @tp[:type_f],@tp[:type_i]='type, ',"'#{txt}', "
       end
@@ -243,35 +243,35 @@ module SiSU_DB_import
       #  special_character_escape(txt)
       #  @tp[:copyright_f],@tp[:copyright_i]='copyright, ',"'#{txt}', "
       #end
-      if @md.dc_rights; txt=@md.dc_rights
+      if @md.rights; txt=@md.rights #dc
         special_character_escape(txt)
         @tp[:rights_f],@tp[:rights_i]='rights, ',"'#{txt}', "
       end
-      if @md.dc_date; txt=@md.dc_date
+      if @md.date; txt=@md.date #dc
         special_character_escape(txt)
         @tp[:date_f],@tp[:date_i]='date, ',"'#{txt}', "
       end
-      if @md.dc_date_created; txt=@md.dc_date_created
+      if @md.date_created; txt=@md.date_created #dc
         special_character_escape(txt)
         @tp[:date_created_f],@tp[:date_created_i]='date_created, ',"'#{txt}', "
       end
-      if @md.dc_date_issued; txt=@md.dc_date_issued
+      if @md.date_issued; txt=@md.date_issued #dc
         special_character_escape(txt)
         @tp[:date_issued_f],@tp[:date_issued_i]='date_issued, ',"'#{txt}', "
       end
-      if @md.dc_date_available; txt=@md.dc_date_available
+      if @md.date_available; txt=@md.date_available #dc
         special_character_escape(txt)
         @tp[:date_available_f],@tp[:date_available_i]='date_available, ',"'#{txt}', "
       end
-      if @md.dc_date_modified; txt=@md.dc_date_modified
+      if @md.date_modified; txt=@md.date_modified #dc
         special_character_escape(txt)
         @tp[:date_modified_f],@tp[:date_modified_i]='date_modified, ',"'#{txt}', "
       end
-      if @md.dc_date_valid; txt=@md.dc_date_valid
+      if @md.date_valid; txt=@md.date_valid #dc
         special_character_escape(txt)
         @tp[:date_valid_f],@tp[:date_valid_i]='date_valid, ',"'#{txt}', "
       end
-      if @md.dc_language[:name]; txt=@md.dc_language[:name]
+      if @md.language[:name]; txt=@md.language[:name] #dc
         special_character_escape(txt)
         @tp[:language_f],@tp[:language_i]='language, ',"'#{txt}', "
       end
@@ -279,23 +279,23 @@ module SiSU_DB_import
         special_character_escape(txt)
         @tp[:language_original_f],@tp[:language_original_i]='language_original, ',"'#{txt}', "
       end
-      if @md.dc_format; txt=@md.dc_format
+      if @md.format; txt=@md.format #dc
         special_character_escape(txt)
         @tp[:format_f],@tp[:format_i]='format, ',"'#{txt}', "
       end
-      if @md.dc_identifier; txt=@md.dc_identifier
+      if @md.identifier; txt=@md.identifier #dc
         special_character_escape(txt)
         @tp[:identifier_f],@tp[:identifier_i]='identifier, ',"'#{txt}', "
       end
-      if @md.dc_source; txt=@md.dc_source
+      if @md.source; txt=@md.source #dc
         special_character_escape(txt)
         @tp[:source_f],@tp[:source_i]='source, ',"'#{txt}', "
       end
-      if @md.dc_relation; txt=@md.dc_relation
+      if @md.relation; txt=@md.relation #dc
         special_character_escape(txt)
         @tp[:relation_f],@tp[:relation_i]='relation, ',"'#{txt}', "
       end
-      if @md.dc_coverage; txt=@md.dc_coverage
+      if @md.coverage; txt=@md.coverage #dc
         special_character_escape(txt)
         @tp[:coverage_f],@tp[:coverage_i]='coverage, ',"'#{txt}', "
       end