--- lib/LDAP/Koha.pm	2009/04/29 09:29:46	52
+++ lib/LDAP/Koha.pm	2010/04/19 13:48:35	87
@@ -15,6 +15,8 @@
 
 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 @@
 
 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'		=> 'a.attribute',	# was: rfid_sid
 };
 
 sub __sql_column {
@@ -120,23 +120,23 @@
 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 @@
 		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 );
 
@@ -229,6 +230,8 @@
 					undef $entry;
 				}
 
+				$dn =~ s{@[^,]+}{};
+
 				$entry = Net::LDAP::Entry->new;
 				$entry->dn( $dn );
 
@@ -247,8 +250,10 @@
 
 		}
 
-		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 );