c&d: html, output by filename, filenames, fix
authorRalph Amissah <ralph@amissah.com>
Wed, 10 Dec 2014 00:09:11 +0000 (19:09 -0500)
committerRalph Amissah <ralph@amissah.com>
Wed, 10 Dec 2014 00:22:44 +0000 (19:22 -0500)
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/current/se_file_op.rb
lib/sisu/develop/se_file_op.rb

index e9cfda255fdd7f79d987acc4686a15de4dd366b2..23f76420a05691f5922bc331dfcc80adc83db684 100644 (file)
@@ -73,6 +73,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
     reflected in generated cgi, sample search form, so, does not
     jump to the (otherwise correctly) identified location
 
+  * html, output by filename, filenames, fix
+
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 5.7.2 intended for Jessie (packaged for Debian as 5.7.1-2)
   was not accepted)
index a12fa89eca66a8b82d3ad1edd3fb91a87d333f20..9e1a1afab0b21eefcfebdc0dfa4cf49a9d7a4b23 100644 (file)
@@ -82,6 +82,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
     reflected in generated cgi, sample search form, so, does not
     jump to the (otherwise correctly) identified location
 
+  * html, output by filename, filenames, fix
+
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
   5.7.1-2) was not accepted)
index b64aef9484bfb933bbe2dd5cfd5b97a0d7b91b1a..bccb760548527b25b81059026731d3363cc11700 100644 (file)
@@ -1008,19 +1008,11 @@ module SiSU_File_Op
       def html_seg(fh)
         fh=default_hash_build(fh,Sfx[:html])
         fh[:lng]=lang_code?(fh[:lng])
-        fnh=if output_dir_structure.by_filename?
-          {
-            fn: 'scroll',
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        else
-          {
-            fn: fh[:fn],
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        end
+        fnh={
+          fn: fh[:fn],
+          ft: fh[:ft],
+          lng: fh[:lng],
+        }
         i18n(fnh)
       end
       def html_book_index(fh=nil)
index 38b52f98f36be98539f2ac494d946a3091089aaa..1555d11937fc8d2fbeff13b99fd911bc561fadc9 100644 (file)
@@ -1043,19 +1043,11 @@ module SiSU_File_Op
       def html_seg(fh)
         fh=default_hash_build(fh,Sfx[:html])
         fh[:lng]=lang_code?(fh[:lng])
-        fnh=if output_dir_structure.by_filename?
-          {
-            fn: 'scroll',
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        else
-          {
-            fn: fh[:fn],
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        end
+        fnh={
+          fn: fh[:fn],
+          ft: fh[:ft],
+          lng: fh[:lng],
+        }
         i18n(fnh)
       end
       def html_book_index(fh=nil)