aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v4/db_import.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-06-25 00:07:44 -0400
committerRalph Amissah <ralph@amissah.com>2013-06-25 00:07:44 -0400
commitc25fc2751886278a4e7f30f127e80449160a47f1 (patch)
treed19cab06d629a995848a296409693b5890d59f60 /lib/sisu/v4/db_import.rb
parentv5: "general code cleaning" fix (diff)
v4: general code cleaning, sync with v5sisu_4.1.6
Diffstat (limited to 'lib/sisu/v4/db_import.rb')
-rw-r--r--lib/sisu/v4/db_import.rb17
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb
index a4251a98..eb46e795 100644
--- a/lib/sisu/v4/db_import.rb
+++ b/lib/sisu/v4/db_import.rb
@@ -147,7 +147,6 @@ module SiSU_DbImport
puts @conn.driver if defined? @conn.driver
end
begin
- sql=''
if @sql_type=~/sqlite/
@conn.transaction do |conn|
t_d.each do |sql|
@@ -270,10 +269,10 @@ module SiSU_DbImport
data.obj.gsub!(/#{Mx[:tag_o]}\S+?#{Mx[:tag_c]}/,'') #check
@col[:seg]=@@seg
if data.of ==:para \
- || :heading \
- || :heading_insert \
- || :block \
- || :group # regular text what of code-blocks grouped text etc.
+ || data.of ==:heading \
+ || data.of ==:heading_insert \
+ || data.of ==:block \
+ || data.of ==:group # regular text what of code-blocks grouped text etc.
notedata=data.obj.dup
#% :headings
if data.is==:heading \
@@ -590,17 +589,17 @@ module SiSU_DbImport
@txt
end
def standard
- x=(@txt =~/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/) \
+ (@txt =~/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/) \
? @txt.scan(/#{Mx[:en_a_o]}(\d+).+?#{Mx[:en_a_c]}/)
: nil
end
def asterisk
- x=(@txt =~/#{Mx[:en_b_o]}\*.+?#{Mx[:en_b_c]}/) \
+ (@txt =~/#{Mx[:en_b_o]}\*.+?#{Mx[:en_b_c]}/) \
? @txt.scan(/#{Mx[:en_b_o]}[*](\d+).+?#{Mx[:en_b_c]}/)
: nil
end
def plus
- x=(@txt =~/#{Mx[:en_b_o]}\+.+?#{Mx[:en_b_c]}/) \
+ (@txt =~/#{Mx[:en_b_o]}\+.+?#{Mx[:en_b_c]}/) \
? @txt.scan(/#{Mx[:en_b_o]}[+](\d+).+?#{Mx[:en_b_c]}/)
: nil
end
@@ -636,8 +635,6 @@ module SiSU_DbImport
begin
@fnc=content
@env=SiSU_Env::InfoEnv.new(@opt.fns)
- base=@env.url.root
- out=@env.path.output
f,u={},{}
if @fnb.empty? \
or @fnb.nil?