summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-03-15 03:31:47 +0000
committerRalph Amissah <ralph@amissah.com>2013-03-15 03:31:47 +0000
commit13143b5a5fe058eb3a5ad222093339cb067a7e63 (patch)
tree0f9c6e2d8acb8a3c36f94aa6b25293351acf4989
parentv4: harvest, authors, topics, terminal info (diff)
downloadsisu-13143b5a5fe058eb3a5ad222093339cb067a7e63.zip
sisu-13143b5a5fe058eb3a5ad222093339cb067a7e63.tar.xz
v4: harvest, links for output_by? filename
-rw-r--r--data/doc/sisu/CHANGELOG_v42
-rw-r--r--lib/sisu/v4/harvest_authors.rb7
2 files changed, 7 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 63339a5..dd117c7 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.14.orig.tar.xz
* v4: harvest, authors, topics, terminal info
+* v4: harvest, links for output_by? filename
+
%% 4.0.13.orig.tar.xz (2013-03-13:10/3)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.13
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.13-1
diff --git a/lib/sisu/v4/harvest_authors.rb b/lib/sisu/v4/harvest_authors.rb
index 80aee26..671b93a 100644
--- a/lib/sisu/v4/harvest_authors.rb
+++ b/lib/sisu/v4/harvest_authors.rb
@@ -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>&nbsp;&nbsp;&nbsp;}
@@ -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>} ]