produce whole dn in SQL queries so we don't have to mungle it in code

[virtual-ldap] / lib / LDAP / Koha.pm

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index 05532ea..e0b70bf 100644 (file)
--- a/lib/LDAP/Koha.pm
+++ b/lib/LDAP/Koha.pm
@@ -25,9 +25,10 @@ our $database = 'koha';
 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 ", @_;
@@ -130,12 +131,12 @@ sub _dn_attributes {
        my $dn = delete( $row->{dn} ) || die "no dn in ",dump( $row );
 
        # this does some sanity cleanup for our data
-       my $base_as_domain = $base;
-       $base_as_domain =~ s{dn=}{.};
-       $base_as_domain =~ s{^\.}{@};
-       $dn =~ s{$base_as_domain$}{};
-
-       $dn .= ',' . $base unless $dn =~ m{,}; # add base if none present
+#      my $base_as_domain = $base;
+#      $base_as_domain =~ s{dn=}{.};
+#      $base_as_domain =~ s{^\.}{@};
+#      $dn =~ s{$base_as_domain$}{};
+#
+#      $dn .= ',' . $base unless $dn =~ m{,}; # add base if none present
 
        return ($dn, $row);
 }
@@ -156,6 +157,7 @@ sub search {
 
                my $sql_where = '';
                @values = ();
+               $objectclass = '';
 
                foreach my $filter ( keys %{ $reqData->{'filter'} } ) {
 
@@ -181,18 +183,30 @@ sub search {
                                __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'} );
@@ -233,8 +247,10 @@ sub search {
 
                }
 
-               warn "### last entry ",$entry->dump( \*STDERR );
-               push @entries, $entry;
+               if ( $entry ) {
+                       warn "### last entry ",$entry->dump( \*STDERR );
+                       push @entries, $entry;
+               }
 
        } else {
                warn "UNKNOWN request: ",dump( $reqData );