replace only CR

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

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index 38e4428..563c968 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'
@@ -37,16 +39,14 @@ $SIG{__DIE__} = sub {
 
 require 'config.pl' if -e 'config.pl';
 
-my $dbh = DBI->connect($dsn . $database, $user,$passwd, { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
-
 # we need reverse LDAP -> SQL mapping for where clause
 
 my $ldap_sql_mapping = {
        'uid'           => 'userid',
-       'objectGUID'    => 'borrowernumber',
+       'objectGUID'    => 'b.borrowernumber',
        'displayName'   => 'surname',
        'sn'            => 'surname',
-       'pager'         => 'rfid_sid',
+       'pager'         => qq{replace(a.attribute, '\r','')},   # was: rfid_sid
 };
 
 sub __sql_column {
@@ -120,23 +120,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,10 +202,11 @@ 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 );
+               my $dbh = DBI->connect_cached($dsn . $database, $user,$passwd, { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
                my $sth = $dbh->prepare( $sql );
                $sth->execute( @values );
 
@@ -218,17 +219,19 @@ 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;
                                }
 
+                               $dn =~ s{@[^,]+}{};
+
                                $entry = Net::LDAP::Entry->new;
                                $entry->dn( $dn );
 
@@ -237,7 +240,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;
                                }
                        }
@@ -248,7 +251,7 @@ sub search {
                }
 
                if ( $entry ) {
-                       warn "### last entry ",$entry->dump( \*STDERR );
+                       warn "### last entry ",$entry->dump( \*STDERR ) if $debug;
                        push @entries, $entry;
                }