diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-07-22 21:33:40 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-07-22 21:33:40 -0400 |
| commit | b9b01e57325197cbbed3f643cf998985e4354db0 (patch) | |
| tree | 823f7371649f30c13e51c6779e7906b3580f840e | |
| parent | v5 v6: bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir (diff) | |
v5 v6: html_lite_shared, issue, fix
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/html_lite_shared.rb | 9 | ||||
| -rw-r--r-- | lib/sisu/v6/html_lite_shared.rb | 9 |
4 files changed, 20 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index ea3afa14..dc6b32da 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -40,6 +40,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.2.orig.tar.xz * bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir +* html_lite_shared, issue fix + %% 5.5.1.orig.tar.xz (2014-07-15:28/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.1-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 41165ea5..be9f36a0 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.2.orig.tar.xz * bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir +* html_lite_shared, issue fix + %% 6.1.1.orig.tar.xz (2014-07-15:28/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.1-1 diff --git a/lib/sisu/v5/html_lite_shared.rb b/lib/sisu/v5/html_lite_shared.rb index e109debc..3ce59049 100644 --- a/lib/sisu/v5/html_lite_shared.rb +++ b/lib/sisu/v5/html_lite_shared.rb @@ -126,7 +126,14 @@ module SiSU_FormatShared u=u.gsub(/^\.\.\//,'') "#{@env.url.root}/#{u}" else - "#{@env.url.root}/#{@md.fnb}/#{map_nametags[u][:segname]}#{Sfx[:html]}##{u}" + if not map_nametags[u].nil? + @env.url.root + '/' \ + + @md.fnb + '/' \ + + map_nametags[u][:segname] \ + + Sfx[:html] \ + + '#' + u + else '' + end end link=m[/(.+)/m] png=m.scan(/\S+/)[0].strip diff --git a/lib/sisu/v6/html_lite_shared.rb b/lib/sisu/v6/html_lite_shared.rb index 88510f04..7ae17350 100644 --- a/lib/sisu/v6/html_lite_shared.rb +++ b/lib/sisu/v6/html_lite_shared.rb @@ -126,7 +126,14 @@ module SiSU_FormatShared u=u.gsub(/^\.\.\//,'') "#{@env.url.root}/#{u}" else - "#{@env.url.root}/#{@md.fnb}/#{map_nametags[u][:segname]}#{Sfx[:html]}##{u}" + if not map_nametags[u].nil? + @env.url.root + '/' \ + + @md.fnb + '/' \ + + map_nametags[u][:segname] \ + + Sfx[:html] \ + + '#' + u + else '' + end end link=m[/(.+)/m] png=m.scan(/\S+/)[0].strip |