From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 19 Mar 2012 22:07:29 -0400
Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories
 removed

* v3dv (3.2) "merged" into v3 (previously 3.1) (& removed)
  * conf/sisu/v3dv --> conf/sisu/v3
  * data/sisu/v3dv --> data/sisu/v3
  * lib/sisu/v3dv  --> lib/sisu/v3
  * bin/sisu* (v3dv references changed to v3)
  * (--dev modifier (superfluous for the time being) runs main v3 branch)
---
 lib/sisu/v3/urls.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/sisu/v3/urls.rb')

diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb
index a2385376..31614a37 100644
--- a/lib/sisu/v3/urls.rb
+++ b/lib/sisu/v3/urls.rb
@@ -56,7 +56,7 @@
  ** Description: urls for output files
 
 =end
-module SiSU_urls
+module SiSU_Urls
   require_relative 'particulars'                        # particulars.rb
     include SiSU_Particulars
   require_relative 'sysenv'                             # sysenv.rb
@@ -68,24 +68,24 @@ module SiSU_urls
     end
     def read
       begin
-        SiSU_urls::Output_urls.new(@opt).songsheet if @opt.fnb
-      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd).error
+        SiSU_Urls::OutputUrls.new(@opt).songsheet if @opt.fnb
+      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd).error
       ensure
       end
     end
   end
-  class Output_urls
+  class OutputUrls
     attr_reader :fns,:fnb,:cmd,:dir,:m_regular,:u
     def initialize(opt)
       @opt=opt
-      @particulars=SiSU_Particulars::Combined_singleton.instance.get_env_md(opt)
+      @particulars=SiSU_Particulars::CombinedSingleton.instance.get_env_md(opt)
       @cmd=@opt.cmd
       @md=@particulars.md
       @env=@particulars.env
       @fnb=@env.fnb
-      fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language
+      fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
       @fnl=@env.i18n.lang_filename(fn_set_lang[:c])
-      @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c])
+      @fn=SiSU_Env::EnvCall.new(@opt.fns).lang(fn_set_lang[:c])
       @m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/
       @prog=@env.program
       source=if @opt.fns =~/\.sst$/; @opt.fns
@@ -124,7 +124,7 @@ module SiSU_urls
     def songsheet
       begin
        @opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/)
-      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
       end
     end
@@ -215,7 +215,7 @@ module SiSU_urls
           SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result
         end
         def sqlite(x,y)
-          SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x} DBI sqlite","sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db", "#{y}").result
+          SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x} DBI sqlite","sqlite3 #{@md.file.output_path.sqlite_discreet.dir}/#{@md.file.base_filename.sqlite_discreet}\n          sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db\n", "#{y}").result
         end
         self
       end
-- 
cgit v1.2.3