Changeset 60

Timestamp:

05/03/09 15:01:33 (15 years ago)

Author:

nanardon

Message:

• permform synchronisation in two step, second pass is done for fileds having foreign key constrait such user <=> group link

Location:

LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (1 diff)
• Bases/Objects.pm (modified) (1 diff)
• Bases/Sql/Group.pm (modified) (1 diff)
• Synchro.pm (modified) (3 diffs)

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

@@ -80 +80 @@
 }
 
+sub delayed_fields {
+    my ($self, $otype, $for) = @_;
+    $for ||= 'rw';
+    my $pclass = $self->_load_obj_class($otype) or return;
+    $pclass->_delayed_fields($self, $for);
+}
+
 =head2 get_field_name($otype, $c_fields, $for)
 

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

@@ -127 +127 @@
 =cut
 
+sub _delayed_fields {
+    my ($self)= @_;
+    return ();
+}
+
 =head2 _get_fields_name($field, $for)
 

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

@@ -56 +56 @@
     );
     \%fields;
+}
+
+sub _delayed_fields {
+    my ($self)= @_;
+    return qw(memberUID);
 }
 

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

@@ -112 +112 @@
 }
 
-sub process {
-    my ($self, %options) = @_;
-
-    $self->from->load or return;
-    # if any cannot be loaded, return,
-    # TODO we need a way to force if some still can be sync
-    $self->load_dest and return;
-    
-    # tracking current base revision:
-    my $current_rev = $self->from->current_rev;
-
+sub _traverse {
+    my ($self, $attr_cb, %options) = @_;
+    
     # listing existing obj one time:
     foreach my $otype ($self->from->list_supported_objects) {
@@ -141 +133 @@
             );
             warn "objects $otype => " . $destbase->type . "\n";
-            my @common_fields = $self->_common_fields($self->from, $destbase, $otype);
+            my @common_fields = $attr_cb->($self->from, $destbase, $otype) or next;
             my %exists = map { $_ => 1 } $destbase->list_objects($otype);
             foreach my $uid (@lobjfrom) {
+                my $sobj = $self->from->get_object($otype, $uid);
+                my %fields = map { $_ => $sobj->get_c_field($_, 'r') } @common_fields;
                 if (!$exists{$uid}) {
-                    my $sobj = $self->from->get_object($otype, $uid);
-                    my %fields = map { $_ => $sobj->get_c_field($_, 'r') } @common_fields;
                     $destbase->create_c_object($otype, $uid, %fields);
                     warn "  $otype $uid: created\n";
                 } else {
-                    my $sobj = $self->from->get_object($otype, $uid);
-                    my %fields = map { $_ => $sobj->get_c_field($_, 'r') } @common_fields;
                     my $dobj = $destbase->get_object($otype, $uid);
                     $dobj->set_c_fields(%fields);
-                       
                     warn "  $otype $uid: synched\n";
                 }
@@ -160 +149 @@
         }
     }
+}
+
+sub process {
+    my ($self, %options) = @_;
+
+    $self->from->load or return;
+    # if any cannot be loaded, return,
+    # TODO we need a way to force if some still can be sync
+    $self->load_dest and return;
+    
+    # tracking current base revision:
+    $self->{current_rev} = $self->from->current_rev;
+
+    my %delayed;
+    $self->_traverse(
+        sub {
+            my ($from, $to, $otype) = @_;
+            my %fields = ();
+            my %delayed = map { $_ => 1 } $to->delayed_fields($otype);
+            foreach my $base ($from, $to) {
+                foreach ($base->list_canonicals_fields($otype)) {
+                    $delayed{$_} and next;
+                    $fields{$_} ||= 0; # avoid 
+                    $fields{$_}++;
+                }
+            }
+            # field having value are in both
+            grep { $fields{$_} == 2 } keys %fields;
+        },
+        %options
+    );
+    $self->_traverse(
+        sub {
+            my ($from, $to, $otype) = @_;
+            my %fields = ();
+            my %delayed = map { $_ => 1 } $to->delayed_fields($otype);
+            foreach my $base ($from, $to) {
+                foreach ($base->list_canonicals_fields($otype)) {
+                    $delayed{$_} or next;
+                    $fields{$_} ||= 0; # avoid 
+                    $fields{$_}++;
+                }
+            }
+            # field having value are in both
+            grep { $fields{$_} == 2 } keys %fields;
+        },
+        %options
+    );
 
     foreach ($self->to) {
         $_->commit or next;
-        $self->newval($self->from->label, $_->label, $current_rev) if($current_rev);
+        $self->newval($self->from->label, $_->label, $self->{current_rev}) if($self->{current_rev});
     }