From 8f62a8cce6b1ab7b46a6825938cb672796aab53e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 20 Oct 2007 14:53:11 +0100 Subject: dal todo with path to shared source; shared xml cosmetic --- lib/sisu/v0/dal.rb | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'lib/sisu/v0/dal.rb') diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index 47d3750d..5b21b33d 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -400,9 +400,13 @@ module SiSU_DAL else nil end if describe - tuned_file_tmp << if @output_url #to double space <:br> at beginning of entry - "     {#{describe} }#{@u.remote}/#{url_dir}/#{o_f}" - else "     { #{describe} }../#{url_dir}/#{o_f}" + tuned_file_tmp << if @u.remote #to double space <:br> at beginning of entry + "     { #{describe} }#{@u.remote}/#{url_dir}/#{o_f} " + else + if describe =~/^~\^ / + "     {#{describe} }../#{url_dir}/#{o_f} " + else "     { #{describe} }../#{url_dir}/#{o_f} " + end end end end @@ -413,16 +417,21 @@ module SiSU_DAL else nil end if describe - tuned_file_tmp << if @output_url - x=if describe =~/\.zip/ - "     {#{describe} }#{@u.src_pod}/#{o_f}" - else "     {#{describe} }#{@u.src_txt}/#{o_f}" + tuned_file_tmp << if @u.remote + x=if describe =~/zip/ + "     {#{describe} }#{@u.src_pod}/#{o_f} " + else "     {#{describe} }#{@u.src_txt}/#{o_f} " + end + else + x=if describe =~/zip/ + "     { #{describe} }../pod/#{o_f} " + else "     { #{describe} }../zip/#{o_f} " end - else "     { #{describe} }../#{url_dir}/#{o_f}" end end end - tuned_file << 'group{' << tuned_file_tmp.join("\n").strip << '}group' + tuned_file << 'group{' << tuned_file_tmp.join("\n") << '}group' + #tuned_file << 'group{' << tuned_file_tmp.join("\n").strip << '}group' tuned_file_tmp=[] else tuned_file << para end -- cgit v1.2.3