Back up updates to configured data locations, fix issues

This gives us baseline and update files in the same directory.
To create a new, up-to-date index, we just need to set up a new
index name in the conf file and start the service.

See #146

Author: fsteeg

.gitignore

@@ -11,3 +11,4 @@ bin
 *.jsonl
 *log*.gz
 *.tmp
+GND-updates*

app/apps/ConvertBaseline.java

@@ -39,7 +39,7 @@ public static void main(String[] args) {
 			new File(config("index.delete")).delete();
 			for (String file : input) {
 				FileOpener opener = new FileOpener();
-				File out = new File(outFile, new File(file).getName() + ".jsonl");
+				File out = outFile.isDirectory() ? new File(outFile, new File(file).getName() + ".jsonl") : outFile;
 				final ObjectWriter<String> writer = new ObjectWriter<>(out.getAbsolutePath());
 				opener//
 						.setReceiver(new XmlDecoder())//

app/apps/ConvertUpdates.java

@@ -33,9 +33,11 @@ public class ConvertUpdates {
 	public static void main(String[] args) throws IOException {
 		if (args.length == 1 || args.length == 2) {
 			Pair<String, String> startAndEnd = getUpdates(args[0], args.length == 2 ? args[1] : null);
-			backup(new File(config("data.updates.rdf")), startAndEnd.getLeft(), startAndEnd.getRight());
+			String start = startAndEnd.getLeft();
+			String end = startAndEnd.getRight();
+			backup(new File(config("data.updates.rdf")), new File(config("data.rdfxml")), start, end);
 			ConvertBaseline.main(new String[] { config("data.updates.rdf"), config("data.updates.data") });
-			backup(new File(config("data.updates.data")), startAndEnd.getLeft(), startAndEnd.getRight());
+			backup(new File(config("data.updates.data")), new File(config("data.jsonlines")), start, end);
 		} else {
 			System.err.println(
 					"Pass either one argument, the start date for getting updates, or two, the start and the end date.");
@@ -120,10 +122,10 @@ private static void writeLastSuccessfulUpdate(String until) {
 		}
 	}
 
-	private static void backup(File source, String start, String end) throws IOException {
+	private static void backup(File source, File folder, String start, String end) throws IOException {
 		String name = source.getName();
-		File target = new File(source.getParentFile(), String.format("%s_%s_%s%s",
-				name.substring(0, name.lastIndexOf('.')), start, end, name.substring(name.lastIndexOf('.'))));
+		File target = new File(folder, String.format("%s_%s_%s%s", name.substring(0, name.lastIndexOf('.')), start, end,
+				name.substring(name.lastIndexOf('.'))));
 		Files.copy(source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING);
 	}
 

test/apps/ConvertTest.java

@@ -50,7 +50,7 @@ public class ConvertTest {
 	@Parameters(name = "{0}")
 	public static Collection<Object[]> data() {
 		return Arrays.asList(new Object[][] { //
-				{ "test/data/GND.rdf", "test/data" }, //
+				{ "test/data/GND.rdf", "test/data/GND.jsonl" }, //
 				{ "test/data/input", "test/data/index" } });
 	}