html segments; sql db field lengths increased

3 files changed, 23 insertions, 22 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e4f5dd41..716c399e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
     * better representation of tilde
     * tolerance
 
+  * db table field lengths (varchar), increased
+
   * middle layer, url representation changed, downstream code affected
 
   * dummy headings removed when not used, latex/pdf, odf, html scroll
diff --git a/lib/sisu/v0/db_columns.rb b/lib/sisu/v0/db_columns.rb
index fcb37812..87e14b01 100644
--- a/lib/sisu/v0/db_columns.rb
+++ b/lib/sisu/v0/db_columns.rb
@@ -62,28 +62,28 @@
 module SiSU_DB_columns
   class Column_size
     def lt_title
-      320
+      600
     end
     def lt_subtitle
-      320
+      600
     end
     def lt_creator
-      200
+      600
     end
     def lt_illustrator
-      200
+      600
     end
     def lt_translator
-      200
+      600
     end
     def lt_prepared_by
-      200
+      600
     end
     def lt_digitized_by
-      200
+      600
     end
     def lt_subject
-      400
+      600
     end
     def lt_date
       10
@@ -104,25 +104,25 @@ module SiSU_DB_columns
       10
     end
     def lt_type
-      100
+      600
     end
     def lt_description
-      800
+      2000
     end
     def lt_publisher
-      120
+      600
     end
     def lt_contributor
-      120
+      600
     end
     def lt_format
-      100
+      600
     end
     def lt_identifier
       256
     end
     def lt_source
-      100
+      200
     end
     def lt_language
       30
@@ -143,16 +143,16 @@ module SiSU_DB_columns
       100
     end
     def lt_rights
-      800
+      2000
     end
     def lt_copyright
-      200
+      2000
     end
     def lt_owner
-      100
+      600
     end
     def lt_keywords
-      200
+      600
     end
     def lt_comment
       600
diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb
index 11c95755..8d89de28 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v0/html_segments.rb
@@ -195,7 +195,6 @@ module SiSU_HTML_seg
           end
         end
       end
-      @@seg[:main] << "\n</div>\n"
       data
     end
     def header_art(para)
@@ -380,7 +379,7 @@ module SiSU_HTML_seg
     def tail
       format_head_seg=SiSU_HTML_Format::Head_seg.new(@md)
       if @md.flag_auto_endnotes and @@seg_endnotes[@@get_hash_fn]
-        @@seg[:tail] << '<div class="endnote">'
+        @@seg[:tail] <<  %{\n<div class="content">\n<div class="endnote">\n}
         if @@seg_endnotes[@@get_hash_fn].flatten.length > 0
           @@seg[:tail] << format_head_seg.endnote_mark
           @@seg[:tail] << @@seg_endnotes[@@get_hash_fn].flatten #endnotes deposited at end of individual segments ||@|EXTRACTION OF ENDNOTES|
@@ -397,9 +396,9 @@ module SiSU_HTML_seg
         filename_seg=[]
         filename_seg << @@seg[:title] << @@seg[:tocband_banner]
         if type !~/endnote/
-          filename_seg << @@minitoc <<  @@seg[:headers] << @@seg[:main]
+          filename_seg << @@minitoc <<  @@seg[:headers] << @@seg[:main] << "\n</div>\n"
         else
-          filename_seg << @@seg[:header_endnotes] << @@minitoc << @@seg[:headers] << %{\n<div class="content">\n} << @@seg[:endnote_all] #<< '</div>' << '</div>'
+          filename_seg << @@seg[:header_endnotes] << @@minitoc << @@seg[:headers] << %{\n<div class="content">\n} << @@seg[:endnote_all] << '</div>'
         end
         filename_seg << @@seg[:tail] << @@seg[:tocband_bannerless] << @@seg[:credits]
         filename_seg.flatten!.compact!