Merge tag 'sisu_3.2.5' into debian/sid

4 files changed, 24 insertions, 8 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 23b5d927..96450db9 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,13 +13,25 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.2.5.orig.tar.xz (2012-04-22:16/7)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.5
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.5.orig.tar.xz
+  sisu_3.2.5.orig.tar.xz
+  sisu_3.2.5-1.dsc
+  sisu_3.2.5-1.debian.tar.gz
+
+  * v3: shared_html_lite, codeblock fix, affecting sql:
+    SELECT ocn,body FROM doc_objects WHERE t_is='code';
+    SELECT ocn,clean FROM doc_objects;
+
 %% 3.2.4.orig.tar.xz (2012-04-21:16/6)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.4
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.4.orig.tar.xz
-  sisu_3.2.4.orig.tar.xz
-  sisu_3.2.4-1.dsc
-  sisu_3.2.4-1.debian.tar.gz
+  6bb53debc788a572562272d4f639ca872a2995e06b2d3fa6e867c44ac8f7194e 1682800 sisu_3.2.4.orig.tar.xz
+  256d99071bd4ea95020df777b40451f7bb79cfd6531351f0fd00734cc9133c73 1382 sisu_3.2.4-1.dsc
+  31bf5091aaf1122906de09c9d17d3b2fccd4fd6cfdc768fad5485b8c0bb98d63 295114 sisu_3.2.4-1.debian.tar.gz
 
 * v3: db bugfix in maintenance mode (variable name reused)
 
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 50d7de5c..1ce9ed62 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.2.4
-:date_stamp: 2012w16/4
-:date: "2012-04-19"
+:version: 3.2.5
+:date_stamp: 2012w16/7
+:date: "2012-04-22"
 :project: SiSU
diff --git a/lib/sisu/v3/db_import.rb b/lib/sisu/v3/db_import.rb
index e4f90e1d..a31a0d2d 100644
--- a/lib/sisu/v3/db_import.rb
+++ b/lib/sisu/v3/db_import.rb
@@ -267,6 +267,7 @@ module SiSU_DbImport
           || :block \
           || :group      # regular text what of code-blocks grouped text etc.
             notedata=data.obj.dup
+                                                                               #% :headings
             if data.is==:heading \
             && (data.ln.inspect=~/[123]/)
               @col[:lev],txt,@col[:ocn],@col[:lev_an],@col[:ocnd],@col[:ocns],@col[:t_of],@col[:t_is],@col[:node],@col[:parent],@col[:digest_clean],@col[:digest_all]=data.ln,data.obj,data.ocn,data.lv,data.odv,data.osp,data.of,data.is,data.node,data.parent,'',''
@@ -375,10 +376,12 @@ module SiSU_DbImport
               t=SiSU_DbTuple::LoadDocuments.new(@conn,@col,@opt,@file_maint)
               @tuple_array << t.tuple
               @col[:lev]=@col[:plaintext]=@col[:body]=''
+                                                                               #% :structure :layout :comment
             elsif data.of==:structure \
             || data.of==:layout \
             || data.of==:comment
               #added watch
+                                                                               #% :
             else                                                               #% regular text
               @col[:lid]+=1
               txt=''
@@ -392,7 +395,7 @@ module SiSU_DbImport
               @base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html"
               txt=endnotes(txt).extract_any
               if @sql_type=~/pg/ \
-              and txt.size > (SiSU_DbColumns::ColumnSize.new.document_clean - 1)             #% examine pg build & remove limitation
+              and txt.size > (SiSU_DbColumns::ColumnSize.new.document_clean - 1)             # examine pg build & remove limitation
                 puts "\n\nTOO LARGE (TXT - see error log)\n\n"
                 open("#{Dir.pwd}/pg_documents_error_log",'a') do |error|
                   error.puts("\n#{@opt.fns}\nTEXT BODY\n#{@col[:body].size} object #{@col[:ocn]} -> #{@col[:body].slice(0..500)}")
diff --git a/lib/sisu/v3/shared_html_lite.rb b/lib/sisu/v3/shared_html_lite.rb
index 27a228eb..42edbdab 100644
--- a/lib/sisu/v3/shared_html_lite.rb
+++ b/lib/sisu/v3/shared_html_lite.rb
@@ -165,7 +165,8 @@ module SiSU_FormatShared
           gsub(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1<a href="\2" target="_top">\2</a>'). #special case \{ e.g. \}http://url
           gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{\\1#{@brace_url.xml_open}<a href="\\2" target="_top">\\2</a>#{@brace_url.xml_close}\\3}) #http ftp matches with decoration
       else
-        s.gsub(/</m,'&lt;'); s.gsub!(/>/m,'&gt;')
+        s.gsub(/</m,'&lt;').
+          gsub(/>/m,'&gt;')
       end
       s
     end