add CLI option

Added the option to set the archive tested. Tested with certified and it worked. Also tested with fred and it failed as not legal.
NASA-PDS · Aug 2, 2024 · 9c39628 · 9c39628
1 parent 076ba00
commit 9c39628
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/main/java/gov/nasa/pds/harvest/HarvestCli.java b/src/main/java/gov/nasa/pds/harvest/HarvestCli.java
@@ -15,6 +15,7 @@
 import gov.nasa.pds.harvest.cmd.HarvestCmd;
 import gov.nasa.pds.harvest.util.log.Log4jConfigurator;
 import gov.nasa.pds.registry.common.meta.Metadata;
+import gov.nasa.pds.registry.common.util.ArchiveStatus;
 import gov.nasa.pds.registry.common.util.ExceptionUtils;
 import gov.nasa.pds.registry.common.util.ManifestUtils;
 
@@ -108,11 +109,15 @@ public static void printHelp()
         System.out.println("  -V, --version      Print Harvest version");
         System.out.println();
         System.out.println("Optional parameters:");
-        System.out.println("  -o <dir>           Output directory (applies to supplemental products only)."); 
-        System.out.println("                     Default is /tmp/harvest/out");
-        System.out.println("  -l <file>          Log file. Default is /tmp/harvest/harvest.log");
-        System.out.println("  -v <level>         Logger verbosity: DEBUG, INFO (default), WARNING, ERROR");
-        System.out.println("  -O, --overwrite    Overwrite registered products");
+        System.out.println("  -o <dir>              Output directory (applies to supplemental products only)."); 
+        System.out.println("                        Default is /tmp/harvest/out");
+        System.out.println("  -l <file>             Log file. Default is /tmp/harvest/harvest.log");
+        System.out.println("  -v <level>            Logger verbosity: DEBUG, INFO (default), WARNING, ERROR");
+        System.out.println("  -O, --overwrite       Overwrite registered products");
+        System.out.println("  -a, --archive-status  Set the archive status for all products defaulting to staged");
+        for (String name : new ArchiveStatus().statusNames) {
+          System.out.println("     " + name);
+        }
     }
 
 
@@ -199,6 +204,9 @@ private void initOptions()
 
         bld = Option.builder("O").longOpt("overwrite");
         options.addOption(bld.build());
+
+        bld = Option.builder("a").longOpt("archive-status").hasArg().argName("archive_status");
+        options.addOption(bld.build());
     }
 
 }
diff --git a/src/main/java/gov/nasa/pds/harvest/cmd/HarvestCmd.java b/src/main/java/gov/nasa/pds/harvest/cmd/HarvestCmd.java
@@ -21,6 +21,7 @@
 import gov.nasa.pds.harvest.util.log.LogUtils;
 import gov.nasa.pds.harvest.util.out.WriterManager;
 import gov.nasa.pds.registry.common.meta.BasicMetadataExtractor;
+import gov.nasa.pds.registry.common.util.ArchiveStatus;
 
 
 /**
@@ -58,6 +59,10 @@ public HarvestCmd()
     @Override
     public void run(CommandLine cmdLine) throws Exception
     {
+        if (cmdLine.hasOption("archive-status")) {
+          this.archive_status = cmdLine.getOptionValue("archive-status").toLowerCase();
+          new ArchiveStatus().validateStatusName(archive_status);;
+        }
         configure(cmdLine);
 
         try
@@ -151,7 +156,7 @@ private void configure(CommandLine cmdLine) throws Exception
         // Xpath maps
         XPathCacheLoader xpcLoader = new XPathCacheLoader();
         xpcLoader.load(cfg.getXpathMaps());
-        
+
         // Processors
         if(cfg.getLoad().getDirectories() != null || cfg.getLoad().getFiles() != null)
         {