[Openinteract-commits] CVS: OpenInteract/OpenInteract CommonHandler.pm,1.27,1.28

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv13991

Modified Files:
	CommonHandler.pm 
Log Message:
always use the full field list 


Index: CommonHandler.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/CommonHandler.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** CommonHandler.pm	2001/11/01 05:24:57	1.27
--- CommonHandler.pm	2001/11/06 04:25:07	1.28
***************
*** 161,182 ****
      $R->DEBUG && $R->scrib( 1, "RUN SEARCH (before): ", scalar localtime );
  
-     # If the results are paged, only retrieve the ID field of our
-     # object, and add any fields specified in the ORDER clause as
-     # well. Otherwise just select all fields
- 
-     my ( @field_list );
      my $order = $class->MY_SEARCH_RESULTS_ORDER;
-     if ( $p->{is_paged} ) {
-         @field_list = ( $object_class->id_field );
-         if ( $order ) {
-             my @order_items = split( /\s*,\s*/, $order );
-             push @field_list, grep ! /^(ASC|DESC)$/, @order_items;
-         }
-     }
-     else {
-         @field_list = @{ $object_class->field_list };
-     }
      my $iter = eval { $object_class->fetch_iterator({
- 					                     field_list => \@field_list,
                                           from       => $tables,  where => $where,
                                           value      => $values,  limit => $limit,
--- 161,166 ----
***************
*** 187,193 ****
  
      $R->scrib( 0, "Search failed: $@ ($SPOPS::Error::system_msg)\nClass: $class\n",
!                   "FROM:", join( ',', @{ $tables } ), "\n",
!                   "WHERE: $where\n",
!                   "VALUES: ", join( ',', @{ $values } ) );
      die "Search failed ($SPOPS::Error::system_msg)\n";
  }
--- 171,178 ----
  
      $R->scrib( 0, "Search failed: $@ ($SPOPS::Error::system_msg)\nClass: $class\n",
!                   "FROM", join( ',', @{ $tables } ), "\n",
!                   "WHERE $where\n",
!                   "ORDER BY $order\n",
!                   "VALUES", join( ',', @{ $values } ) );
      die "Search failed ($SPOPS::Error::system_msg)\n";
  }