--- bin/ldap.pl	2008/03/16 21:32:39	22
+++ bin/ldap.pl	2008/03/18 19:22:50	34
@@ -12,7 +12,7 @@
 
 BEGIN { Jifty->new; };
 
-my $limit = 0;
+my $limit = 100;
 GetOptions(
 	'limit=i', => \$limit,
 );
@@ -42,32 +42,42 @@
 
 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 ) = $user->load_or_create( %$data );
+	my ( $id, $message ) = $model->load_or_create( %$data, %$additional );
 
 	if ( $id ) {
-		Jifty->log->info("added $id ", $data->{uid});
+		Jifty->log->info( $message || 'Added', ' ', ref($model), ' ', $model->id );
 	} else {
-		Jifty->log->error( $message );
+		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 } );
+
+}
+