From b147bcd379f889e60fda61e48aac915eebc016b7 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 15 Nov 2012 08:50:04 -0500
Subject: v4: document headers, metadata rearranged, wide-ranging effect

---
 lib/sisu/v4/shared_xml.rb | 88 +++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'lib/sisu/v4/shared_xml.rb')

diff --git a/lib/sisu/v4/shared_xml.rb b/lib/sisu/v4/shared_xml.rb
index 2886ae37..ba95c805 100644
--- a/lib/sisu/v4/shared_xml.rb
+++ b/lib/sisu/v4/shared_xml.rb
@@ -538,18 +538,6 @@ module SiSU_XML_Tags #Format
         content=meta_content_clean(@md.creator.author)
         @author=%{  <meta name="dc.author" content="#{content}" />\n}
       end
-      if defined? @md.classify.subject \
-      and @md.classify.subject=~/\S+/                                          # DublinCore 3 - subject (us library of congress, eric or udc, or schema???)
-        @rdf_subject=%{    dc.subject="#{@md.classify.subject}"\n}
-        content=meta_content_clean(@md.classify.subject)
-        @subject=%{  <meta name="dc.subject" content="#{content}" />\n}
-      end
-      if defined? @md.notes.description \
-      and @md.notes.description=~/\S+/                                         # DublinCore 4 - description
-        @rdf_description=%{    dc.description="#{@md.notes.description}"\n}
-        content=meta_content_clean(@md.notes.description)
-        @description=%{  <meta name="dc.description" content="#{content}" />\n}
-      end
       if defined? @md.publisher \
       and @md.publisher                                                        # DublinCore 5 - publisher (current copy published by)
         @rdf_publisher=%{    dc.publisher="#{@md.publisher}"\n}
@@ -592,24 +580,54 @@ module SiSU_XML_Tags #Format
         @rdf_date_modified=%{    dc.date.modified="#{@md.date.modified}"\n}
         @date_modified=%{  <meta name="dc.date.modified" content="#{@md.date.modified}" #{@md.date_scheme} />\n}
       end
-      if defined? @md.type \
-      and @md.type                                                            # DublinCore 8 - type (genre eg. report, convention etc)
-        @rdf_type=%{    dc.type="#{@md.type}"\n}
-        content=meta_content_clean(@md.type)
+      if defined? @md.rights.all \
+      and @md.rights.all                                                      # DublinCore 15 - rights
+        @rdf_rights=%{    dc.rights="#{@md.rights.all}"\n}
+        content=meta_content_clean(@md.rights.all)
+        @rights=%{  <meta name="dc.rights" content="#{content}" />\n}
+      end
+      if defined? @md.classify.subject \
+      and @md.classify.subject=~/\S+/                                          # DublinCore 3 - subject (us library of congress, eric or udc, or schema???)
+        @rdf_subject=%{    dc.subject="#{@md.classify.subject}"\n}
+        content=meta_content_clean(@md.classify.subject)
+        @subject=%{  <meta name="dc.subject" content="#{content}" />\n}
+      end
+      if defined? @md.notes.description \
+      and @md.notes.description=~/\S+/                                         # DublinCore 4 - description
+        @rdf_description=%{    dc.description="#{@md.notes.description}"\n}
+        content=meta_content_clean(@md.notes.description)
+        @description=%{  <meta name="dc.description" content="#{content}" />\n}
+      end
+      if defined? @md.notes.coverage \
+      and @md.notes.coverage=~/\S+/                                            # DublinCore 14 - coverage
+        @rdf_coverage=%{    dc.coverage="#{@md.notes.coverage}"\n}
+        content=meta_content_clean(@md.notes.coverage)
+        @coverage=%{  <meta name="dc.coverage" content="#{content}" />\n}
+      end
+      if defined? @md.notes.relation \
+      and @md.notes.relation=~/\S+/                                            # DublinCore 13 - relation
+        @rdf_relation=%{    dc.relation="#{@md.notes.relation}"\n}
+        content=meta_content_clean(@md.notes.relation)
+        @relation=%{  <meta name="dc.relation" content="#{content}" />\n}
+      end
+      if defined? @md.notes.type \
+      and @md.notes.type                                                       # DublinCore 8 - type (genre eg. report, convention etc)
+        @rdf_type=%{    dc.type="#{@md.notes.type}"\n}
+        content=meta_content_clean(@md.notes.type)
         @type=%{  <meta name="dc.type" content="#{content}" />\n}
       end
-      if defined? @md.classify.format \
-      and @md.classify.format=~/\S+/                                          # DublinCore 9 - format (use your mime type)
-        @rdf_format=%{    dc.format="#{@md.classify.format}"\n}
-        content=meta_content_clean(@md.classify.format)
+      if defined? @md.notes.format \
+      and @md.notes.format=~/\S+/                                              # DublinCore 9 - format (use your mime type)
+        @rdf_format=%{    dc.format="#{@md.notes.format}"\n}
+        content=meta_content_clean(@md.notes.format)
         @format=%{  <meta name="dc.format" content="#{content}" />\n}
       end
-      if defined? @md.classify.identifier \
-      and @md.classify.identifier=~/\S+/                                       # DublinCore 10 - identifier (your identifier, could use urn which is free)
-        @rdf_identifier=%{    dc.identifier="#{@md.classify.identifier}"\n}
-        content=meta_content_clean(@md.classify.identifier)
-        @identifier=%{  <meta name="dc.identifier" content="#{content}" />\n}
-      end
+      #if defined? @md.identifier.sisupod \
+      #and @md.identifier.sisupod=~/\S+/                                       # DublinCore 10 - identifier (your identifier, could use urn which is free)
+      #  @rdf_identifier=%{    dc.identifier="#{@md.identifier.sisupod}"\n}
+      #  content=meta_content_clean(@md.identifier.sisupod)
+      #  @identifier=%{  <meta name="dc.identifier" content="#{content}" />\n}
+      #end
       if defined? @md.original.source \
       and @md.original.source=~/\S+/                                           # DublinCore 11 - source (document source)
         @rdf_source=%{    dc.source="#{@md.original.source}"\n}
@@ -626,24 +644,6 @@ module SiSU_XML_Tags #Format
         @rdf_language_original=%{    dc.language="#{@md.original.language}"\n}
         @language_original=%{  <meta name="dc.language" content="#{@md.original.language}" />\n}
       end
-      if defined? @md.classify.relation \
-      and @md.classify.relation=~/\S+/                                         # DublinCore 13 - relation
-        @rdf_relation=%{    dc.relation="#{@md.classify.relation}"\n}
-        content=meta_content_clean(@md.classify.relation)
-        @relation=%{  <meta name="dc.relation" content="#{content}" />\n}
-      end
-      if defined? @md.classify.coverage \
-      and @md.classify.coverage=~/\S+/                                         # DublinCore 14 - coverage
-        @rdf_coverage=%{    dc.coverage="#{@md.classify.coverage}"\n}
-        content=meta_content_clean(@md.classify.coverage)
-        @coverage=%{  <meta name="dc.coverage" content="#{content}" />\n}
-      end
-      if defined? @md.rights.all \
-      and @md.rights.all                                                      # DublinCore 15 - rights
-        @rdf_rights=%{    dc.rights="#{@md.rights.all}"\n}
-        content=meta_content_clean(@md.rights.all)
-        @rights=%{  <meta name="dc.rights" content="#{content}" />\n}
-      end
       content=meta_content_clean(@md.keywords)
       @keywords=%{  <meta name="keywords" content="#{content}" />\n} if @md.keywords
       @vz=SiSU_Viz::Defaults.new
-- 
cgit v1.2.3