Changeset 333

Timestamp:

08/13/09 16:22:02 (15 years ago)

Author:

nanardon

Message:

• use a more parsable format, factorize work

Location:

LATMOS-Accounts

Files:

• bin/la-query (modified) (3 diffs)
• lib/LATMOS/Accounts/Bases/Objects.pm (modified) (1 diff)

LATMOS-Accounts/bin/la-query

@@ -21 +21 @@
     'b|base=s'   => \my $base,
     'o|object=s' => \my $otype,
+    'e|empty'    => \my $empty_attr,
+    'o|ro'       => \my $with_ro,
     'help'       => sub { pod2usage(0) },
 ) or pod2usage();
@@ -42 +44 @@
 Query should be performed on this objects. Default is to user 'User' object.
 
+=item e|empty
+
+Include also unset attributes
+
+=item o|ro
+
+Include also read-only attributes as comment 
+
 =back
 
@@ -54 +64 @@
         die "Object $otype $ouid not found\n";
     };
-    foreach ($labase->list_canonical_fields($otype, 'r')) {
-        my $val = $obj->get_c_field($_);
-        printf(
-            "  %s: %s\n",
-            $_,
-            ref $val ? join(', ', @$val) : ($val || 'N/A')
-        );
-    } 
+    $obj->text_dump(*STDOUT,
+        {
+            empty_attr => $empty_attr,
+            only_rw => !$with_ro,
+        }
+    );
 } else {
     foreach (sort $labase->list_objects($otype)) {

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

@@ -375 +375 @@
 }
 
+sub text_dump {
+    my ($self, $handle, $options, $base) = @_;
+
+    my $otype = $self->type;
+    $base ||= $self->base;
+
+    foreach my $attr (sort { $a cmp $b } $base->list_canonical_fields($otype,
+        $options->{only_rw} ? 'rw' : 'r')) {
+        if (ref $self) {
+            my $wok = $self->get_field_name($attr, 'w');
+            my $val = $self->get_c_field($attr);
+            if ($val || $options->{empty_attr}) {
+            my @vals = ref $val ? @{ $val } : $val;
+                foreach (@vals) {
+                    printf($handle "%s%s: %s\n", 
+                        $wok ? '' : '# (ro) ',
+                        $attr, $_ || '');
+                }
+            }
+        }
+    }
+}
+
 1;