Changeset 249

Timestamp:

06/08/09 20:51:52 (15 years ago)

Author:

nanardon

Message:

• review database schema

Location:

LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Group.pm (modified) (3 diffs)
• Bases/Sql/User.pm (modified) (6 diffs)
• Bases/Sql/objects.pm (modified) (1 diff)
• Synchro.pm (modified) (4 diffs)

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

@@ -71 +71 @@
                 q{
                 select value from group_attributes_users
-                join group_attributes_list on
-                group_attributes_users.attr = group_attributes_list.ikey
                 join "group" on "group".ikey = group_attributes_users.okey
-                where name = ? and canonical = ?
+                where name = ? and attr = ?
                 }
             );
@@ -93 +91 @@
     foreach my $attr (keys %data) {
         $attr =~ /^memberUID|member$/ and do {
-            my $attrid = $self->_get_field_name_db('memberUID', $self->base) or next;
             my %member;
             foreach (@{ $self->get_field('memberUID') }) {
@@ -109 +106 @@
                         q{insert into group_attributes_users (value, attr, okey) values (?,?,?)}
                     );
-                    $sth->execute($_, $attrid, $self->_get_ikey);
+                    $sth->execute($_, 'memberUID', $self->_get_ikey);
                 } elsif ($member{$_}{c}) {
                     my $sth = $self->db->prepare_cached(
                         q{delete from group_attributes_users where value = ? and attr = ? and okey = ?}
                     );
-                    $sth->execute($_, $attrid, $self->_get_ikey);
+                    $sth->execute($_, 'memberUID', $self->_get_ikey);
                 } # else {} # can't happend
             }

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

@@ -86 +86 @@
             select name from "group" join
             group_attributes_users on group_attributes_users.okey = "group".ikey
-            join group_attributes_list on
-            group_attributes_users.attr = group_attributes_list.ikey
-            where value = ? and canonical = ?
+            where value = ? and attr = ?
             }
         );
@@ -102 +100 @@
             select name from "user" join
             user_attributes on user_attributes.okey = "user".ikey
-            join user_attributes_list
-            on user_attributes_list.ikey = user_attributes.attr
-            where value = ? and canonical = ?
+            where value = ? and attr = ?
             }
         );
@@ -118 +114 @@
             select name from "group" join
             group_attributes on "group".ikey = group_attributes.okey
-            join group_attributes_list on group_attributes_list.ikey = group_attributes.attr
             where okey in (select okey from group_attributes_users where value = ?)
-            and canonical = ? and value = ?
+            and attr = ? and value = ?
             }
         );
@@ -134 +129 @@
             select name from "group" join
             group_attributes on group_attributes.okey = "group".ikey
-            join group_attributes_list
-            on group_attributes_list.ikey = group_attributes.attr
-            where value = ? and canonical = ?
+            where value = ? and attr = ?
             }
         );
@@ -183 +176 @@
     foreach my $attr (keys %data) {
         $attr =~ /^memberOf$/ and do {
-            my $cl = $self->base->_load_obj_class('group') or next;
-            my $attrid = $cl->_get_field_name_db('memberUID', $self->base) or next;
             my %member;
             foreach (@{ $self->get_field('memberOf') }) {
@@ -200 +191 @@
                         q{insert into group_attributes_users (value, attr, okey) values (?,?,?)}
                     );
-                    $sth->execute($self->id, $attrid, $group->_get_ikey);
+                    $sth->execute($self->id, 'memberUID', $group->_get_ikey);
                 } elsif ($member{$_}{c}) {
                     my $sth = $self->db->prepare_cached(
                         q{delete from group_attributes_users where value = ? and attr = ? and okey = ?}
                     );
-                    $sth->execute($self->id, $attrid, $group->_get_ikey);
+                    $sth->execute($self->id, 'memberUID', $group->_get_ikey);
                 } # else {} # can't happend
             }

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

@@ -142 +142 @@
     my $res = $sth->fetchrow_hashref;
     $sth->finish;
-    $res->{ikey}
+    return $c_field if($res->{ikey});
 }
 

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

@@ -6 +6 @@
 use base qw(Config::IniFiles);
 use LATMOS::Accounts::Bases;
+use LATMOS::Accounts::Log;
 
 =head1 NAME
@@ -143 +144 @@
                     );
                     if (defined $res) {
-                        warn sprintf(
-                            "%s::%s::%s => %s (%s)\n",
+                        la_log(LA_INFO,
+                            "%s::%s::%s => %s (%s)",
                             $self->from->label, $otype, $uid,
                             $destbase->label, $res
                         ) if ($res);
                     } else {
-                        warn sprintf(
-                            "Error syncing %s::%s::%s => %s\n",
+                        la_log(LA_ERR,
+                            "Error syncing %s::%s::%s => %s",
                             $self->from->label, $otype, $uid, $destbase->label
                         ); 
@@ -172 +173 @@
                         print "delete " . $destbase->label . '::' . $otype . '::' . "$_\n";
                     } else {
-                        warn "cannot delete " . $destbase->label . '::' . $otype . '::' . "$_\n";
+                        la_log(LA_ERR, "cannot delete " . $destbase->label . '::' . $otype . '::' . "$_");
                     }
                 }
@@ -183 +184 @@
     my ($self, $otype, $uid) = @_;
     my $sobj = $self->from->get_object($otype, $uid) or do {
-        warn "Cannot get object for synching $uid ($otype)\n";
+        la_log(LA_WARNING, "Cannot get object for synching $uid ($otype)");
         return;
     };
     foreach ($self->to) {
         if (my $res = $_->sync_object($sobj)) {
-            warn $_->label . " $uid ($otype) $res\n";
-        } else { warn "error synching $uid ($otype) to " . $_->label . "\n"; }
+                la_log(LA_INFO, $_->label . " $uid ($otype) $res");
+        } else {
+            la_log(LA_ERR, "error synching $uid ($otype) to " . $_->label);
+        }
     }
     foreach ($self->to) {