Changeset 76

Timestamp:

05/09/09 19:45:21 (15 years ago)

Author:

nanardon

Message:

• perform delete once, and at beginning

File:

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

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

@@ -101 +101 @@
 
 sub _traverse {
-    my ($self, $attr_cb, %options) = @_;
+    my ($self, $callback) = @_;
     
     # listing existing obj one time:
@@ -116 +116 @@
         warn "Sync objects $otype\n";
         foreach my $destbase (@obj_dest_base) {
+            $callback->($otype, $destbase);
+        }
+    }
+}
+
+sub _traverse_update {
+    my ($self, %options) = @_;
+    $self->_traverse(
+        sub {
+            my ($otype, $destbase) = @_;
             my @lobjfrom = $self->from->list_objects_from_rev(
                 $otype,
@@ -121 +131 @@
             );
             warn "objects $otype " . $self->from->label . " => " . $destbase->label . "\n";
-            my @common_fields = $attr_cb->($self->from, $destbase, $otype) or next;
+            my @common_fields = $options{attr_cb}->($self->from, $destbase, $otype) or return;
             warn "Synching fields: " . join(', ', sort @common_fields) . "\n";
             my %exists = map { $_ => 1 } $destbase->list_objects($otype);
@@ -137 +147 @@
                 }
             }
+        }
+    );
+}
+
+sub _traverse_delete {
+    my ($self, %options) = @_;
+    $self->_traverse(
+        sub {
+            my ($otype, $destbase) = @_;
+            my %exists = map { $_ => 1 } $destbase->list_objects($otype);
             my %srcexists = map { $_ => 1 } $self->from->list_objects($otype);
             foreach (keys %exists) {
@@ -145 +165 @@
             }
         }
-    }
+    );
 }
 
@@ -160 +180 @@
 
     my %delayed;
-    $self->_traverse(
-        sub {
+    $self->_traverse_delete;
+    $self->_traverse_update(
+        attr_cb => sub {
             my ($from, $to, $otype) = @_;
             my %fields = ();
@@ -179 +200 @@
         },
     );
-    $self->_traverse(
-        sub {
+    $self->_traverse_update(
+        attr_cb => sub {
             my ($from, $to, $otype) = @_;
             my %fields = ();