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/sitemaps.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/lib/sisu/v3/sitemaps.rb b/lib/sisu/v3/sitemaps.rb
index 7f81b6be..cefdba8e 100644
--- a/lib/sisu/v3/sitemaps.rb
+++ b/lib/sisu/v3/sitemaps.rb
@@ -62,7 +62,7 @@ module SiSU_Sitemaps
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   require_relative 'shared_xml'                         # shared_xml.rb
-    include SiSU_XML_munge
+    include SiSU_XML_Munge
   class Source
     def initialize(opt)
       @opt=opt
@@ -72,25 +72,25 @@ module SiSU_Sitemaps
     end
     def songsheet
       begin
-        @sys=SiSU_Env::System_call.new
-        fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language
-        @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c])
+        @sys=SiSU_Env::SystemCall.new
+        fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
+        @fn=SiSU_Env::EnvCall.new(@opt.fns).lang(fn_set_lang[:c])
         if @opt.cmd =~/Y/
           @md=SiSU_Param::Parameters.new(@opt).get
-          @trans=SiSU_XML_munge::Trans.new(@md) #check @md is required
-          @env=SiSU_Env::Info_env.new(@md.fns)
-#         @file=SiSU_Env::SiSU_file.new(@md)
-          @rdf=SiSU_XML_tags::RDF.new(@md)
+          @trans=SiSU_XML_Munge::Trans.new(@md) #check @md is required
+          @env=SiSU_Env::InfoEnv.new(@md.fns)
+#         @file=SiSU_Env::FileOp.new(@md)
+          @rdf=SiSU_XML_Tags::RDF.new(@md)
           @fnb_utf8_xml=@md.fnb.dup
           @trans.char_enc.utf8(@fnb_utf8_xml) if @sys.locale =~/utf-?8/i #% utf8
           output_map(sitemap)
         elsif @opt.mod.inspect =~/--sitemaps/
           @sitemap_idx_fn='sitemapindex.xml'
-          @env=SiSU_Env::Info_env.new
+          @env=SiSU_Env::InfoEnv.new
           output_idx(sitemap_index)
           SiSU_Screen::Ansi.new(@opt.cmd,"sitemap index:","#{@env.path.output}/#{@sitemap_idx_fn}").result unless @opt.cmd =~/q/
         end
-      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
       end
     end
@@ -105,8 +105,8 @@ module SiSU_Sitemaps
       filename=@fn[:sitemap]
       touch_path=@md.file.output_path.sitemaps.dir
       touch_filename=@fn[:sitemap_touch]
-      SiSU_Env::SiSU_file.new(@md).make_path(path)
-      file=SiSU_Env::SiSU_file.new(@md).make_file(path,filename)
+      SiSU_Env::FileOp.new(@md).make_path(path)
+      file=SiSU_Env::FileOp.new(@md).make_file(path,filename)
       file << sitemap
       if FileTest.file?("#{touch_path}/#{touch_filename}")
         FileUtils::rm("#{touch_path}/#{touch_filename}")
-- 
cgit v1.2.3