BUG FIX for Column borrowernumber in where clause is ambiguous

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

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index 38e4428..b0c726c 100644 (file)
--- a/lib/LDAP/Koha.pm
+++ b/lib/LDAP/Koha.pm
@@ -15,6 +15,8 @@ use File::Slurp;
 
 use Data::Dump qw/dump/;
 
+my $debug = 0; # XXX very slow
+
 # XXX test with:
 #
 # ldapsearch -h localhost -p 2389 -b dc=ffzg,dc=hr -x 'otherPager=200903160021'
@@ -43,10 +45,10 @@ my $dbh = DBI->connect($dsn . $database, $user,$passwd, { RaiseError => 1, AutoC
 
 my $ldap_sql_mapping = {
        'uid'           => 'userid',
-       'objectGUID'    => 'borrowernumber',
+       'objectGUID'    => 'b.borrowernumber',
        'displayName'   => 'surname',
        'sn'            => 'surname',
-       'pager'         => 'rfid_sid',
+       'pager'         => 'a.attribute',       # was: rfid_sid
 };
 
 sub __sql_column {
@@ -120,23 +122,23 @@ sub __ldap_search_to_sql {
 sub _dn_attributes {
        my ($row,$base) = @_;
 
-       warn "## row = ",dump( $row );
+       warn "## row = ",dump( $row ) if $debug;
 
        die "no objectClass column in ",dump( $row ) unless defined $row->{objectClass};
 
        $row->{objectClass} = [ split(/\s+/, $row->{objectClass}) ] if $row->{objectClass} =~ m{\n};
 
-       warn "## row = ",dump( $row );
+       warn "## row = ",dump( $row ) if $debug;
 
        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);
 }
@@ -202,7 +204,7 @@ sub search {
                my $sql
                        = $sql_select
                        . $sql_where
-                       . ( $objectclass =~ m{person}i ? " LIMIT $max_results" : '' ) # add limit just for persons
+#                      . ( $objectclass =~ m{person}i ? " LIMIT $max_results" : '' ) # add limit just for persons
                        ;
 
                warn "# SQL:\n$sql\n# DATA: ",dump( @values );
@@ -229,6 +231,8 @@ sub search {
                                        undef $entry;
                                }
 
+                               $dn =~ s{@[^,]+}{};
+
                                $entry = Net::LDAP::Entry->new;
                                $entry->dn( $dn );