Changeset 409 for trunk

Timestamp:

Sep 4, 2019, 2:57:11 PM (5 years ago)

Author:

g7moreau

Message:

• Add multi dataset in make-zip command

File:

• trunk/project-meta/project-meta (modified) (7 diffs)

trunk/project-meta/project-meta

@@ -8 +8 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.2.0');
+use version; our $VERSION = version->declare('0.2.1');
 
 use File::Copy qw(copy);    
@@ -25 +25 @@
    'dap-publish'           => \&cmd_dap_publish,
    'dap-unpublish'         => \&cmd_dap_unpublish,
-   'dataset-list'          => \&cmd_dataset_list
+   'dataset-list'          => \&cmd_dataset_list,
    'dataset-size'          => \&cmd_dataset_size,
    'make-zip'              => \&cmd_make_zip,
@@ -137 +137 @@
  project-meta dataset-list
  project-meta dataset-size [--verbose|-v] [--dataset|-d dataset]
- project-meta make-zip
+ project-meta make-zip [--verbose|-v] [--dataset|-d dataset]
  project-meta make-allfiles
  project-meta list-license
@@ -301 +301 @@
 
 ################################################################
+
 sub cmd_make_zip {
+   local @ARGV = @_;
+   my ($verbose, $dataset_name);
+
+   Getopt::Long::GetOptions(
+      'verbose'        => \$verbose,
+      'dataset|d=s'    => \$dataset_name,
+      );
+
    my $meta = load_metadata();
    my $current_dir = Cwd::getcwd();
-   my $data_set    = $meta->{'public-dap'}{'data-set'};
-   my $acronym     = $meta->{'project'}{'identifier'}{'acronym'};
+   my $data_set = $meta->{'public-dap'}{'data-set'};
+   if ($dataset_name) {
+      if (exists $meta->{'public-dap'}{'data-set'}{$dataset_name}) {
+         $data_set = $meta->{'public-dap'}{'data-set'}{$dataset_name};
+         }
+      else {
+         die "Error, dataset $dataset_name does'nt exists\n";
+         }
+      }
+
+   my $acronym = $meta->{'project'}{'identifier'}{'acronym'};
 
    push @{$data_set}, 'AUTHORS.txt', 'COPYRIGHT.txt', 'LICENSE.txt';
@@ -338 +356 @@
 
    # Save the Zip file
-   unless ($zip->writeToFileNamed("$current_dir/$acronym--$date.zip") == AZ_OK) {
+   my $zipname = "$acronym";
+   $zipname .= "-$dataset_name" if $dataset_name;
+   $zipname .= "--$date";
+   unless ($zip->writeToFileNamed("$current_dir/$zipname.zip") == AZ_OK) {
       die 'Error: zip write error';
       }
@@ -508 +529 @@
  project-meta dataset-list
  project-meta dataset-size [--verbose|-v] [--dataset|-d dataset]
- project-meta make-zip
+ project-meta make-zip [--verbose|-v] [--dataset|-d dataset]
  project-meta list-license
  project-meta make-file-license
@@ -591 +612 @@
 =head2 make-zip
 
- project-meta make-zip
+ project-meta make-zip [--verbose|-v] [--dataset|-d dataset]
 
 Create a ZIP archive with the open data set.