--- bin/ldap.pl	2008/03/13 19:21:21	17
+++ bin/ldap.pl	2008/03/18 19:22:50	34
@@ -8,9 +8,15 @@
 use Jifty;
 use Net::LDAP;
 use Data::Dump qw/dump/;
+use Getopt::Long;
 
 BEGIN { Jifty->new; };
 
+my $limit = 100;
+GetOptions(
+	'limit=i', => \$limit,
+);
+
 my $ldap_config = Jifty->config->app('LDAP');
 Jifty->log->debug( "config->app(LDAP) = ",dump( $ldap_config ) );
 
@@ -18,10 +24,7 @@
 
 # an anonymous bind
 #my $mesg = $ldap->bind;
-my $mesg = $ldap->bind(
-	DN       => $ldap_config->{DN},
-	password => $ldap_config->{Password},
-);
+my $mesg = $ldap->bind( $ldap_config->{DN}, password => $ldap_config->{Password} );
 
 Jifty->log->info("Connected to ", $ldap_config->{Server}, " with DN ", $ldap_config->{DN});
 
@@ -30,37 +33,51 @@
 	base   => "dc=skole,dc=hr",
 #	filter => "(&(sn=Barr) (o=Texas Instruments))",
 	filter => "(objectClass=hrEduPerson)",
-	sizelimit => 100, # 0 = off
+	sizelimit => $limit, # 0 = off
 );
 
 if ( $mesg->code ) {
-	warn $mesg->code, ": ", $mesg->error, "\n";
+	Jifty->log->error( $mesg->code, ": ", $mesg->error );
 }
 
 Jifty->log->info( "found ", $mesg->count, " entries" );
 
-foreach my $entry ( $mesg->entries ) {
-
-	$entry->dump;
-
+sub ldap2model {
+	my ( $model, $entry, $additional ) = @_;
 	my $data;
-	my $user = A3C::Model::User->new;
 
-	my @columns = map { $_->name } $user->columns;
+	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 );
-		} else {
-			Jifty->log->error(ref($user)," doesn't have $attr");
+#		} elsif ( $attr !~ m/^(objectClass)$/i ) {
+#			Jifty->log->error(ref($model)," doesn't have $attr");
 		}
 	}
 
-	Jifty->log->debug( dump( $data ) );
+	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 ) {
 
-	my ( $id, $message ) = $user->load_or_create( %$data );
+#	$entry->dump;
+
+	my $organization = A3C::Model::Organization->new;
+	ldap2model( $organization, $entry );
+
+	my $user = A3C::Model::User->new;
+	ldap2model( $user, $entry, { organization => $organization } );
 
-	Jifty->log->error( $message ) if ! $id;
 }