aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/sysenv.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-02-10 08:45:06 -0500
committerRalph Amissah <ralph@amissah.com>2013-02-10 08:45:06 -0500
commit2f8254f7ac2e22d3214b869cfe79b27d8d84ef22 (patch)
treef9ee17246ee35dc9c75fbf03adec1b39d7f41c4c /lib/sisu/v3/sysenv.rb
parentv4 (v3): version & changelog (diff)
v4 (v3): dbi_discrete, discreet should have been discrete, renames accordingly
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
-rw-r--r--lib/sisu/v3/sysenv.rb30
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 8ed17f88..2255cc4f 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3249,10 +3249,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]*$/) \
@@ -3903,7 +3903,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
@@ -3932,21 +3932,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
@@ -4295,12 +4295,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
@@ -4594,7 +4594,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
@@ -5244,7 +5244,7 @@ WOK
end
self
end
- def sqlite_discreet
+ def sqlite_discrete
def ft
'sql'
end