Changeset 936 for LATMOS-Accounts

Timestamp:

04/25/12 15:51:27 (12 years ago)

Author:

nanardon

Message:

• add get/set functions to attributes to get ride of get_field/set_field exceptions

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Attributes.pm (modified) (1 diff)
• Objects.pm (modified) (4 diffs)

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

@@ -206 +206 @@
 sub delayed { $_[0]->{delayed} || 0 }
 
+=head2 get($attr)
+
+Return the value for this attribute
+
+=cut
+
+sub get {
+    my ($self) = @_;
+
+    if (ref $self->{get} eq 'CODE') {
+        return $self->{get}->($self);
+    } else {
+        return $self->object->get_field($self->iname);
+    }
+}
+
+sub set {
+    my ($self, $values) = @_;
+
+    if (ref $self->{set} eq 'CODE') {
+        return $self->{set}->($self, $values);
+    } else {
+        return $self->object->set_fields($self->iname, $self->input($values));
+    }
+}
+
 1;

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

@@ -213 +213 @@
 sub _get_c_field {
     my ($self, $cfield) = @_;
-    my $return;
     my $attribute = $self->attribute($cfield) or do {
         $self->base->log(LA_WARN, "Unknow attribute $cfield");
@@ -222 +221 @@
         return;
     };
-    $return = $self->get_field($attribute->iname);
+    return $attribute->get; 
 }
 
@@ -290 +289 @@
     my ($self, %cdata) = @_;
     my %data;
+    my $res = 0;
     foreach my $cfield (keys %cdata) {
         my $attribute = $self->attribute($cfield) or do {
@@ -310 +310 @@
                 "%s attribute cannot be empty, ignoring for object %s/%s",
                 $cfield,
-                $self->type,
-                $self->id,
+                        $self->type,
+                        $self->id,
             );
             return 0;
         };
-        if (ref $cdata{$cfield}) {
-            $data{$attribute->iname} = []; # ensure hash entry exists
-            foreach (@{$cdata{$cfield}}) {
-                push(@{$data{$attribute->iname}}, defined($_)
-                    ? $attribute->input($_)
-                    : undef
-                );
-            }
-        } else {
-            $data{$attribute->iname} = defined($cdata{$cfield})
-                ? $attribute->input($cdata{$cfield})
-                : undef;
-        }
-    }
-    keys %data or return 0; # TODO: return an error ?
-    $self->set_fields(%data);
+        $res += $attribute->set($cdata{$cfield});
+
+    }
+    $res
 }