Changeset 2408

Timestamp:

06/23/20 00:45:44 (4 years ago)

Author:

nanardon

Message:

Always try to sync missing object in destination base

File:

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

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

@@ -294 +294 @@
                 $filtering{$otype} = { map { $_ => 1 }
                     $self->from->search_objects($otype, $filter, 'oalias=NULL') };
-            } else {
-                $filtering{$otype} = $existings{$otype};
             }
 
@@ -321 +319 @@
             foreach ($destbase->listRealObjects($otype)) {
 
-                if ($filtering{$otype}{$_}) {
+                if ($filtering{$otype}{$_} || $existings{$otype}{$_}) {
                     # the object must exists
                     next;
@@ -350 +348 @@
 
             # Finding object to synchronize:
-            @{$objlist{$otype}} = grep { $filtering{$otype}{$_} } $self->from->list_objects_from_rev(
-                $otype,
-                $self->val($self->from->label, $destbase->label, 0),
-            );
+            {
+                my %ObjList = ();
+
+                # Objects to refresh
+                $ObjList{ $_ } = 1 foreach(grep { $filtering{$otype}{$_} } $self->from->list_objects_from_rev(
+                    $otype,
+                    $self->val($self->from->label, $destbase->label, 0),
+                ));
+
+                my %destExists = ( map { $_ => 1 }
+                    $destbase->listRealObjects($otype) );
+
+                # Objects missing in dest, we try to sync it
+                foreach (keys %{ $existings{ $otype } || {} }) {
+                    $destExists{ $_ } and next;
+                    $filtering{$otype}{$_} and next;
+                    $ObjList{ $_ } = 1;
+                }
+
+                @{$objlist{$otype}} = sort keys %ObjList;
+            }
         }