--- lib/LDAP/Koha.pm	2009/04/29 08:48:16	49
+++ lib/LDAP/Koha.pm	2009/04/29 09:29:46	52
@@ -25,9 +25,10 @@
 our $user     = 'unconfigured-user';
 our $passwd   = 'unconfigured-password';
 
-our $max_results = 3000; # FIXME must be enough for all users
+our $max_results = $ENV{MAX_RESULTS} || 3000; # FIXME must be enough for all users
+our $objectclass_default = 'hrEduPerson';
 
-our $objectclass = 'HrEduPerson';
+our $objectclass;
 
 $SIG{__DIE__} = sub {
 	warn "!!! DIE ", @_;
@@ -156,6 +157,7 @@
 
 		my $sql_where = '';
 		@values = ();
+		$objectclass = '';
 
 		foreach my $filter ( keys %{ $reqData->{'filter'} } ) {
 
@@ -181,18 +183,30 @@
 				__ldap_search_to_sql( $filter, $reqData->{'filter'}->{$filter} );
 			}
 
-			$sql_where .= ' ' . join( " $filter ", @limits );
+			$sql_where .= ' ' . join( " $filter ", @limits ) if @limits;
 
 		}
 
+		$objectclass ||= $objectclass_default;
+
+		my $sql_select = read_file( lc "sql/$objectclass.sql" );
 		if ( $sql_where ) {
-			$sql_where = " where $sql_where";
+			if ( $sql_select !~ m{where}i ) {
+				$sql_where = " where $sql_where";
+			} else {
+				$sql_where = " and $sql_where";
+			}
 		}
 
-		my $sql_select = read_file( lc "sql/$objectclass.sql" );
 
-		warn "# SQL:\n$sql_select\n", $sql_where ? $sql_where : '-- no where', "\n# DATA: ",dump( @values );
-		my $sth = $dbh->prepare( $sql_select . $sql_where . " LIMIT $max_results" ); # XXX remove limit?
+		my $sql
+			= $sql_select
+			. $sql_where
+			. ( $objectclass =~ m{person}i ? " LIMIT $max_results" : '' ) # add limit just for persons
+			;
+
+		warn "# SQL:\n$sql\n# DATA: ",dump( @values );
+		my $sth = $dbh->prepare( $sql );
 		$sth->execute( @values );
 
 		warn "# ", $sth->rows, " results for ",dump( $reqData->{'filter'} );