From d5d39d4e70efefa8d0166dd75ab1a4649e071c93 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 30 Mar 2011 23:10:59 -0400
Subject: v2, v3: cgi, sample-search-form, string output (+ clean unused help
 text)

* ruby1.9.2 transition related
---
 data/doc/sisu/CHANGELOG_v2 | 3 ++-
 data/doc/sisu/CHANGELOG_v3 | 2 ++
 lib/sisu/v2/cgi.rb         | 2 --
 lib/sisu/v2/cgi_pgsql.rb   | 2 +-
 lib/sisu/v2/cgi_sqlite.rb  | 2 +-
 lib/sisu/v3/cgi.rb         | 2 --
 lib/sisu/v3/cgi_pgsql.rb   | 2 +-
 lib/sisu/v3/cgi_sqlite.rb  | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 74cab770..ee3fb663 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -15,8 +15,9 @@ Reverse Chronological:
 %% 2.9.1.orig.tar.gz (2011-03-30:13/3) [see 3.0.6]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
 
-  * (ruby 1.9.2 fixes)
+  * (ruby 1.9.2 (transition related) fixes)
     * param, nested regex match backport from v3
+    * cgi sample-search-form, string output (also cleaned unused help text)
 
   * sysenv, remove repeated method
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index bd06bb20..b319bc6b 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -20,6 +20,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
   sisu_3.0.6-1.dsc
   sisu_3.0.6-1.debian.tar.gz
 
+  * (ruby 1.9.2 (transition related) fixes)
+    * cgi sample-search-form, string output (also cleaned unused help text)
 
   * sysenv, remove repeated method
 
diff --git a/lib/sisu/v2/cgi.rb b/lib/sisu/v2/cgi.rb
index a375282f..d9bbc9ed 100644
--- a/lib/sisu/v2/cgi.rb
+++ b/lib/sisu/v2/cgi.rb
@@ -71,8 +71,6 @@ module  SiSU_CGI
      a=%{
           For help on sisu search, type:
             sisu --help search
-          For help on setting up hyperestraier for sisu, type:
-            sisu --help hyperestraier
     }
         SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
     end
diff --git a/lib/sisu/v2/cgi_pgsql.rb b/lib/sisu/v2/cgi_pgsql.rb
index 7a948366..416a7d88 100644
--- a/lib/sisu/v2/cgi_pgsql.rb
+++ b/lib/sisu/v2/cgi_pgsql.rb
@@ -83,7 +83,7 @@ module  SiSU_CGI_pgsql
         else put "WARNING: no postgresql database available, (have you created one?)"
         end
         serve.sort!
-        f1,f2,f3=[],[],[]
+        f1,f2,f3='','',''
         serve.each do |x|
           f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n} unless x =~/apache|sisu\/image/ #check
         end
diff --git a/lib/sisu/v2/cgi_sqlite.rb b/lib/sisu/v2/cgi_sqlite.rb
index 5c20b072..d7e131d3 100644
--- a/lib/sisu/v2/cgi_sqlite.rb
+++ b/lib/sisu/v2/cgi_sqlite.rb
@@ -78,7 +78,7 @@ module  SiSU_CGI_sqlite
         end
       end
       serve.sort!
-      f1,f2,f3=[],[],[]
+      f1,f2,f3='','',''
       serve.each do |x|
         f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n}
       end
diff --git a/lib/sisu/v3/cgi.rb b/lib/sisu/v3/cgi.rb
index 7b01ae98..357a4332 100644
--- a/lib/sisu/v3/cgi.rb
+++ b/lib/sisu/v3/cgi.rb
@@ -71,8 +71,6 @@ module  SiSU_CGI
      a=%{
           For help on sisu search, type:
             sisu --help search
-          For help on setting up hyperestraier for sisu, type:
-            sisu --help hyperestraier
     }
         SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
     end
diff --git a/lib/sisu/v3/cgi_pgsql.rb b/lib/sisu/v3/cgi_pgsql.rb
index 5f23f22d..3821f402 100644
--- a/lib/sisu/v3/cgi_pgsql.rb
+++ b/lib/sisu/v3/cgi_pgsql.rb
@@ -83,7 +83,7 @@ module  SiSU_CGI_pgsql
         else put "WARNING: no postgresql database available, (have you created one?)"
         end
         serve.sort!
-        f1,f2,f3=[],[],[]
+        f1,f2,f3='','',''
         serve.each do |x|
           f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n} unless x =~/apache|sisu\/image/ #check
         end
diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v3/cgi_sqlite.rb
index 8d2ff53d..7251c81a 100644
--- a/lib/sisu/v3/cgi_sqlite.rb
+++ b/lib/sisu/v3/cgi_sqlite.rb
@@ -78,7 +78,7 @@ module  SiSU_CGI_sqlite
         end
       end
       serve.sort!
-      f1,f2,f3=[],[],[]
+      f1,f2,f3='','',''
       serve.each do |x|
         f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n}
       end
-- 
cgit v1.2.3