Changeset 2280

Timestamp:

08/30/19 18:37:00 (5 years ago)

Author:

nanardon

Message:

la-dump: add support for json and yaml, allow to write into files

Location:

trunk/LATMOS-Accounts

Files:

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

trunk/LATMOS-Accounts/bin/la-dump

@@ -76 +76 @@
     'u|username=s'      => \my $username,
     'help'              => sub { pod2usage(0) },
+    'f=s'               => \my $filename,
 ) or pod2usage();
 
@@ -93 +94 @@
 foreach (@result) {
     my $o = $labase->get_object($otype, $_) or next;
-    push(@Dump, $o->DataDump({ recur => $recur, SubOtype => \@SubOtype }));
+    push(@Dump, $o->DataDump(
+            {
+                recur => $recur,
+                SubOtype => \@SubOtype,
+                noSchema => 1,
+            }
+    ));
 }
 
-require Data::Dumper;
-print Data::Dumper::Dumper(\@Dump);
+@fmt = qw(xml) unless (@fmt);
 
 foreach my $Format (@fmt) {
@@ -105 +111 @@
     for ($Format) {
         /^xml$/ and do {
-            require XML::Simple;
+            eval {
+                require XML::Simple;
+            };
+            if ($@) {
+                warn "Cannot output xml: XML::Simple perl module missing";
+                next;
+            }
             my $xml = XML::Simple->new();
             $string = $xml->XMLout(\@Dump);
             next;
+        };
+        /^json$/ and do {
+            eval {
+                require JSON;
+            };
+            if ($@) {
+                warn "Cannot output xml: XML::Simple perl module missing";
+                next;
+            }
+            my $json = JSON->new;
+            $json->indent(1);
+            $string = $json->encode(\@Dump);
+            next;
+        };
+        /^yaml$/ and do {
+            eval {
+                require YAML;
+            };
+            if ($@) {
+                warn "Cannot output xml: XML::Simple perl module missing";
+                next;
+            }
+            $string = YAML::Dump(\@Dump);
+            next;
+        };
+        /^pl$/ and do {
+            require Data::Dumper;
+            $string = Data::Dumper::Dumper(\@Dump);
         }
     }
 
-    print $string;
+    if ($filename) {
+        my $realFilename = $filename . '.' . $Format;
+        open(my $handle, '>', $realFilename) or do {
+            warn "Cannot open $realFilename for wrinting";
+            next;
+        };
+        print $handle $string;
+        close($handle);
+    } else {
+        print $string;
+    }
 }
 

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

@@ -882 +882 @@
         }
 
-        $dump->{roAttrs} = [ sort keys %roAttrs ];
+        $dump->{roAttrs} = [ sort keys %roAttrs ]
+            unless($config->{noSchema});
     }