--- bin/ldap.pl	2008/03/30 00:02:18	36
+++ bin/ldap.pl	2008/03/30 16:58:21	42
@@ -17,56 +17,10 @@
 	'limit=i', => \$limit,
 );
 
-# perform a search
-my $mesg = A3C::LDAP->search(
-	base   => "dc=skole,dc=hr",
-#	filter => "(&(sn=Barr) (o=Texas Instruments))",
-	filter => "(objectClass=hrEduPerson)",
-	sizelimit => $limit, # 0 = off
-);
-
-if ( $mesg->code ) {
-	Jifty->log->error( $mesg->code, ": ", $mesg->error );
-}
-
-Jifty->log->info( "found ", $mesg->count, " entries" );
-
-sub ldap2model {
-	my ( $model, $entry, $additional ) = @_;
-	my $data;
-
-	my @columns = map { $_->name } $model->columns;
-	#warn "# columns = ",dump( @columns );
-
-	foreach my $attr ( $entry->attributes ) {
-		if ( grep(/^\Q$attr\E$/, @columns ) ) {
-			$data->{$attr} = $entry->get_value( $attr );
-#		} elsif ( $attr !~ m/^(objectClass)$/i ) {
-#			Jifty->log->error(ref($model)," doesn't have $attr");
-		}
-	}
-
-	Jifty->log->debug( ref($model), ' = ', dump( $data ) );
-
-	my ( $id, $message ) = $model->load_or_create( %$data, %$additional );
-
-	if ( $id ) {
-		Jifty->log->info( $message || 'Added', ' ', ref($model), ' ', $model->id );
-	} else {
-		Jifty->log->error( ref($model), " ", $message );
-	}
-}
-
-#foreach my $entry ( $mesg->entries ) {
-while ( my $entry = $mesg->shift_entry ) {
-
-#	$entry->dump;
-
-	my $organization = A3C::Model::Organization->new;
-	ldap2model( $organization, $entry );
-
-	my $user = A3C::Model::User->new;
-	ldap2model( $user, $entry, { organization => $organization } );
+my $ldap = A3C::LDAP->new;
 
+foreach my $model ( qw/Organization User/ ) {
+	my $collection = $ldap->collection( $model, $limit );
+	Jifty->log->info( "found ", $collection->count, " entries for $model" );
 }