Changeset 565

Timestamp:

12/17/09 15:57:06 (15 years ago)

Author:

nanardon

Message:

• Onlyaddress object detection

Location:

LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Onlyaddress.pm (modified) (1 diff)
• Synchro.pm (modified) (2 diffs)

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

@@ -29 +29 @@
 }
 
+sub list_from_rev {
+    my ($class, $base, $rev) = @_;
+
+    my $sth = $base->db->prepare_cached(
+        sprintf(
+            q{select %s as k from %s where ikey not in (select okey from %s
+            where attr = 'isMainAddress') and rev > ? %s order by %s},
+            $base->db->quote_identifier($class->key_field),
+            $base->db->quote_identifier($class->object_table),
+            $base->db->quote_identifier($class->object_table. '_attributes'), # attr
+            ($base->{wexported} ? '' : 'and exported = true'),
+            $base->db->quote_identifier($class->key_field),
+        )
+    );
+    $sth->execute($rev);
+    my @keys;
+    while(my $res = $sth->fetchrow_hashref) {
+        push(@keys, $res->{k});
+    }
+    @keys
+}
+
+sub new {
+    my ($class, $base, $id) = @_;
+    my $sth = $base->db->prepare_cached(
+        sprintf(q{select 1 from %s where %s = ? %s and ikey not in (select okey from %s where attr = 'isMainAddress')},
+            $base->db->quote_identifier($class->object_table),
+            $base->db->quote_identifier($class->key_field),
+            ($base->{wexported} ? '' : 'and exported = true'),
+            $base->db->quote_identifier($class->object_table. '_attributes'),
+        ),
+    );
+    my $count = $sth->execute($id);
+    $sth->finish;
+    $count == 1 or return;
+    $class->SUPER::new($base, $id);
+}
+
 1;

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

@@ -218 +218 @@
         foreach my $ba (@concerned_bases) {
             foreach ($ba->list_objects($otype)) {
-                $ba->sync_object_from($self->from, $otype, $_, %options)
-                    if(!$existing{$_});
+                if(!$existing{$_}) {
+                    my $res = $ba->sync_object_from($self->from, $otype, $_, %options);
+                    la_log(LA_NOTICE, "%s::%s::%s => %s %s",
+                        $self->from->label, $otype, $_, $ba->label, $res,
+                    ) if ($res);
+                }
             }
         }
@@ -228 +232 @@
         foreach my $otype ($self->from->list_supported_objects) {
             foreach my $destbase ($self->to) {
+                warn $self->val($self->from->label, $destbase->label, 0);
                 my @lobjfrom = $self->from->list_objects_from_rev(
                     $otype,
-                    $self->val($self->from->label, $destbase->label) || 0,
+                    $self->val($self->from->label, $destbase->label, 0),
                 );
                 foreach (@lobjfrom) {