From 2f8254f7ac2e22d3214b869cfe79b27d8d84ef22 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 10 Feb 2013 08:45:06 -0500 Subject: v4 (v3): dbi_discrete, discreet should have been discrete, renames accordingly --- lib/sisu/v4/sysenv.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/sisu/v4/sysenv.rb') diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 728f4fc4..07184b34 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -3340,10 +3340,10 @@ WOK || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) inp << @f.output_path.pdf.rel + '/' + @opt.fnb + '*' end - if (@opt.act[:sqlite_discreet][:set]==:on \ + if (@opt.act[:sqlite_discrete][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ - && FileTest.file?(@f.place_file.sqlite_discreet.dir) - inp << @f.place_file.sqlite_discreet.rel + && FileTest.file?(@f.place_file.sqlite_discrete.dir) + inp << @f.place_file.sqlite_discrete.rel end if (@opt.act[:qrcode][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ @@ -4010,7 +4010,7 @@ WOK def db "#{@env.path.webserv}/#{@pwd_stub}/sisu_sqlite.db" end - def db_discreet(md) + def db_discrete(md) # "#{@env.path.webserv}/#{@pwd_stub}/sisu_sqlite.db" end def dbi @@ -4039,21 +4039,21 @@ WOK ensure end end - def sqlite_discreet + def sqlite_discrete def db - "#{@md.file.output_path.sqlite_discreet.dir}/#{@md.file.base_filename.sqlite_discreet}" + "#{@md.file.output_path.sqlite_discrete.dir}/#{@md.file.base_filename.sqlite_discrete}" end def dbi - "DBI:SQLite3:#{sqlite_discreet.db}" + "DBI:SQLite3:#{sqlite_discrete.db}" end def sqlite3 - sqlite_discreet.db + sqlite_discrete.db end def conn_dbi - DBI.connect(sqlite_discreet.dbi) + DBI.connect(sqlite_discrete.dbi) end def conn_sqlite3 - SQLite3::Database.new(sqlite_discreet.sqlite3) + SQLite3::Database.new(sqlite_discrete.sqlite3) end self end @@ -4402,12 +4402,12 @@ WOK end self end - def sqlite_discreet + def sqlite_discrete def dir - output_path.sqlite_discreet.dir + '/' + base_filename.sqlite_discreet + output_path.sqlite_discrete.dir + '/' + base_filename.sqlite_discrete end def rel - output_path.sqlite_discreet.rel + '/' + base_filename.sqlite_discreet + output_path.sqlite_discrete.rel + '/' + base_filename.sqlite_discrete end self end @@ -4701,7 +4701,7 @@ WOK @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft end end - def sqlite_discreet + def sqlite_discrete ft='.sql.db' if output_dir_structure.by_language_code? @md.fnb + ft @@ -5351,7 +5351,7 @@ WOK end self end - def sqlite_discreet + def sqlite_discrete def ft 'sql' end -- cgit v1.2.3