Main.java: Output files are named "basename_xmp.pdf". Output dir

works.

Author: kjw

.gitignore

@@ -2,3 +2,4 @@ bin
 output
 *.swp
 *~
+pdfmark.jar

src/org/crossref/pdfmark/Main.java

@@ -144,14 +144,22 @@ public Main(String[] args) {
 		 * is already in each PDF. */
 
 		for (String pdfFilePath : parser.getRemainingArgs()) {
-			String outputPath = pdfFilePath + ".out";
+			String outputPath = getOutFileName(pdfFilePath);
+			
+			/* Grab the leaf. */
+			if (outputPath.contains(File.separator)) {
+				String[] split = outputPath.split(File.separator);
+				outputPath = split[split.length - 1];
+			}
 
 			if (!outputDir.isEmpty()) {
 				outputPath = outputDir + File.separator + outputPath;
+			} else {
+				/* Output to the working directory. */
 			}
 
 			File pdfFile = new File(pdfFilePath);
-			File outputFile = new File(pdfFilePath + ".out");
+			File outputFile = new File(outputPath);
 
 			byte[] resolvedXmpData = null;
 
@@ -276,6 +284,15 @@ public void onFailure(String doi, int code, String msg) {
 		return builder.getXmpData();
 	}
 
+	private static String getOutFileName(String pdfFileName) {
+		if (pdfFileName.endsWith(".pdf")) {
+			return pdfFileName.substring(0, pdfFileName.length() - 4)
+					+ "_xmp.pdf";
+		} else {
+			return pdfFileName + "_xmp.pdf";
+		}
+	}
+	
 	private void exitWithError(int code, String error) {
 		shutDown();
 		System.err.println();