[Rt-commit] r3008 - in DBIx-SearchBuilder: . trunk

[glasser at bestpractical.com]

Author: glasser
Date: Wed Jun  1 17:50:42 2005
New Revision: 3008

Modified:
   DBIx-SearchBuilder/   (props changed)
   DBIx-SearchBuilder/trunk/   (props changed)
   DBIx-SearchBuilder/trunk/SearchBuilder.pm
Log:
 r33244 at tin-foil:  glasser | 2005-05-27 17:31:38 -0400
  r33120 at stratton-one-eleven (orig r2970):  jesse | 2005-05-26 16:12:38 -0400
   r17727 at hualien:  jesse | 2005-05-26 16:07:42 -0400
   * New search tests from ruslan
  
  r33121 at stratton-one-eleven (orig r2971):  jesse | 2005-05-26 16:12:43 -0400
   r17728 at hualien:  jesse | 2005-05-26 16:08:44 -0400
   From ruslan:
   
   SearchBuilder.pm fixes&cleanups:
       CleanSlate doesnt init show_rows
       CleanSlate doesnt clean _{open|close}_parens
       get rid of stupid ifs in CleanSlate 
       get rid of evals in _DoSearch and _DoCount, use Handle methods to control DBI error handling 
  
  r33122 at stratton-one-eleven (orig r2972):  jesse | 2005-05-26 16:12:49 -0400
   r17729 at hualien:  jesse | 2005-05-26 16:11:07 -0400
   * Ruslan added an init_data method to t/utils.pl
  
 


Modified: DBIx-SearchBuilder/trunk/SearchBuilder.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder.pm	Wed Jun  1 17:50:42 2005
@@ -196,15 +196,15 @@
     # If we're about to redo the search, we need an empty set of items
     delete $self->{'items'};
 
-    eval {
-        # TODO: finer-grained eval and checking.
-        my $records = $self->_Handle->SimpleQuery($QueryString);
-
-        while ( my $row = $records->fetchrow_hashref() ) {
-            my $item = $self->NewItem();
-            $item->LoadFromHash($row);
-            $self->AddRecord($item);
-        }
+    my $records = $self->_Handle->SimpleQuery($QueryString);
+    return 0 unless $records;
+
+    while ( my $row = $records->fetchrow_hashref() ) {
+	my $item = $self->NewItem();
+	$item->LoadFromHash($row);
+	$self->AddRecord($item);
+    }
+    return $self->_RecordCount if $records->err;
 
     $self->{'must_redo_search'} = 0;