aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/dal.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-10-01 01:50:59 +0100
committerRalph Amissah <ralph@amissah.com>2007-10-01 01:50:59 +0100
commite563c8eb010b1b53ac388be334a5aa0e55f7649d (patch)
tree9e8e3b2e319707a6fc47a48a345fda2cd09c39fa /lib/sisu/v0/dal.rb
parentremove compression on .yml files in package (diff)
parentproposed as sisu-0.60.0, see updated CHANGELOG (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/dal.rb')
-rw-r--r--lib/sisu/v0/dal.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index 270c46b2..0af589f2 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -84,6 +84,7 @@ module SiSU_DAL
@my_make_fns=SiSU_Env::Create_file.new(@opt.cmd,@opt.fns)
@fnm=@my_make_fns.marshal_meta
SiSU_Env::Create_system_link.new.images
+ @env=SiSU_Env::Info_env.new
end
def read #creates dal
begin
@@ -116,14 +117,14 @@ module SiSU_DAL
dal_array=[]
tell=SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction')
tell.green_title_hi unless @opt.cmd =~/q/
- file_array=IO.readlines(@opt.fns,'')
+ file_array=@env.read_source_file(@opt.fns)
file_array.each do |l|
if l =~/\r\n/; l.gsub!(/\r\n/,"\n")
end
end
meta=file_array.dup
- meta=meta.join.split("\n\n") #check whether can be eliminated, some of these are large objects to have twice
- @md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
+ meta=meta.join.split("\n\n") #check whether can be eliminated, some of these are large objects to have twice
+ @md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
meta=nil
dal=SiSU_DAL::Make.new(@md,file_array).song
SiSU_Screen::Ansi.new(@md.cmd,@md.fns,"~meta/#{@md.fns}.meta").output if @md.cmd =~/v/