Changeset 2219 for trunk

Timestamp:

02/25/19 16:40:05 (5 years ago)

Author:

nanardon

Message:

Add attribute caching when compute

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Objects.pm (modified) (2 diffs)
• Sql.pm (modified) (1 diff)
• Sql/User.pm (modified) (3 diffs)
• Sql/objects.pm (modified) (1 diff)

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

@@ -448 +448 @@
         }
     }
-    
+
     if (keys %updated) {
+        $self->PostSetAttribute() or do {
+            $self->base->log(LA_ERR, "PostSetAttribute failed when updating %s/%s",
+                $self->type, $self->id);
+            return;
+        };
+
         $self->ReportChange('Update', 'Attributes %s have been updated', join(', ', sort keys %updated));
         foreach (sort keys %updated) {
@@ -460 +466 @@
     }
     return scalar(keys %updated);
+}
+
+=head2 PostSetAttribute
+
+This function is call to compute data when object is modify.
+
+=cut
+
+sub PostSetAttribute {
+    my ($self) = @_;
+
+    return 1;
 }
 

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

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 29 };
+sub SCHEMA_VERSION { 30 };
 
 =head1 NAME

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

@@ -902 +902 @@
             cn =>  { iname => 'name', ro => 1 },
             gecos => {
-                managed => 1,
+                ro => 1,
+                auto => 1,
+            },
+            _gecos => {
+                managed => 1,
+                hide => 1,
                 ro => 1,
                 get => sub {
@@ -908 +913 @@
                     my $obj = $self->object;
 
-                    my $ec = $obj->_get_c_field('endcircuit') || '';
-
-                    my $date = $ec
-                        ? sprintf('%s (%s)', $obj->_get_c_field('expireTextEC'), $obj->_get_c_field('expireText'))
-                        : $obj->_get_c_field('expireText');
-
-                    $date ||= '';
-
-                    my $gecos = sprintf("%s,%s,%s,%s",
-                        join(' ', grep { $_ }
-                                ($obj->_get_c_field('givenName'),
-                                ($obj->_get_c_field('sn'))))
-                            || $obj->_get_c_field('description') || '',
-                        join(' - ', grep { $_ } (($obj->_get_c_field('site') ||
-                                    $obj->_get_c_field('l')),
-                            $obj->_get_c_field('physicalDeliveryOfficeName'))) || '',
-                        $obj->_get_c_field('telephoneNumber') || '',
-                        $date,
-                    );
-                    $gecos =~ s/:/ /g;
+                    my $fmt = $self->base->config('gecosformat') || '%{displayName},%{l}-%{physicalDeliveryOfficeName},%{telephoneNumber},%{expireText}';
+                    my $gecos = $obj->queryformat($fmt);
                     return to_ascii($gecos);
                 },
                 label => l('GECOS'),
             },
-            displayName  => {
+            displayName => {
+                ro => 1,
+                auto => 1,
+            },
+            _displayName  => {
                 ro => 1, managed => 1,
+                hide => 1,
                 get => sub {
                     my ($self) = @_;
@@ -947 +939 @@
                 label => l('Name'),
             },
-            sAMAccountName  => {
-                ro => 1,
+            sAMAccountName => {
+                ro => 1,
+                auto => 1,
+            },
+            _sAMAccountName  => {
+                ro => 1,
+                hide => 1,
                 managed => 1,
                 iname => 'name',

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

@@ -783 +783 @@
 }
 
+sub PostSetAttribute {
+    my ($self) = @_;
+
+    my %data;
+    foreach my $attr ($self->base->list_canonical_fields($self->type, 'r')) {
+        my $oattr = $self->base->get_attr_schema($self->type, $attr);
+        if ($oattr->{auto}) {
+            my $source = "_$attr";
+            $data{$attr} = $self->_get_c_field($source);
+        }
+    }
+    my $res =  $self->set_fields(%data);
+
+    return $res ? $res : 'OEO';
+}
+
 
 =head2 SetNoDelete($value)