- refactoring, minimized complexity by reordering and postfix evaluation

lib/SLUB/LZA/TA/Output.pm

@@ -40,7 +40,7 @@ sub line_result_mapper {
     my ($partial_result, $opt) = @_;
     my %line;
     $line{aipid}= $partial_result->{_source}->{uuid};
-    my @tmd = qw(
+    foreach my $t (qw(
         External-Description
         External-Identifier
         LDP-collection
@@ -65,6 +65,18 @@ sub line_result_mapper {
     ) {
         add_line_by_baginfo_entry(\%line, $partial_result, $t, $opt);
     }
+    my $payload_oxum = $line{'payload_oxum'};
+    my $payload_size = "";
+    my $payload_filecount = "";
+    ($payload_size, $payload_filecount) = split /\./, $payload_oxum if (defined $payload_oxum);
+    $line{payload_size} = $payload_size if (defined $opt->{with_payload_size});
+    $line{payload_filecount} = $payload_filecount if (defined $opt->{with_payload_filecount});
+    delete $line{'payload_oxum'}; # should not be part of result!
+    $line{creation_date} = $partial_result->{_source}->{created} if (defined $opt->{with_creationdate});;
+    $line{filecount} = $partial_result->{_source}->{file_count} if (defined $opt->{with_filecount});;
+    $line{path} = $partial_result->{_source}->{filePath} if (defined $opt->{with_path});;
+    $line{score} = $partial_result->{_score} if (defined $opt->{with_score});
+    $line{size} = $partial_result->{_source}->{size} * 1024 * 1024 if (defined $opt->{with_size});;
     return \%line;
 }