c&d, cgi, search form, html ref, remove leading o ocn, bugfix
authorRalph Amissah <ralph@amissah.com>
Tue, 9 Dec 2014 02:10:02 +0000 (21:10 -0500)
committerRalph Amissah <ralph@amissah.com>
Tue, 9 Dec 2014 03:45:10 +0000 (22:45 -0500)
* in html (on use of html5), removed leading 'o' before ocn, not
  reflected in generated cgi, sample search form, so, does not
  jump to the (otherwise correctly) identified location

data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/current/cgi_sql_common.rb
lib/sisu/develop/cgi_sql_common.rb

index 954cec19d37ba2c3de7eac9b957e2d1e5c519621..e9cfda255fdd7f79d987acc4686a15de4dd366b2 100644 (file)
@@ -68,6 +68,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
 
   * version & branch info, changes related to move of lib dirs
 
+  * cgi, search form, html ref, remove leading 'o' ocn, bugfix
+    in html (on use of html5), removed leading 'o' before ocn, not
+    reflected in generated cgi, sample search form, so, does not
+    jump to the (otherwise correctly) identified location
+
 ** 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 bc4f2fa74c2d554316350841fddc8bb0b9fe77ac..a12fa89eca66a8b82d3ad1edd3fb91a87d333f20 100644 (file)
@@ -77,6 +77,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
 
   * xmls, reorganize, introduce new file
 
+  * cgi, search form, html ref, remove leading 'o' ocn, bugfix
+    in html (on use of html5), removed leading 'o' before ocn, not
+    reflected in generated cgi, sample search form, so, does not
+    jump to the (otherwise correctly) identified location
+
 ** 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 957bcf942f8bcd44f718b12c9abebf34efa19811..94f6126e384a9bac0eaefbca8e1bed83fdca9c8d 100644 (file)
@@ -924,7 +924,7 @@ module SiSU_CGI_SQL
                   matched_para=(@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) \
                   ? (c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>}))
                   : c['body']
-                  %{<hr><p><font size="2">ocn <b><a href="#{path_filename(location,c['seg'],c['language_document_char'])}#o#{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
+                  %{<hr><p><font size="2">ocn <b><a href="#{path_filename(location,c['seg'],c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
                 elsif c['suffix'] =~/1/ #doc
                   %{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}}
                 end
@@ -932,9 +932,9 @@ module SiSU_CGI_SQL
                 output=title+text
               else #elsif cgi['view']=~/index/                                #% idx body
                 if c['suffix'] !~/1/ #seg
-                  index=%{<a href="#{path_filename(location,c['seg'],c['language_document_char'])}#o#{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
+                  index=%{<a href="#{path_filename(location,c['seg'],c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
                 elsif c['suffix'] =~/1/ #doc #FIX
-                  index=%{<a href="#{path_html_doc(location,c['language_document_char'])}#o#{c['ocn']}">#{c['ocn']}</a>, }
+                  index=%{<a href="#{path_html_doc(location,c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a>, }
                 end
                 if c['seg'] =~/\S+/
                   if @text_search_flag
index 5a4619c1b8912108f51dcaeb4f58d534857dd8d6..3974caf03607cbb6b9b3f0917c178f8eabbbc343 100644 (file)
@@ -924,7 +924,7 @@ module SiSU_CGI_SQL
                   matched_para=(@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) \
                   ? (c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>}))
                   : c['body']
-                  %{<hr><p><font size="2">ocn <b><a href="#{path_filename(location,c['seg'],c['language_document_char'])}#o#{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
+                  %{<hr><p><font size="2">ocn <b><a href="#{path_filename(location,c['seg'],c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
                 elsif c['suffix'] =~/1/ #doc
                   %{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}}
                 end
@@ -932,9 +932,9 @@ module SiSU_CGI_SQL
                 output=title+text
               else #elsif cgi['view']=~/index/                                #% idx body
                 if c['suffix'] !~/1/ #seg
-                  index=%{<a href="#{path_filename(location,c['seg'],c['language_document_char'])}#o#{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
+                  index=%{<a href="#{path_filename(location,c['seg'],c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
                 elsif c['suffix'] =~/1/ #doc #FIX
-                  index=%{<a href="#{path_html_doc(location,c['language_document_char'])}#o#{c['ocn']}">#{c['ocn']}</a>, }
+                  index=%{<a href="#{path_html_doc(location,c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a>, }
                 end
                 if c['seg'] =~/\S+/
                   if @text_search_flag