From b0b8fd1f24c79e85f63cd417e5ad4d9daea45a1d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Nov 2007 01:19:50 +0000 Subject: sysenv step in remote images test needs to be retained --- lib/sisu/v0/sysenv.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 930068f1..5e6246fc 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -2355,7 +2355,7 @@ p @zap System_call.new(local_gen,remote_gen,@opt.cmd).rsync('--delete-after') if FileTest.file?("#{local_src}/#{src_txt}") System_call.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync - if not @md.ec[:image].empty? + if defined? @md.ec[:image] and not @md.ec[:image].empty? images="#{local_gen_image}/" + @md.ec[:image].join(" #{local_gen_image}/") System_call.new(images,remote_images,@opt.cmd).rsync images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/") -- cgit v1.2.3 From 6ce42d657bc02a49082edc1dc3de8305da4c4188 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Nov 2007 13:13:55 +0000 Subject: sysenv, scp provide variable, fix --- lib/sisu/v0/sysenv.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 5e6246fc..569db464 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -2301,6 +2301,7 @@ p @zap end #remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." local_src=@source_path_src + local_pod=@source_path_pod remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/." remote_pod="#{remote_conn[:name]}/#{@env.path.stub_pod}/." src_txt=@opt.fnc -- cgit v1.2.3 From 6b9b52037233153d8820d66aa91a17d2945590a9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Nov 2007 16:48:18 +0000 Subject: html scroll,
line separator before endnotes and metadata --- lib/sisu/v0/html_scroll.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb index 483b5222..1c5b9659 100644 --- a/lib/sisu/v0/html_scroll.rb +++ b/lib/sisu/v0/html_scroll.rb @@ -80,6 +80,9 @@ module SiSU_HTML_scroll @rcdc=false @scr={ :body=>[],:metadata=>[],:owner_details=>[] } data.each do |para| + if para =~/^\d~endnotes\s+Endnotes/ + para.gsub!(/Endnotes.+/,'') + end if para =~/^\d~meta\s+Document Information/ para.gsub!(/(Document Information(?: \(metadata\))?)/,'\1') end @@ -147,6 +150,9 @@ module SiSU_HTML_scroll format_seg=SiSU_HTML_Format_type::Format_seg.new(@md,one,two) para=format_seg.no_paranum end + if para =~/Document Information/ + para.gsub!(/(Document Information(?: \(metadata\))?)/,'

\1') + end if para =~// \ and para =~/^(?:\^~\d+\s|)/ # hmmm re-adjusted 200507, for alt endnote which should again be matched ^~ ... not in response to problem though para='' -- cgit v1.2.3 From 061ef005e2d3a00a4408df46e6ab91e961e9ebb0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 26 Nov 2007 19:09:44 +0000 Subject: html scroll line separator before document information --- lib/sisu/v0/html_scroll.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb index 1c5b9659..e7a63951 100644 --- a/lib/sisu/v0/html_scroll.rb +++ b/lib/sisu/v0/html_scroll.rb @@ -150,8 +150,8 @@ module SiSU_HTML_scroll format_seg=SiSU_HTML_Format_type::Format_seg.new(@md,one,two) para=format_seg.no_paranum end - if para =~/Document Information/ - para.gsub!(/(Document Information(?: \(metadata\))?)/,'

\1') + if para =~/Document Information \(metadata\)/ + para.gsub!(/(Document Information \(metadata\))/,'

\1') end if para =~// \ and para =~/^(?:\^~\d+\s|)/ # hmmm re-adjusted 200507, for alt endnote which should again be matched ^~ ... not in response to problem though -- cgit v1.2.3