aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3dv/dal.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2012-01-10 22:50:12 -0500
committerRalph Amissah <ralph@amissah.com>2012-01-10 22:53:33 -0500
commitdf67ee1079d074dc2af54aa87187c6538e73d5d7 (patch)
tree8951ce72708a2db81fe16e55faafc41b9b879b2c /lib/sisu/v3dv/dal.rb
parentv3dv: class names, remove "SiSU_" (reserve for module names for consistency) (diff)
v3dv: class names, use more CamelCase
Diffstat (limited to 'lib/sisu/v3dv/dal.rb')
-rw-r--r--lib/sisu/v3dv/dal.rb36
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/sisu/v3dv/dal.rb b/lib/sisu/v3dv/dal.rb
index 15f916ca..a8527e6d 100644
--- a/lib/sisu/v3dv/dal.rb
+++ b/lib/sisu/v3dv/dal.rb
@@ -94,9 +94,9 @@ module SiSU_DAL
@opt,@fnx=opt,fnx
@@fns||@opt.fns
@make_fns=if @fnx and @fnx =~/\.ss[tmi]$/
- SiSU_Env::Info_file.new(@fnx)
+ SiSU_Env::InfoFile.new(@fnx)
else
- SiSU_Env::Info_file.new(@opt.fns)
+ SiSU_Env::InfoFile.new(@opt.fns)
end
@fnm=@make_fns.marshal.dal_metadata
@fnc=@make_fns.marshal.dal_content
@@ -106,8 +106,8 @@ module SiSU_DAL
@idx_xhtml=@make_fns.marshal.dal_idx_xhtml
@map_nametags=@make_fns.marshal.dal_map_nametags
@map_ocn_htmlseg=@make_fns.marshal.dal_map_ocn_htmlseg
- SiSU_Env::Create_system_link.new.images
- @env=SiSU_Env::Info_env.new
+ SiSU_Env::CreateSystemLink.new.images
+ @env=SiSU_Env::InfoEnv.new
end
def read #creates dal
begin
@@ -117,7 +117,7 @@ module SiSU_DAL
? @fnx
: @opt.fns
create_dal
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@@fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@@fns).error
ensure
Instantiate.new
end
@@ -133,7 +133,7 @@ module SiSU_DAL
@@dal_array=[]
end
dal=(@@dal_array.empty?) ? read_fnc : @@dal_array.dup
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -149,7 +149,7 @@ module SiSU_DAL
@@idx_arr[:sst]=[]
end
dal=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -165,7 +165,7 @@ module SiSU_DAL
@@idx_arr[:tex]=[]
end
dal=(@@idx_arr[:tex].empty?) ? read_idx_tex : @@idx_arr[:tex].dup #check
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -181,7 +181,7 @@ module SiSU_DAL
@@idx_arr[:html]=[]
end
dal=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -197,7 +197,7 @@ module SiSU_DAL
@@idx_arr[:xthml]=[]
end
dal=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -213,7 +213,7 @@ module SiSU_DAL
@@map_arr[:nametags]=[]
end
dal=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -229,7 +229,7 @@ module SiSU_DAL
@@map_arr[:ocn_htmlseg]=[]
end
dal=(@@map_arr[:ocn_htmlseg].empty?) ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
Instantiate.new
end
@@ -257,7 +257,7 @@ module SiSU_DAL
meta=nil
dal=SiSU_DAL::Make.new(fn,@md,file_array).song
if @opt.cmd =~/[vM]/
- cf=SiSU_Env::Create_file.new(fn)
+ cf=SiSU_Env::CreateFile.new(fn)
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"~meta/#{@opt.fns}.meta").output if @opt.cmd =~/v/i
SiSU_Screen::Ansi.new(@opt.cmd,"dal -> #{cf.meta}").txt_grey if @opt.cmd =~/M/
end
@@ -340,9 +340,9 @@ module SiSU_DAL
class Output
def initialize(fn,md,data)
@fn,@md,@data=fn,md,data
- @cf=SiSU_Env::Create_file.new(@fn)
- @make=SiSU_Env::Info_file.new(@fn)
- @dir=SiSU_Env::Info_env.new(@fn)
+ @cf=SiSU_Env::CreateFile.new(@fn)
+ @make=SiSU_Env::InfoFile.new(@fn)
+ @dir=SiSU_Env::InfoEnv.new(@fn)
end
def screen_dump(o)
if defined? o.of
@@ -465,7 +465,7 @@ module SiSU_DAL
class Make
def initialize(fn,md,data)
@fn,@md,@data=fn,md,data
- @env=SiSU_Env::Info_env.new(@md.fns)
+ @env=SiSU_Env::InfoEnv.new(@md.fns)
end
def reset
@@flag_vocab=0
@@ -482,7 +482,7 @@ module SiSU_DAL
data,endnote_array=SiSU_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array # dal_character_check.rb
data=SiSU_Images::Images.new(@md,data).images # dal_images.rb
data,tags_map,ocn_html_seg_map=SiSU_Numbering::Numbering.new(@md,data).numbering_song # dal_numbering.rb
- data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_BookIndex::Book_index.new(@md,data,@env).indexing_song if @md.book_idx # dal_idx.rb
+ data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx # dal_idx.rb
data=SiSU_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes # dal_endnotes.rb
outputdata=data
if @md.opt.cmd =~/[mM]/