diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-20 14:53:32 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-20 14:53:32 +0100 |
commit | 6d205e38740a8a7dff708f677632a2819d59eb64 (patch) | |
tree | c5ac0b88816eb98448ad6e823c5418508be3618c /lib/sisu/v0/dal.rb | |
parent | debian/control Replaces and Conflicts placed on sisu-doc sub-package (0.59 ve... (diff) | |
parent | dal todo with path to shared source; shared xml cosmetic (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/dal.rb')
-rw-r--r-- | lib/sisu/v0/dal.rb | 27 |
1 files changed, 18 insertions, 9 deletions
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 |