aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/particulars.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3/particulars.rb')
-rw-r--r--lib/sisu/v3/particulars.rb110
1 files changed, 48 insertions, 62 deletions
diff --git a/lib/sisu/v3/particulars.rb b/lib/sisu/v3/particulars.rb
index 97a3da3e..57ffea3f 100644
--- a/lib/sisu/v3/particulars.rb
+++ b/lib/sisu/v3/particulars.rb
@@ -66,169 +66,155 @@ module SiSU_Particulars
class CombinedSingleton
include Singleton
def get_all(opt)
- @opt=opt
- set_env
- set_file
- set_md
- set_dal #needs @md
+ set_env(opt)
+ set_file(opt)
+ set_md(opt)
+ set_dal(opt) #needs @md
end
def get_env(opt)
- @opt=opt
- set_env
+ set_env(opt)
end
def get_file(opt)
- @opt=opt
- set_file
+ set_file(opt)
end
def get_md(opt)
- @opt=opt
- set_md
+ set_md(opt)
end
def get_dal_array(opt)
- @opt=opt
- set_dal #needs @md
+ set_dal(opt) #needs @md
end
def get_env_md(opt)
- @opt=opt
- set_env
- set_md
+ set_env(opt)
+ set_md(opt)
end
def get_idx_sst(opt)
- @opt=opt
- set_sst_idx
+ set_sst_idx(opt)
end
def get_idx_raw(opt)
- @opt=opt
- set_raw_idx
+ set_raw_idx(opt)
end
def get_idx_html(opt)
- @opt=opt
- set_html_idx
+ set_html_idx(opt)
end
def get_idx_xhtml(opt)
- @opt=opt
- set_xhtml_idx
+ set_xhtml_idx(opt)
end
def get_name_tags(opt)
- @opt=opt
- set_name_tags
+ set_name_tags(opt)
end
def get_maps(opt)
- @opt=opt
- set_nametags_map
- set_ocn_htmlseg_map
+ set_nametags_map(opt)
+ set_ocn_htmlseg_map(opt)
end
def get_map_nametags(opt)
- @opt=opt
- set_nametags_map
+ set_nametags_map(opt)
end
def get_map_ocn_htmlseg(opt)
- @opt=opt
- set_ocn_htmlseg_map
+ set_ocn_htmlseg_map(opt)
end
attr_accessor :opt,:md,:sst_idx,:raw_idx,:html_idx,:xhtml_idx
- def set_md
+ def set_md(opt)
begin
- @md=SiSU_Param::Parameters.new(@opt).get
+ @md=SiSU_Param::Parameters.new(opt).get
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
attr_accessor :opt,:env,:file
- def set_env
+ def set_env(opt)
begin
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
+ @env=SiSU_Env::InfoEnv.new(opt.fns)
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
- def set_file
+ def set_file(opt)
begin
- set_md unless @md
+ set_md(opt) unless @md
@file=SiSU_Env::FileOp.new(@md)
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
attr_accessor :opt,:dal_array
- def set_dal
+ def set_dal(opt)
begin
- @dal_array=SiSU_DAL::Source.new(@opt).get
+ @dal_array=SiSU_DAL::Source.new(opt).get
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
- def set_sst_idx
+ def set_sst_idx(opt)
begin
- @sst_idx=SiSU_DAL::Source.new(@opt).get_idx_sst
+ @sst_idx=SiSU_DAL::Source.new(opt).get_idx_sst
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
- def set_raw_idx
+ def set_raw_idx(opt)
begin
- @raw_idx=SiSU_DAL::Source.new(@opt).get_idx_raw
+ @raw_idx=SiSU_DAL::Source.new(opt).get_idx_raw
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
- def set_html_idx
+ def set_html_idx(opt)
begin
- @html_idx=SiSU_DAL::Source.new(@opt).get_idx_html
+ @html_idx=SiSU_DAL::Source.new(opt).get_idx_html
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
- def set_xhtml_idx
+ def set_xhtml_idx(opt)
begin
- @xhtml_idx=SiSU_DAL::Source.new(@opt).get_idx_xhtml
+ @xhtml_idx=SiSU_DAL::Source.new(opt).get_idx_xhtml
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
attr_accessor :nametags_map
- def set_nametags_map
+ def set_nametags_map(opt)
begin
- opt=@md ? @md : @opt
+ opt=@md ? @md : opt
@nametags_map=SiSU_DAL::Source.new(opt).get_map_nametags
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end
end
attr_accessor :ocn_htmlseg_map
- def set_ocn_htmlseg_map
+ def set_ocn_htmlseg_map(opt)
begin
@ocn_htmlseg_map=SiSU_DAL::Source.new(@md).get_map_ocn_htmlseg
self
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
__LINE__.to_s + ':' + __FILE__
end
end