Changeset 83

Timestamp:

05/10/09 19:03:39 (15 years ago)

Author:

nanardon

Message:

• allow to sync specific object

Location:

LATMOS-Accounts

Files:

• bin/la-sync (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Unix/User.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Synchro.pm (modified) (2 diffs)

LATMOS-Accounts/bin/la-sync

@@ -27 +27 @@
     'nocreate'   => \my $nocreate,
     'test'       => \my $test,
+    'o|object=s' => \my $otype,
 ) or pod2usage();
 
@@ -56 +57 @@
 ) or die "cannot create sync object\n";
 $sync->load_dest and return;
-$sync->process() or warn "Sync has failed\n";
+if ($otype) {
+    foreach (@ARGV) {
+        warn "Try to sync $otype: $_\n";
+        $sync->sync_object($otype, $_);
+    }
+} else {
+    $sync->process() or warn "Sync has failed\n";
+}

LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm

@@ -276 +276 @@
 }
 
+=head2 sync_object
+
+Synchronise an object into this base
+
+=cut
+
+sub sync_object {
+    my ($self, $srcobj, %options) = @_;
+    $self->is_supported_object($srcobj->type) or return;
+    my @fields = $options{attrs}
+        ? @{ $options{attrs} }
+        : $self->list_canonicals_fields($srcobj->type, 'w');
+    my %data;
+    foreach (@fields) {
+        $srcobj->get_field_name($_) or next;
+        $data{$_} = $srcobj->get_c_field($_);
+    }
+    if (my $dstobj = $self->get_object($srcobj->type, $srcobj->id)) {
+        return $dstobj->set_c_fields(%data);
+    } elsif(!$options{nocreate}) {
+        return $self->create_c_object($srcobj->type, $srcobj->id, %data);
+    } else {
+        return 0;
+    }
+}
+
 1;
 

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix/User.pm

@@ -49 +49 @@
 
 sub id {
-    $_[0]->{login}
+    $_[0]->{account}
 }
 

LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

@@ -140 +140 @@
             foreach my $uid (@lobjfrom) {
                 my $sobj = $self->from->get_object($otype, $uid);
-                if ($exists{$uid}) {
-                    my %fields = map { $_ => $sobj->get_c_field($_, 'r') } @common_fields;
-                    my $dobj = $destbase->get_object($otype, $uid);
-                    $dobj->set_c_fields(%fields) unless($self->{options}{test});
-                    warn "  $otype $uid: synched\n";
-                } elsif (!$self->{options}{nocreate} && !$options{nocreate}) {
-                    my %fields = map { $_ => $sobj->get_c_field($_, 'r') } @common_fields;
-                    $destbase->create_c_object($otype, $uid, %fields) unless($self->{options}{test});
-                    warn "  $otype $uid: created\n";
-                }
+                $destbase->sync_object(
+                    $sobj,
+                    nocreate => ($self->{options}{nocreate} || $options{nocreate}),
+                ) unless($self->{options}{test});
+                warn "  $otype $uid: synched\n";
             }
         }
@@ -172 +167 @@
 }
 
+sub sync_object {
+    my ($self, $otype, $uid) = @_;
+    my $sobj = $self->from->get_object($otype, $uid) or return;
+    foreach ($self->to) {
+        $_->sync_object($sobj)
+    }
+    foreach ($self->to) {
+        $_->commit;
+    }
+    1;
+}
+
 sub process {
     my ($self) = @_;