From 8422ce1dca74dcae385c1a14c16e038e83d68afc Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 5 Sep 2014 22:49:57 -0400
Subject: v5 v6: shared_metadata, requires xml_shared

---
 lib/sisu/v6/shared_metadata.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/sisu/v6/shared_metadata.rb')

diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/v6/shared_metadata.rb
index dae28c6c..bef13903 100644
--- a/lib/sisu/v6/shared_metadata.rb
+++ b/lib/sisu/v6/shared_metadata.rb
@@ -61,6 +61,7 @@
 
 =end
 module SiSU_Metadata
+  require_relative 'xml_shared'                         # xml_shared.rb
   class Summary
     attr_accessor :tag,:inf,:class,:attrib
     def initialize(md,display_heading=false)
-- 
cgit v1.2.3


From 6a13e63f51e69dacefe580b9084006ae66d3fafc Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 5 Sep 2014 22:54:22 -0400
Subject: v5 v6: xml xhtml outputs, &amp; issues

---
 lib/sisu/v6/shared_metadata.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v6/shared_metadata.rb')

diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/v6/shared_metadata.rb
index bef13903..b51fc8f4 100644
--- a/lib/sisu/v6/shared_metadata.rb
+++ b/lib/sisu/v6/shared_metadata.rb
@@ -74,6 +74,14 @@ module SiSU_Metadata
       language=l[:n]
       tr=SiSU_Translate::Source.new(@md,language)
       @attrib='md'
+      def meta_content_clean(content='')
+        content=if not content.nil?
+          content=content.tr('"',"'").
+            gsub(/&/,'&amp;')
+          content=SiSU_XML_Munge::Trans.new(@md).char_enc.utf8(content)
+        else content
+        end
+      end
       if @display_heading
         @tag,@inf=%{<b><u>Document Metadata</u></b>},''
         meta << self.meta_para
@@ -115,7 +123,7 @@ module SiSU_Metadata
       end
       if defined? @md.rights.all \
       and @md.rights.all=~/\S+/
-        @tag,@inf,@class=tr.rights,@md.rights.all,'dc' #15
+        @tag,@inf,@class=tr.rights,meta_content_clean(@md.rights.all),'dc' #15
         meta << self.meta_para
       end
       if defined? @md.classify.subject \
@@ -810,7 +818,8 @@ module SiSU_Metadata
     end
     def xml_docbook
       def meta_para
-        inf_xml=char_enc(@inf).utf8
+        inf_xml=char_enc(@inf).amp
+        inf_xml=char_enc(inf_xml).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
 #{Ax[:tab]}<#{@tag}>
@@ -843,6 +852,7 @@ WOK
     end
     def xml_dom
       def meta_para
+        inf_xml=char_enc(inf_xml).amp
         inf_xml=char_enc(@inf).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
@@ -861,6 +871,7 @@ WOK
     end
     def xhtml_scroll
       def meta_para
+        inf_xml=char_enc(inf_xml).amp
         inf_xml=char_enc(@inf).utf8
         inf_xml=char_enc(inf_xml).br
         <<WOK
-- 
cgit v1.2.3