diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-03-16 20:25:37 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-03-16 20:25:37 -0400 |
commit | f2996f82df7795b561f77deb0e71bf392b5ab6d1 (patch) | |
tree | 5ee009b042e9da7de980ec9649d7483357465cb9 /lib/sisu/v4/harvest_authors.rb | |
parent | debian/changelog (4.0.13-1) (diff) | |
parent | v4: version & changelog, dates touched (diff) |
Merge tag 'sisu_4.0.14' into debian/sid
SiSU 4.0.14
Diffstat (limited to 'lib/sisu/v4/harvest_authors.rb')
-rw-r--r-- | lib/sisu/v4/harvest_authors.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/sisu/v4/harvest_authors.rb b/lib/sisu/v4/harvest_authors.rb index 4a11b2ee..671b93ab 100644 --- a/lib/sisu/v4/harvest_authors.rb +++ b/lib/sisu/v4/harvest_authors.rb @@ -69,7 +69,6 @@ module SiSU_HarvestAuthors @file_list=opt.files end def songsheet - puts 'authors:' idx_array={} @opt.f_pths.each do |y| lang_hash_file_array={} @@ -198,7 +197,8 @@ module SiSU_HarvestAuthors file="#{harvest_pth}/authors.#{lng}.html" end FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth) - puts "file://#{file}" + fileinfo=(@opt.cmd =~/[vVM]/) ? ("file://#{file}") : '' + SiSU_Screen::Ansi.new(@opt.cmd,"harvest authors (#{@opt.files.length} files)",fileinfo).dark_grey_title_hi unless @opt.cmd =~/q/ @output[lng][:html]=File.new(file,'w') end end @@ -231,7 +231,7 @@ module SiSU_HarvestAuthors topics="topics.#{lng}.html" elsif @env.output_dir_structure.by? == :filename css_path=(type !~/maintenance/) \ - ? '../_sisu/css/harvest.css' + ? './_sisu/css/harvest.css' : 'harvest.css' topics="topics.#{lng}.html" end @@ -244,6 +244,9 @@ module SiSU_HarvestAuthors elsif @env.output_dir_structure.by? == :filetype harvest_pth='.' file="#{harvest_pth}/authors.#{lng}.html" + elsif @env.output_dir_structure.by? == :filename + harvest_pth='.' + file="#{harvest_pth}/authors.#{lng}.html" end l=ln[lng][:t] harvest_languages += %{<a href="#{file}">#{l}</a> } @@ -357,7 +360,7 @@ WOK manifest_name=x[:file] x[:file] + '.' + lng + '.html' elsif @env.output_dir_structure.by? == :filename - "../#{x[:file]}/#{x[:page]}" + "./#{x[:file]}/#{x[:page]}" else '' #error end work=[ "#{x[:date]} #{x[:title]}", %{<p class="publication">#{x[:date]} <a href="#{manifest_at}">#{x[:title]}</a>, #{x[:author][:authors_s]}</p>} ] |