[Cpan-forum-commit] rev 349 - in trunk: . lib/CPAN/Forum templates

[svn at pti.co.il]

Author: gabor
Date: 2007-08-14 11:36:18 +0300 (Tue, 14 Aug 2007)
New Revision: 349

Modified:
   trunk/
   trunk/Build.PL
   trunk/lib/CPAN/Forum/DBI.pm
   trunk/templates/about.tmpl
Log:
remove Class::DBI dependency



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4435
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4436
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/Build.PL
===================================================================
--- trunk/Build.PL	2007-08-14 08:35:58 UTC (rev 348)
+++ trunk/Build.PL	2007-08-14 08:36:18 UTC (rev 349)
@@ -29,7 +29,6 @@
         'WWW::Mechanize'                        => 0,
         'DBI'                                   => 0,
         'DBD::SQLite'                           => 0.31,
-        'Class::DBI'                            => 0,  # It was complaining: ERROR: Version v3.0.14 of Class::DBI is installed, but we need version >= 0.96
 #       'Crypt::SSLeay'                         => 0,  # needed for http access to PAUSE
         'Parse::CPAN::Packages'                 => '2.26',  # for populating and maybe also later ?
         'LWP::Simple'                           => 0,  # for populate
@@ -38,8 +37,6 @@
         'Mail::Sendmail'                        => 0,  
         'CGI::Session::SQLite'                  => 0,
         'Parse::RecDescent'                     => 0,
-        'Class::DBI::Plugin::AbstractCount'     => 0,
-        'Class::DBI::Plugin::Pager'             => 0,
         'Text::CSV_XS'                          => 0,
         'List::MoreUtils'                       => 0,
         'Test::WWW::Mechanize'                  => 0.02,

Modified: trunk/lib/CPAN/Forum/DBI.pm
===================================================================
--- trunk/lib/CPAN/Forum/DBI.pm	2007-08-14 08:35:58 UTC (rev 348)
+++ trunk/lib/CPAN/Forum/DBI.pm	2007-08-14 08:36:18 UTC (rev 349)
@@ -1,29 +1,32 @@
 package CPAN::Forum::DBI;
 use strict;
 use warnings;
-use base 'Class::DBI';
 use Carp qw();
 
-use Class::DBI::Plugin::AbstractCount;      # pager needs this
-use Class::DBI::Plugin::Pager;
-
 use DBI;
-my $dbh_connected;
+my $dbh;
 
 sub myinit {
     my $class = shift;
     my $db_connect = shift;
-    if (not $dbh_connected) {
-        $dbh_connected = __PACKAGE__->connection($db_connect, '', '', 
+    if (not $dbh) {
+        $dbh = DBI->connect($db_connect, '', '', 
                     {
+                        RaiseError       => 1,
+                        PrintError       => 1,
+                        AutoCommit       => 1,
+                        FetchHashKeyName => 'NAME_lc',
                     });
-        my $dbh = CPAN::Forum::DBI::db_Main();
-        #warn $dbh;
         $dbh->{HandleError} = sub { Carp::confess(shift); };
     }
-    return $dbh_connected;
+    return $dbh;
 }
 
+sub db_Main {
+    return $dbh;
+}
+
+
 our @group_types = ("None", "Global", "Field", "Distribution", "Module");
 our %group_types;
 $group_types{$group_types[$_]} = $_ for (0..$#group_types);

Modified: trunk/templates/about.tmpl
===================================================================
--- trunk/templates/about.tmpl	2007-08-14 08:35:58 UTC (rev 348)
+++ trunk/templates/about.tmpl	2007-08-14 08:36:18 UTC (rev 349)
@@ -27,7 +27,6 @@
 		<li><a href="/dist/CGI-Application-Plugin-LogDispatch">CGI::Application::Plugin::LogDispatch</a></li>
 		<li><a href="/dist/CGI-Session">CGI::Session</a></li>
 		<li><a href="/dist/HTML-Template">HTML::Template</a></li>
-		<li><a href="/dist/Class-DBI">Class::DBI</a></li>
 		<li><a href="/dist/DBD-SQLite">DBD::SQLite</a></li>
 		<li><a href="/dist/WWW-Mechanize">WWW::Mechanize</a></li>
 		<li><a href="/dist/Test-WWW-Mechanize">Test::WWW::Mechanize</a></li>
@@ -36,8 +35,6 @@
 		<li><a href="/dist/Mail-Sendmail">Mail::Sendmail</a></li>
 		<li><a href="/dist/Text-CSV_XS">Text::CSV_XS</a></li>
 		<li><a href="/dist/Parse-RecDescent">Parse::RecDescent</a></li>
-		<li><a href="/dist/Class-DBI-Plugin-AbstractCount">Class::DBI::Plugin::AbstractCount</a></li>
-		<li><a href="/dist/Class-DBI-Plugin-Pager">Class::DBI::Plugin::Pager</a></li>
 	</ul>
 </div>
 <a name="statistics"></a>