Added logging config and improved RDF format guessing from args

Author: joshsh

sesamize/src/main/java/net/fortytwo/sesametools/sesamize/Sesamize.java

@@ -36,21 +36,24 @@ public class Sesamize {
     }
 
     private static void printUsage() {
-        System.out.println("Usage: sesamize [options] subcommand [arguments]");
-        System.out.println("Options:\n"
+        System.err.println("Usage: sesamize [options] subcommand [arguments]");
+        System.err.println("Options:\n"
                 + "  -h           Print this help and exit\n"
                 + "  -v           Print version information and exit");
-        System.out.println("Subcommands:");
+        System.err.println("Subcommands:");
         StringBuilder sb = new StringBuilder();
         printSubcommands(sb);
-        System.out.print(sb);
-        System.out.println("E.g.");
-        System.out.println("  sesamize translate -i trig -o nq mydata.trig > mydata.nq");
-        System.out.println("For more information, please see:\n"
+        System.err.print(sb);
+        System.err.println("E.g.");
+        System.err.println("  sesamize translate -i trig -o nq mydata.trig > mydata.nq");
+        System.err.println("For more information, please see:\n"
                 + "  <URL:http://github.com/joshsh/sesametools/tree/master/sesamize>.");
     }
 
-    private static void printUsageAndExit(int exitCode) {
+    private static void printUsageAndExit(int exitCode, String errorMessage) {
+        if (null != errorMessage) {
+            System.err.println(errorMessage);
+        }
         printUsage();
         System.exit(exitCode);
     }
@@ -61,30 +64,34 @@ private static void printVersion() {
     }
 
     public static void main(final String[] args) {
-        SesamizeArgs a = new SesamizeArgs(args);
+        System.out.println("length: " + args.length);
+        for (String s : args) System.out.println("\t" + s);
 
         if (args.length < 1) {
-            printUsageAndExit(1);
+            printUsageAndExit(1, "missing command");
         }
 
+        SesamizeArgs a = new SesamizeArgs(args);
+
         if (null != a.getOption(null, "h", "help")) {
-            printUsageAndExit(0);
+            printUsageAndExit(0, null);
         }
 
         if (null != a.getOption(null, "v", "version")) {
             printVersion();
-            System.exit(0);
+            return;
         }
 
         Command c = subcommands.get(args[0]);
 
         if (null == c) {
-            printUsageAndExit(1);
+            printUsageAndExit(1, "no such command: " + args[0]);
         } else {
             try {
                 c.execute(a);
             } catch (Exception e) {
                 logger.error("Exited with error", e);
+                System.err.println(e.getMessage());
                 System.exit(1);
             }
         }

sesamize/src/main/java/net/fortytwo/sesametools/sesamize/SesamizeArgs.java

@@ -1,5 +1,7 @@
 package net.fortytwo.sesametools.sesamize;
 
+import org.apache.commons.io.FilenameUtils;
+import org.eclipse.rdf4j.common.lang.FileFormat;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParserRegistry;
 
@@ -20,6 +22,16 @@ public class SesamizeArgs {
     public final Map<String, String> pairs;
     public final List<String> nonOptions;
 
+    private static final Map<String, RDFFormat> formatsByFileExtension;
+    static {
+        formatsByFileExtension = new HashMap<>();
+        for (RDFFormat format : RDFParserRegistry.getInstance().getKeys()) {
+            for (String ext : format.getFileExtensions()) {
+                formatsByFileExtension.putIfAbsent(ext, format);
+            }
+        }
+    }
+
     public SesamizeArgs(final String[] args) {
         flags = new HashSet<>();
         pairs = new HashMap<>();
@@ -97,8 +109,10 @@ public RDFFormat getRDFFormat(final File file,
         } else {
             // otherwise try to find the format based on the file name extension,
             // using the specified default value as a fallback
-            Optional<RDFFormat> f = RDFFormat.matchFileName(file.getName(), null);
-            format = f.isPresent() ? f.get() : defaultValue;
+            String ext = FilenameUtils.getExtension(file.getName());
+            return formatsByFileExtension.get(ext);
+            //Optional<RDFFormat> f = RDFFormat.matchFileName(file.getName(), );
+            //format = f.isPresent() ? f.get() : defaultValue;
         }
 
         return format;

sesamize/src/main/java/net/fortytwo/sesametools/sesamize/commands/Select.java

@@ -46,6 +46,7 @@ public Select() {
 
     @Override
     public void execute(SesamizeArgs args) throws Exception {
+        System.out.println("select...");
         File inputFile = new File(args.nonOptions.get(1));
 
         RDFFormat inputFormat = args.getRDFFormat(inputFile, RDFFormat.RDFXML, "i", "inputFormat");
@@ -57,6 +58,7 @@ public void execute(SesamizeArgs args) throws Exception {
 
             executeSparqlSelectQuery(query, inputFile, System.out, inputFormat, outputFormat, getBaseURI(args));
         }
+        System.out.println("...done");
     }
 
     private void executeSparqlSelectQuery(final String query,

sesamize/src/main/resources/log4j.properties

@@ -0,0 +1,12 @@
+log4j.rootLogger=DEBUG, A1, A2
+
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p %c %x - %m%n
+
+log4j.appender.A2=org.apache.log4j.FileAppender  
+log4j.appender.A2.File=sesamize.log  
+log4j.appender.A2.layout=org.apache.log4j.PatternLayout
+log4j.appender.A2.layout.ConversionPattern=%-5p %c %x - %m%n
+
+log4j.logger.io.milton=TRACE