diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-02-10 19:06:42 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-02-10 19:06:42 -0500 |
commit | d9f03f12e9ef5378e4fffb1e88c8d06c86ce9be6 (patch) | |
tree | ca71bd080d0bbe590376d7e5242f742f42349e9f /lib/sisu/v3/sysenv.rb | |
parent | debian/changelog (4.0.6-2) (diff) | |
parent | v4 (v3): lib, bin/sisu, misc, code headers provide url to online git file source (diff) |
Merge tag 'sisu_4.0.7' into debian/sid
SiSU 4.0.7
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
-rw-r--r-- | lib/sisu/v3/sysenv.rb | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 8ed17f88..9e03406d 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -48,6 +48,10 @@ * Download: <http://www.sisudoc.org/sisu/en/SiSU/download.html> + * Git + <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary> + <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sysenv.rb;hb=HEAD> + * Ralph Amissah <ralph@amissah.com> <ralph.amissah@gmail.com> @@ -3249,10 +3253,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 +3907,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 +3936,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 +4299,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 +4598,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 +5248,7 @@ WOK end self end - def sqlite_discreet + def sqlite_discrete def ft 'sql' end |