Changeset 2624

Timestamp:

05/15/24 10:55:57 (2 weeks ago)

Author:

nanardon

Message:

Revert alternative id attribute for synchro

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (2 diffs)
• Bases/Sql/objects.pm (modified) (2 diffs)
• Synchro.pm (modified) (4 diffs)

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

@@ -1100 +1100 @@
     }
 
-    my $KeyAttribute = $self->config( 'keyAttribute.' . $srcobj->base->label . '.' . $srcobj->type  );
-
-    my $destid = $KeyAttribute
-        ? $srcobj->get_attibutes( $KeyAttribute )
-        : $srcobj->id;
-
-    if (my $dstobj = $self->get_object($srcobj->type, $destid)) {
+    if (my $dstobj = $self->get_object($srcobj->type, $srcobj->id )) {
         keys %data or return 'SYNCED';
         foreach (keys %data) {
@@ -1125 +1119 @@
             return;
         }
-        if (my $res = $self->_create_c_object($srcobj->type, $destid, %data)) {
+        if (my $res = $self->_create_c_object($srcobj->type, $srcobj->id, %data)) {
             return 'CREATED'
         } else {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -36 +36 @@
     my $sth = $base->db->prepare_cached(
         sprintf(
-            q{select %s as k from %s where internobject = false %s %s order by %s},
+            q{select %s as k from %s where %s IS NOT NULL internobject = false %s %s order by %s},
             $base->db->quote_identifier($class->_key_field),
             $base->db->quote_identifier($class->_object_table),
+            $base->db->quote_identifier($class->_key_field),
             ($base->{wexported} ? '' : 'and exported = true'),
             ($Real ? 'and oalias IS NULL' : ''),
@@ -52 +53 @@
 }
 
-# $keyAttribute must be a internal attribute
-
 sub list_from_rev {
-    my ($class, $base, $rev, $keyAttribute) = @_;
-    defined( $rev ) or die '$rev must be defined when calling list_from_rev()';
-    $keyAttribute ||= $base->db->quote_identifier($class->_key_field);
+    my ($class, $base, $rev) = @_;
     my $sth = $base->db->prepare_cached(
         sprintf(
-            q{select %s as k from %s where rev > ? AND internobject = false
-                AND oalias IS NULL AND %s IS NOT NULL %s order by %s},
-            $keyAttribute,
+            q{select %s as k from %s where %s IS NOT NULL AND
+                rev > ? and internobject = false
+                and oalias IS NULL  %s order by %s},
+            $base->db->quote_identifier($class->_key_field),
             $base->db->quote_identifier($class->_object_table),
-            $keyAttribute,
+            $base->db->quote_identifier($class->_key_field),
             ($base->{wexported} ? '' : 'and exported = true'),
             $base->db->quote_identifier($class->_key_field),

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

@@ -283 +283 @@
             $destbase->is_supported_object($otype) or next;
 
-            my $SyncKeyAttribute;
-            if ( my $attr = $destbase->config( 'keyAttribute.' . $self->from->label . '.' . $otype ) ) {
-                $SyncKeyAttribute = $attr;
-            }
-
             my %existings;
             my %filtering;
 
             $existings{$otype} = { map { $_ => 1 }
-                $self->from->list_objects_from_rev( $otype, 0, $SyncKeyAttribute ) };
+                $self->from->listRealObjects($otype) };
 
             # Is there a filter to apply:
@@ -298 +293 @@
             if (my $filter = $self->{options}->{$filtername}) {
                 la_log(LA_DEBUG, "Found %s param, using it: %s", $filtername, $filter);
-                    foreach ( my $id = $self->from->search_objects($otype, $filter, 'oalias=NULL') ) {
-                        my $obj = $self->from->get_object( $otype, $id );
-                        my $id = $obj->get_attributes( $SyncKeyAttribute );
-                        $filtering{$otype}{ $id } = 1;
-                    }
+                $filtering{$otype} = { map { $_ => 1 }
+                    $self->from->search_objects($otype, $filter, 'oalias=NULL') };
             } else {
                 $filtering{$otype} = $existings{$otype};
@@ -366 +358 @@
                     $otype,
                     $self->val($self->from->label, $destbase->label, 0),
-                    $SyncKeyAttribute,
                 ));
 
@@ -394 +385 @@
                     }
 
-                    my $res = $destbase->sync_object_from(
-                        $self->from, $otype, $_,
-                        %options, firstpass => $pass );
+                    my $res = $destbase->sync_object_from($self->from, $otype, $_,
+                        %options, firstpass => $pass);
                     if (defined $res) {
                         if ($res) {