aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2012-04-22 13:47:22 -0400
committerRalph Amissah <ralph@amissah.com>2012-04-22 13:47:35 -0400
commit173a8becc4250e65af6c8ce71914f2a7052c9dd4 (patch)
treebb68d1e5384ac30d460a752c154842f04dfc4b3e
parentv3: 3.2.5 version & changelog "opened" (diff)
v3: shared_html_lite, codeblock fix, affecting sqlsisu_3.2.5
* SELECT ocn,body FROM doc_objects WHERE t_is='code';
-rw-r--r--data/doc/sisu/CHANGELOG_v34
-rw-r--r--lib/sisu/v3/db_import.rb5
-rw-r--r--lib/sisu/v3/shared_html_lite.rb3
3 files changed, 10 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index bae21f54..96450db9 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,10 @@ http://www.jus.uio.no/sisu/pkg/src/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
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