diff options
| author | Ralph Amissah <ralph@amissah.com> | 2008-05-10 12:15:04 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2008-05-10 12:15:04 -0400 |
| commit | 61a533c385db51965fb85148a5791ded161ec639 (patch) | |
| tree | 4e64a0d1cf78ed5cfca03687219350695c0f1226 /lib/sisu/v0/xml_scaffold.rb | |
| parent | use debhelper 7, add vcs info to debian/control (diff) | |
| parent | update changelog (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/xml_scaffold.rb')
| -rw-r--r-- | lib/sisu/v0/xml_scaffold.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sisu/v0/xml_scaffold.rb b/lib/sisu/v0/xml_scaffold.rb index ae8a0cc0..1404567c 100644 --- a/lib/sisu/v0/xml_scaffold.rb +++ b/lib/sisu/v0/xml_scaffold.rb @@ -59,20 +59,21 @@ =end module SiSU_XML_scaffold + require "#{SiSU_lib}/particulars" + include SiSU_Particulars require "#{SiSU_lib}/dal" require "#{SiSU_lib}/sysenv" include SiSU_Env - include SiSU_Param pwd=Dir.pwd class Source def initialize(opt) @opt=opt + @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) @sp=' ' end def read begin - @md=SiSU_Param::Parameters.new(@opt).get - @dal_array=SiSU_DAL::Source.new(@opt).get + @md,@dal_array=@particulars.md,@particulars.dal_array SiSU_XML_scaffold::Source::Scroll.new(@dal_array,@md).songsheet rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure |