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/qrcode.rb | 112 +++++++++++++++++++++++++-------------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

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

diff --git a/lib/sisu/v4/qrcode.rb b/lib/sisu/v4/qrcode.rb
index 2db0cf62..13a69ec6 100644
--- a/lib/sisu/v4/qrcode.rb
+++ b/lib/sisu/v4/qrcode.rb
@@ -524,26 +524,6 @@ WOK
           id,info=@translate.digitized_by,@md.creator.digitized_by
           metadata(id,info)
         end
-        if defined? @md.classify.subject \
-        and @md.classify.subject=~/\S+/
-          id,info=@translate.subject,@md.classify.subject
-          metadata(id,info)
-        end
-        if defined? @md.notes.description \
-        and @md.notes.description=~/\S+/
-          id,info=@translate.description,@md.notes.description
-          metadata(id,info)
-        end
-        if defined? @md.notes.abstract \
-        and @md.notes.abstract=~/\S+/
-          id,info=@translate.abstract,@md.notes.abstract
-          metadata(id,info)
-        end
-        if defined? @md.type \
-        and @md.type=~/\S+/ #dc
-          id,info=@translate.type,@md.type
-          metadata(id,info)
-        end
         if defined? @md.rights.all \
         and @md.rights.all=~/\S+/ #dc
           id,info=@translate.rights,@md.rights.all
@@ -592,34 +572,34 @@ WOK
           id,info=@translate.language_original,@md.original.language
           metadata(id,info)
         end
-        if defined? @md.classify.format \
-        and @md.classify.format=~/\S+/
-          id,info=@transate.format,@md.classify.format
+        if defined? @md.classify.subject \
+        and @md.classify.subject=~/\S+/
+          id,info=@translate.subject,@md.classify.subject
           metadata(id,info)
         end
-        if defined? @md.classify.identifier \
-        and @md.classify.identifier=~/\S+/
-          id,info=@translate.identifier,@md.classify.identifier
+        if defined? @md.classify.keywords \
+        and @md.classify.keywords=~/\S+/
+          id,info=@translate.keywords,@md.classify.keywords
           metadata(id,info)
         end
-        if defined? @md.original.source \
-        and @md.original.source=~/\S+/
-          id,info=@translate.source,@md.original.source
+        if defined? @md.classify.loc \
+        and @md.classify.loc=~/\S+/
+          id,info=@translate.cls_loc,@md.classify.loc
           metadata(id,info)
         end
-        if defined? @md.classify.relation \
-        and @md.classify.relation=~/\S+/
-          id,info=@translate.relation,@md.classify.relation
+        if defined? @md.classify.dewey \
+        and @md.classify.dewey=~/\S+/
+          id,info=@translate.cls_dewey,@md.classify.dewey
           metadata(id,info)
         end
-        if defined? @md.classify.coverage \
-        and @md.classify.coverage=~/\S+/
-          id,info=@translate.coverage,@md.classify.coverage
+        if defined? @md.notes.description \
+        and @md.notes.description=~/\S+/
+          id,info=@translate.description,@md.notes.description
           metadata(id,info)
         end
-        if defined? @md.classify.keywords \
-        and @md.classify.keywords=~/\S+/
-          id,info=@translate.keywords,@md.classify.keywords
+        if defined? @md.notes.abstract \
+        and @md.notes.abstract=~/\S+/
+          id,info=@translate.abstract,@md.notes.abstract
           metadata(id,info)
         end
         if defined? @md.notes.comment \
@@ -627,30 +607,34 @@ WOK
           id,info=@translate.comments,@md.notes.comment
           metadata(id,info)
         end
-        if defined? @md.classify.loc \
-        and @md.classify.loc=~/\S+/
-          id,info=@translate.cls_loc,@md.classify.loc
+        if defined? @md.notes.coverage \
+        and @md.notes.coverage=~/\S+/
+          id,info=@translate.coverage,@md.notes.coverage
           metadata(id,info)
         end
-        if defined? @md.classify.dewey \
-        and @md.classify.dewey=~/\S+/
-          id,info=@translate.cls_dewey,@md.classify.dewey
+        if defined? @md.notes.relation \
+        and @md.notes.relation=~/\S+/
+          id,info=@translate.relation,@md.notes.relation
           metadata(id,info)
         end
-        if defined? @md.classify.oclc \
-        and @md.classify.oclc=~/\S+/
-          id,info=@translate.cls_oclc,@md.classify.oclc
-          @manifest[:txt] << %{#{id}:\n}
-          @manifest[:txt] << %{#{info}\n}
-        end
-        if defined? @md.classify.pg \
-        and @md.classify.pg=~/\S+/
-          id,info=@translate.cls_gutenberg,@md.classify.pg
+        #if defined? @md.notes.source \
+        #and @md.notes.source=~/\S+/
+        #  id,info=@translate.source,@md.notes.source
+        #  metadata(id,info)
+        #end
+        #if defined? @md.notes.history \
+        #and @md.notes.history=~/\S+/
+        #  id,info=@translate.history,@md.notes.history
+        #  metadata(id,info)
+        #end
+        if defined? @md.notes.type \
+        and @md.notes.type=~/\S+/ #dc
+          id,info=@translate.type,@md.type
           metadata(id,info)
         end
-        if defined? @md.classify.isbn \
-        and @md.classify.isbn=~/\S+/
-          id,info=@translate.cls_isbn,@md.classify.isbn
+        if defined? @md.notes.format \
+        and @md.notes.format=~/\S+/
+          id,info=@transate.format,@md.notes.format
           metadata(id,info)
         end
         if defined? @md.notes.prefix_a \
@@ -663,6 +647,22 @@ WOK
           id,info=@translate.prefix_b,@md.notes.prefix_b
           metadata(id,info)
         end
+        if defined? @md.original.source \
+        and @md.original.source=~/\S+/
+          id,info=@translate.source,@md.original.source
+          metadata(id,info)
+        end
+        if defined? @md.identifier.oclc \
+        and @md.identifier.oclc=~/\S+/
+          id,info=@translate.cls_oclc,@md.identifier.oclc
+          @manifest[:txt] << %{#{id}:\n}
+          @manifest[:txt] << %{#{info}\n}
+        end
+        if defined? @md.identifier.isbn \
+        and @md.identifier.isbn=~/\S+/
+          id,info=@translate.cls_isbn,@md.identifier.isbn
+          metadata(id,info)
+        end
         if defined? @md.topic_register_array \
         and @md.topic_register_array.length > 0
           @manifest[:txt] << %{#{@translate.topic_register}:\n}
-- 
cgit v1.2.3