--- bin/ldap.pl	2008/03/17 21:42:21	28
+++ bin/ldap.pl	2008/03/30 00:02:18	36
@@ -6,30 +6,19 @@
 use lib 'lib';
 
 use Jifty;
-use Net::LDAP;
+use A3C::LDAP;
 use Data::Dump qw/dump/;
 use Getopt::Long;
 
 BEGIN { Jifty->new; };
 
-my $limit = 0;
+my $limit = 100;
 GetOptions(
 	'limit=i', => \$limit,
 );
 
-my $ldap_config = Jifty->config->app('LDAP');
-Jifty->log->debug( "config->app(LDAP) = ",dump( $ldap_config ) );
-
-my $ldap = Net::LDAP->new( $ldap_config->{Server} ) or die "$@";
-
-# an anonymous bind
-#my $mesg = $ldap->bind;
-my $mesg = $ldap->bind( $ldap_config->{DN}, password => $ldap_config->{Password} );
-
-Jifty->log->info("Connected to ", $ldap_config->{Server}, " with DN ", $ldap_config->{DN});
-
 # perform a search
-$mesg = $ldap->search(
+my $mesg = A3C::LDAP->search(
 	base   => "dc=skole,dc=hr",
 #	filter => "(&(sn=Barr) (o=Texas Instruments))",
 	filter => "(objectClass=hrEduPerson)",
@@ -42,34 +31,42 @@
 
 Jifty->log->info( "found ", $mesg->count, " entries" );
 
-#foreach my $entry ( $mesg->entries ) {
-while ( my $entry = $mesg->shift_entry ) {
-
-#	$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 );
-		} elsif ( $attr !~ m/^(objectClass)$/i ) {
-			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 ) = $user->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 } );
+
+}
+