From 94cf89b09cfd60a87d096926035aaec061a24c56 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 5 Sep 2014 22:45:07 -0400
Subject: v5 v6: link/path fixes

* manifest, link where no "document harvest"
* html, home button links url (remove slash)
* harvest_authors, by_filetype, manifest path
---
 data/doc/sisu/CHANGELOG_v5     | 5 +++++
 data/doc/sisu/CHANGELOG_v6     | 5 +++++
 lib/sisu/v5/harvest_authors.rb | 4 ++--
 lib/sisu/v5/html_format.rb     | 2 +-
 lib/sisu/v5/manifest.rb        | 2 +-
 lib/sisu/v6/harvest_authors.rb | 4 ++--
 lib/sisu/v6/html_format.rb     | 2 +-
 lib/sisu/v6/manifest.rb        | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index d72b1767..089f9a5f 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.5.orig.tar.xz
   sisu_5.6.5.orig.tar.xz
   sisu_5.6.5-1.dsc
 
+* link/path fixes,
+  * manifest, link where no "document harvest"
+  * html, home button links url (remove slash)
+  * harvest_authors, by_filetype, manifest path
+
 %% 5.6.4.orig.tar.xz (2014-09-01:35/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.4-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 5fba6a12..2222fc85 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.6.orig.tar.xz
   sisu_6.2.6.orig.tar.xz
   sisu_6.2.6-1.dsc
 
+* link/path fixes,
+  * manifest, link where no "document harvest"
+  * html, home button links url (remove slash)
+  * harvest_authors, by_filetype, manifest path
+
 %% 6.2.5.orig.tar.xz (2014-09-01:35/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.5-1
diff --git a/lib/sisu/v5/harvest_authors.rb b/lib/sisu/v5/harvest_authors.rb
index 26a0a9e3..c43733ee 100644
--- a/lib/sisu/v5/harvest_authors.rb
+++ b/lib/sisu/v5/harvest_authors.rb
@@ -433,9 +433,9 @@ WOK
               manifest_at=if @env.output_dir_structure.by? == :language
                 i[:file] + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filetype
-                i[:file] + '.' + lang_code_insert + Sfx[:html]
+                i[:file] + lang_code_insert + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filename
-                "./#{i[:file]}/#{i[:page]}"
+                './' + i[:file] + '/' + i[:page]
               else '' #error
               end
               work=[
diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/v5/html_format.rb
index 7731464a..16120d88 100644
--- a/lib/sisu/v5/html_format.rb
+++ b/lib/sisu/v5/html_format.rb
@@ -198,7 +198,7 @@ module SiSU_HTML_Format
         button +=%{   <p class="tiny_left"><a href="#{@md.make.home_button_image[:link]}" target="_top"><img border="0" src="#{image_path}/#{@md.make.home_button_image[:home_button]}"  width="#{@md.make.home_button_image[:w]}" height="#{@md.make.home_button_image[:h]}" alt="home icon --&gt;" /></a></p>\n}
       elsif @md.home_button_links.is_a?(Array)
         @md.home_button_links.each do |links|
-          button +=%{  <p class="tiny_left"><a href="#{links[:url]}/" target="_top">\n    #{links[:say]}\n  </a></p>\n}
+          button +=%{  <p class="tiny_left"><a href="#{links[:url]}" target="_top">\n    #{links[:say]}\n  </a></p>\n}
         end
       end
       button +=%{ </td></tr>\n </table>}
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index f19f8b38..b6c7bc63 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -947,7 +947,7 @@ WOK
           harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
           && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
           ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>] #{output_organised_by}</p>}
-          : %{<p class="small"><a href="#{pth_rel_home}/index.html">#{output_organised_by}</p>}
+          : %{<p class="small"><a href="#{pth_rel_home}">#{output_organised_by}</a></p>}
           manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
           @manifest[:html] <<<<WOK
 <div id="horizontal_links">
diff --git a/lib/sisu/v6/harvest_authors.rb b/lib/sisu/v6/harvest_authors.rb
index 762545c6..b27cf599 100644
--- a/lib/sisu/v6/harvest_authors.rb
+++ b/lib/sisu/v6/harvest_authors.rb
@@ -433,9 +433,9 @@ WOK
               manifest_at=if @env.output_dir_structure.by? == :language
                 i[:file] + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filetype
-                i[:file] + '.' + lang_code_insert + Sfx[:html]
+                i[:file] + lang_code_insert + Sfx[:html]
               elsif @env.output_dir_structure.by? == :filename
-                "./#{i[:file]}/#{i[:page]}"
+                './' + i[:file] + '/' + i[:page]
               else '' #error
               end
               work=[
diff --git a/lib/sisu/v6/html_format.rb b/lib/sisu/v6/html_format.rb
index b2476719..febfc30e 100644
--- a/lib/sisu/v6/html_format.rb
+++ b/lib/sisu/v6/html_format.rb
@@ -198,7 +198,7 @@ module SiSU_HTML_Format
         button +=%{   <p class="tiny_left"><a href="#{@md.make.home_button_image[:link]}" target="_top"><img border="0" src="#{image_path}/#{@md.make.home_button_image[:home_button]}"  width="#{@md.make.home_button_image[:w]}" height="#{@md.make.home_button_image[:h]}" alt="home icon --&gt;" /></a></p>\n}
       elsif @md.home_button_links.is_a?(Array)
         @md.home_button_links.each do |links|
-          button +=%{  <p class="tiny_left"><a href="#{links[:url]}/" target="_top">\n    #{links[:say]}\n  </a></p>\n}
+          button +=%{  <p class="tiny_left"><a href="#{links[:url]}" target="_top">\n    #{links[:say]}\n  </a></p>\n}
         end
       end
       button +=%{ </td></tr>\n </table>}
diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb
index a0d4102f..5863ddb9 100644
--- a/lib/sisu/v6/manifest.rb
+++ b/lib/sisu/v6/manifest.rb
@@ -947,7 +947,7 @@ WOK
           harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
           && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
           ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>] #{output_organised_by}</p>}
-          : %{<p class="small"><a href="#{pth_rel_home}/index.html">#{output_organised_by}</p>}
+          : %{<p class="small"><a href="#{pth_rel_home}">#{output_organised_by}</a></p>}
           manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
           @manifest[:html] <<<<WOK
 <div id="horizontal_links">
-- 
cgit v1.2.3