v5 v6: cgi, sample search forms: use ruby-pg & ruby-sqlite3; remove ruby-dbisisu_5.3.6

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb
index 4351a64c..2d185f20 100644
--- a/lib/sisu/v5/cgi_sqlite.rb
+++ b/lib/sisu/v5/cgi_sqlite.rb
@@ -172,9 +172,9 @@ module  SiSU_CGI_SQLite
       begin
         require 'cgi'
         require 'fcgi'
-        require 'dbi'
+        require 'sqlite3'
       rescue LoadError
-        puts 'cgi, fcgi or dbi NOT FOUND (LoadError)'
+        puts 'cgi, fcgi or sqlite3 NOT FOUND (LoadError)'
       end
       @stub_default='sisu_sqlite'
       @image_src="#{@image_src}"
@@ -247,18 +247,18 @@ module  SiSU_CGI_SQLite
           %{<font color="#666666" size="2">#{sql_select_endnotes}</font>}
         end
         def contents
-          @conn.select_all(sql_select_body)
+          @conn.execute(sql_select_body)
         end
         def endnotes
-          @conn.select_all(sql_select_endnotes)
+          @conn.execute(sql_select_endnotes)
         end
       end
       WOK_SQL
     end
     def dbi_connect
       <<-'WOK_SQL'
-          @dbi="DBI:SQLite3:#{db_sqlite}" #sqlite3 ?
-          @conn=DBI.connect(@dbi)
+          @conn=SQLite3::Database.new(db_sqlite)
+          @conn.results_as_hash=true
       WOK_SQL
     end
   end