Changeset 329

Timestamp:

08/12/09 13:31:56 (15 years ago)

Author:

nanardon

Message:

• make clearer how attributes are find in db

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Sql.pm (modified) (1 diff)
• Sql/Address.pm (modified) (1 diff)
• Sql/Group.pm (modified) (2 diffs)
• Sql/User.pm (modified) (2 diffs)
• Sql/objects.pm (modified) (8 diffs)

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

@@ -64 +64 @@
             undef, undef,
             {
-                RaiseError => 0,
+                RaiseError => 1,
                 AutoCommit => 0,
                 PrintWarn => 1,

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

@@ -43 +43 @@
 sub has_extended_attributes { 1 }
 
-sub _initials_fields {
-    return {
-        gidNumber       => 'gidnumber',
-        user            => 'user',
-    }
-}
-
 sub _inline_fields {
     my ($self, $for, $base) = @_;
 
     my %fields = (
-        %{ $self->SUPER::_inline_fields($for, $base) },
+        $self->SUPER::_inline_fields($for, $base),
+        gidNumber       => 'gidnumber',
+        user            => 'user',
     );
-    \%fields;
 }
 

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

@@ -43 +43 @@
 sub has_extended_attributes { 1 }
 
-sub _initials_fields {
-    return {
+sub _inline_fields {
+    my ($self, $for, $base) = @_;
+    return (
+        $self->SUPER::_inline_fields($for, $base),
         gidNumber       => 'gidnumber',
-    }
+    );
 }
 
-sub _inline_fields {
+sub _managed_fields {
     my ($self, $for, $base) = @_;
 
     my %fields = (
-        %{ $self->SUPER::_inline_fields($for, $base) },
         memberUID       => 'memberUID',
         member          => 'member',
-        # gidNumber       => 'gidnumber',
         $for !~ /w/ ? (
             sAMAccountName  => 'name',
@@ -62 +62 @@
         ) : (),
     );
-    \%fields;
+    %fields;
 }
 

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

@@ -49 +49 @@
 }
 
-sub _initials_fields {
-    return {
+sub _inline_fields {
+    my ($class, $for, $base) = @_;
+    return (
         uidNumber => 'uidnumber',
         gidNumber => 'gidnumber',
-    }
-}
-
-sub _inline_fields {
+    );
+}
+
+sub _managed_fields {
     my ($self, $for, $base) = @_;
-    return {
-        %{ $self->SUPER::_inline_fields($for, $base) },
+    return (
         memberOf        => 'memberOf',
-        # uidNumber => 'uidnumber',
-        # gidNumber => 'gidnumber',
         (($for !~ /w/) ? (
         uid => 'name',
@@ -74 +72 @@
         department => 'department',
         ) : ()),
-    }
+    )
 }
 

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

@@ -78 +78 @@
 
 sub has_extended_attributes { 0 }
+
+# Work only for very simple case, must be override
 
 sub _inline_fields {
@@ -100 +102 @@
     }
     my %fields = map { $_ => $_ } @res;
-    \%fields
-}
-
-sub _canonical_fields {
-    my ($class, $base, $for) = @_;
-    $for ||= 'rw';
+    %fields
+}
+
+# Everything managed by the perl code
+
+sub _managed_fields {
+    my ($class, $for, $base) = @_;
+    return();
+}
+
+# Everything from attributes_list table
+# $for is uneeded here as all this attributes are rw
+
+sub _extended_field {
+    my ($class, $for, $base) = @_;
     my @attr;
     if ($class->has_extended_attributes) {
         my $sth = $base->db->prepare_cached(
             sprintf(
-                q{select canonical from %s order by canonical},
+                q{select canonical from only %s order by canonical},
                 $base->db->quote_identifier($class->object_table . '_attributes_list'),
             )
@@ -118 +129 @@
             push(@attr, $res->{canonical});
         }
-    }
-    my %inl = %{ $class->_inline_fields($for, $base) || {} };
-    $inl{$_} = 1 foreach(@attr);
+        return map { $_ => $_ } @attr;
+    }
+}
+
+sub _canonical_fields {
+    my ($class, $base, $for) = @_;
+    $for ||= 'rw';
+    my %inl = (
+        $class->_inline_fields($for, $base),
+        $class->_managed_fields($for, $base),
+        $class->_extended_field($for, $base),
+    );
     return sort keys %inl;
-    
 }
 
@@ -146 +165 @@
     $c_field or return;
     $for ||= 'rw';
-    my $inline = $class->_inline_fields($for, $base) || {};
-    return $inline->{$c_field}
-        ? $inline->{$c_field}
-        : $class->_get_field_name_db($c_field, $base);
+    my %fields = $class->_managed_fields($for, $base);
+    return $fields{$c_field} if ($fields{$c_field});
+    %fields = $class->_inline_fields($for, $base);
+    return $fields{$c_field} if ($fields{$c_field});
+    %fields = $class->_extended_field($for, $base);
+    return $fields{$c_field}
 }
 
@@ -188 +209 @@
 
     # splitting inline from extended
-    my $inl = $class->_initials_fields('w', $base) || {};
+    my %inlined = $class->_inline_fields('w', $base);
+    my %inl = map { $_ => 1 } values %inlined;
     my (%first, %second);
     foreach (keys %data) {
-        if ($inl->{$_}) {
-            $first{$inl->{$_}} = $data{$_};
+        warn $_;
+        if ($inl{$_}) {
+            $first{$_} = $data{$_};
         } else {
             $second{$_} = $data{$_};
@@ -244 +267 @@
 sub get_field {
     my ($self, $field) = @_;
-    my $inl = $self->_inline_fields('r', $self->base) || {};
-    my %inline = map { $inl->{$_} => 1 }  keys %{ $inl || {}};
-    if ($inline{lc($field)}) {
+    my %inl = $self->_inline_fields('r', $self->base);
+    my %inline = map { $_ => 1 } values %inl;
+    if ($inline{$field}) {
     my $sth = $self->db->prepare_cached(
         sprintf(
@@ -284 +307 @@
     my @vals;
     my %ext;
-    my $inl = $self->_inline_fields('w', $self->base) || {};
-    my %inline = map { $inl->{$_} => 1 }  keys %{ $inl || {}};
+    my %inl = $self->_inline_fields('w', $self->base);
+    my %inline = map { $_ => 1 } values %inl;
     foreach my $field (keys %data) {
         $data{$field} = $data{$field} ? 1 : 0 if($field eq 'exported');
@@ -357 +380 @@
                 }
             } else {
+                warn "delete";
                 defined($sthd->execute($okey, $_)) or do {
                     $self->base->log(LA_ERR,