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

3 files changed, 21 insertions, 5 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 1e958203..08796bbe 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -44,6 +44,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.6.orig.tar.xz
   * for pg: require 'pg' (use ruby-pg directly)
   * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the case]
 
+* cgi, sample search form generator
+  * remove require 'dbi' (ruby-dbi)
+  * for pg: require 'pg' (use ruby-pg directly)
+  * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
+
 %% 5.3.5.orig.tar.xz (2014-05-12:19/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.5-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 0c533432..b39da757 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -34,6 +34,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.6.orig.tar.xz
   * for pg: require 'pg' (use ruby-pg directly)
   * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the case]
 
+* cgi, sample search form generator
+  * remove require 'dbi' (ruby-dbi)
+  * for pg: require 'pg' (use ruby-pg directly)
+  * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
+
 %% 6.0.5.orig.tar.xz (2014-05-12:19/1)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.5-1
diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org
index 0e4b0bf6..f8817e68 100644
--- a/data/doc/sisu/sisu.org
+++ b/data/doc/sisu/sisu.org
@@ -1179,7 +1179,7 @@ revisit,
 
 *** DBT Outstanding bugs -- sisu caught by removal of ruby-dbi
 
-**** TODO [#B] sisu 5.3.4-1 marked for autoremoval from debian testing on 2014-06-10, for depending on ruby-dbi
+**** DONE (pending acceptance) [#B] sisu 5.3.4-1 marked for autoremoval from debian testing on 2014-06-10, for depending on ruby-dbi
 
 sisu 5.3.4-1 is marked for autoremoval from testing on 2014-06-10
 It (build-)depends on packages with these RC bugs:
@@ -1221,7 +1221,7 @@ http://lists.sisudoc.org/pipermail/sisu/2014-May/000818.html
   * code tests passed (create tables, populate db etc. work fine)
   (closes)
 
-***** TODO [#B] sample cgi search forms
+***** DONE [#B] sample cgi search forms
   there is a sample cgi search form facility within sisu that uses
   ruby-dbi to query sqlite3 or pg databases.
 
@@ -1239,7 +1239,12 @@ http://lists.sisudoc.org/pipermail/sisu/2014-May/000818.html
   >  eventually using ruby-sqlite3 and ruby-pg directly).
 
   Solution Implemented:
-  (pending)
+  * sample cgi search froms (cgi database query forms) fixed :)
+    * pg sample uses 'pg' (dbi dropped)
+      generate sample form using: sisu --sample-search-form --db-pg
+    * sqlite sample uses 'sqlite3' (dbi dropped)
+      generate sample form using: sisu --sample-search-form --db-sqlite
+  (closes)
 
 ***** NOTES/COMMENTS
 
@@ -1248,8 +1253,9 @@ debian/control, remove dependency on ruby-dbi, contained in sisu-postgresql and
 Current status
  * sisu-sqlite ok, uses 'sqlite3' (superflous dbi loading dropped)
  * sisu-postgresql ok, uses 'pg' (dbi dropped)
- * sample cgi search froms (cgi database query forms) are broken till they work
-   off ruby-pg & ruby-sqlite3 respectively instead of ruby-dbi
+ * sample cgi search froms (cgi database query forms) ok :)
+   * pg sample uses 'pg' (dbi dropped)
+   * sqlite sample uses 'sqlite3' (dbi dropped)
 
 *** DBT Outstanding bugs -- Normal bugs; Unclassified (2 bugs) :debian:dbt:normal:
     <https://bugs.debian.org/cgi-bin/pkgreport.cgi?src=sisu>