remove clever e-mail selection and use primary one

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

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index 540d278..0769ecb 100644 (file)
--- a/lib/LDAP/Koha.pm
+++ b/lib/LDAP/Koha.pm
@@ -46,7 +46,7 @@ my $ldap_sql_mapping = {
        'objectGUID'    => 'b.borrowernumber',
        'displayName'   => 'surname',
        'sn'            => 'surname',
-       'pager'         => 'a.attribute',       # was: rfid_sid
+       'pager'         => qq{replace(replace(a.attribute, char(13),''),char(10),'')},  # was: rfid_sid
 };
 
 sub __sql_column {
@@ -64,7 +64,7 @@ use constant RESULT_OK => {
 sub new {
        my ($class, $sock) = @_;
        my $self = $class->SUPER::new($sock);
-       print "connection from: ", $sock->peerhost(), "\n";
+       warn "# connection from: ", $sock->peerhost();
        return $self;
 }
 
@@ -146,7 +146,6 @@ sub _dn_attributes {
 sub search {
        my $self = shift;
        my $reqData = shift;
-       print "searching...\n";
 
        warn "# " . localtime() . " request = ", dump($reqData);
 
@@ -211,6 +210,9 @@ sub search {
                $sth->execute( @values );
 
                warn "# ", $sth->rows, " results for ",dump( $reqData->{'filter'} );
+               my $dump = dump( $reqData->{'filter'} );
+               $dump =~ s/[\r\n\s]+/ /gm;
+               print $sth->rows, " results for $dump\n";
 
                my $last_dn = '?';
                my $entry;
@@ -219,13 +221,13 @@ sub search {
 
                        my ( $dn, $attributes ) = _dn_attributes( $row, $base );
 
-                       warn "# dn $last_dn ... $dn\n";
+                       warn "## dn $last_dn ... $dn\n" if $debug;
 
                        if ( $dn ne $last_dn ) {
 
                                if ( $entry ) {
                                        #$entry->changetype( 'modify' );
-                                       warn "### entry ",$entry->dump( \*STDERR );
+                                       warn "### entry ",$entry->dump( \*STDERR ) if $debug;
                                        push @entries, $entry;
                                        undef $entry;
                                }
@@ -240,7 +242,7 @@ sub search {
                        } else {
                                foreach my $n ( keys %$attributes ) {
                                        my $v = $attributes->{$n};
-                                       warn "# attr $n = $v\n";
+                                       warn "## attr $n = $v\n" if $debug;
                                        $entry->add( $n, $v ) if $entry->get_value( $n ) ne $v;
                                }
                        }
@@ -251,7 +253,7 @@ sub search {
                }
 
                if ( $entry ) {
-                       warn "### last entry ",$entry->dump( \*STDERR );
+                       warn "### last entry ",$entry->dump( \*STDERR ) if $debug;
                        push @entries, $entry;
                }