Changeset 861 for LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

Timestamp:

12/02/11 11:42:17 (13 years ago)

Author:

nanardon

Message:

• reimport missing files from previous svn

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm (modified) (9 diffs)

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

@@ -124 +124 @@
     $self->load_dest and return;
     my %state = ();
-    $state{$self->from->label} = $self->from->wexported(0);
+    $state{$self->from->label} = $self->from->wexported(
+        $self->{options}{unexported} ? 1 : 0
+    );
     foreach ($self->to) {
         $state{$_->label} = $_->wexported(1);
@@ -137 +139 @@
     la_log(LA_DEBUG, "Leaving synch mode");
     $self->from->wexported($state{$self->from->label});
-    foreach ($self->to) {
-        $_->commit;
-        $_->wexported($state{$_->label});
+    foreach my $base (grep { $_ } $self->to) {
+        $base->commit;
+        $base->wexported($state{$base->label});
     }
 }
@@ -205 +207 @@
 
     $self->lock or return;
+    
+    if (!(my $res = $self->run_pre_synchro({}))) {
+        la_log(LA_ERR, "Pre synchro script failed, aborting");
+        $self->unlock;
+        return;
+    }
 
     my %state = $self->enter_synch_mode;
@@ -230 +238 @@
                             $self->from->label, $otype, $_, $destbase->label, $res,
                         );
+                        if ($destbase->is_transactionnal) {
+                            $destbase->commit;
+                        }
                         $updated = 1;
+                    } else {
+                        if ($destbase->is_transactionnal) {
+                            $destbase->rollback;
+                        }
                     }
                 }
@@ -241 +256 @@
         }
         foreach my $pass (1, 0) {
-            foreach my $otype (
-                sort { $a eq 'user' ? 1 : -1 } # user in last because gidNumber needed
-                keys %objlist) {
-                next if (!$pass && !$destbase->delayed_fields($otype));
+            foreach my $otype ($destbase->ordered_objects) {
+                exists($objlist{$otype}) or next;
                 foreach (@{$objlist{$otype} || []}) {
                     my $res = $destbase->sync_object_from($self->from, $otype, $_,
@@ -254 +267 @@
                                 $destbase->label, $res,
                             );
+                            if ($destbase->is_transactionnal) {
+                                $destbase->commit;
+                            }
                             $updated = 1;
                         }
@@ -262 +278 @@
                         );
                         $desterror{$destbase->label} = 1;
+                        if ($destbase->is_transactionnal) {
+                            $destbase->rollback;
+                        }
                     }
 
@@ -272 +291 @@
     my $res = $self->run_post_synchro(
         {
-            UPDATED => $updated,
+            UPDATED => $updated || undef,
         }
     );
@@ -313 +332 @@
 }
 
+sub run_pre_synchro {
+    my ($self, $env) = @_;
+
+    $env ||= {};
+    $env->{HOOK_TYPE} = 'PRE';
+
+    foreach my $base ($self->to) {
+        if ($base->options('presynchro')) {
+            la_log LA_DEBUG, "Executing base pre synchro `%s' for %s",
+                $base->options('presynchro'), $base->label;
+            exec_command(
+                $base->options('presynchro'),
+                {
+                    BASE => $base->label,
+                    BASETYPE => $base->type,
+                    %{ $env },
+                }
+            );
+        }
+    }
+
+    $self->{options}{pre} or return 1;
+
+    la_log(LA_DEBUG, "Running post synchro `%s'", $self->{options}{pre});
+
+    exec_command($self->{options}{post}, $env);
+}
+
 sub run_post_synchro {
     my ($self, $env) = @_;
+    
+    $env ||= {};
+    $env->{HOOK_TYPE} = 'PRE';
+
+    foreach my $base ($self->to) {
+        if ($base->options('postsynchro')) {
+            la_log LA_DEBUG, "Executing base post synchro `%s' for %s",
+                $base->options('postsynchro'), $base->label;
+            exec_command(
+                $base->options('postsynchro'),
+                {
+                    BASE => $base->label,
+                    BASETYPE => $base->type,
+                    %{ $env },
+                }
+            );
+        }
+    }
 
     $self->{options}{post} or return 1;
 
-    la_log(LA_INFO, "Running post synchro `%s'", $self->{options}{post});
-
+    la_log(LA_DEBUG, "Running post synchro `%s'", $self->{options}{post});
+    
     exec_command($self->{options}{post}, $env);
 }