aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/dal.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-10-20 14:53:11 +0100
committerRalph Amissah <ralph@amissah.com>2007-10-20 14:53:11 +0100
commit8f62a8cce6b1ab7b46a6825938cb672796aab53e (patch)
treebe53e088a703aa7c77f3de32d9cb4a2fdfed5846 /lib/sisu/v0/dal.rb
parentbuild most likely after midnight (diff)
dal todo with path to shared source; shared xml cosmetic
Diffstat (limited to 'lib/sisu/v0/dal.rb')
-rw-r--r--lib/sisu/v0/dal.rb27
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
- "&nbsp;&nbsp;&nbsp;&nbsp; {#{describe} }#{@u.remote}/#{url_dir}/#{o_f}"
- else "&nbsp;&nbsp;&nbsp;&nbsp; { #{describe} }../#{url_dir}/#{o_f}"
+ tuned_file_tmp << if @u.remote #to double space <:br> at beginning of entry
+ "&nbsp;&nbsp;&nbsp;&nbsp; { #{describe} }#{@u.remote}/#{url_dir}/#{o_f} "
+ else
+ if describe =~/^~\^ /
+ "&nbsp;&nbsp;&nbsp;&nbsp; {#{describe} }../#{url_dir}/#{o_f} "
+ else "&nbsp;&nbsp;&nbsp;&nbsp; { #{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/
- "&nbsp;&nbsp;&nbsp;&nbsp; {#{describe} }#{@u.src_pod}/#{o_f}"
- else "&nbsp;&nbsp;&nbsp;&nbsp; {#{describe} }#{@u.src_txt}/#{o_f}"
+ tuned_file_tmp << if @u.remote
+ x=if describe =~/zip/
+ "&nbsp;&nbsp;&nbsp;&nbsp; {#{describe} }#{@u.src_pod}/#{o_f} "
+ else "&nbsp;&nbsp;&nbsp;&nbsp; {#{describe} }#{@u.src_txt}/#{o_f} "
+ end
+ else
+ x=if describe =~/zip/
+ "&nbsp;&nbsp;&nbsp;&nbsp; { #{describe} }../pod/#{o_f} "
+ else "&nbsp;&nbsp;&nbsp;&nbsp; { #{describe} }../zip/#{o_f} "
end
- else "&nbsp;&nbsp;&nbsp;&nbsp; { #{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