Changeset 28010 for gs2-extensions

Timestamp:

2013-08-09T13:11:46+12:00 (11 years ago)

Author:

jmt12

Message:

Correctly set up the environment for calls to txt2tdb and also replace external file move command with internal one from nio

File:

• gs2-extensions/parallel-building/trunk/src/src/java/org/nzdl/gsdl/GSInfoDB.java (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/src/java/org/nzdl/gsdl/GSInfoDB.java

@@ -68 +68 @@
         System.err.println("[DEBUG] Command: " + pb.command());
       }
+      // - alter environment
+      Map<String, String> pb_env = pb.environment();
+      pb_env.put("PATH", gsdl_home + "/ext/tdb-edit/linux/bin:" + gsdl_home + "/ext/tdb-edit/bin/script:" + pb_env.get("PATH"));
+      pb_env.put("LD_LIBRARY_PATH", gsdl_home + "/ext/tdb-edit/linux/lib:" + pb_env.get("LD_LIBRARY_PATH"));
       // Start the writer listening
       dbprocess = pb.start();
@@ -94 +98 @@
       dbwriter.close();
       dbprocess.waitFor();
+      if (debug)
+      {
+        System.err.println("[DEBUG] temporary database size: " + this.tmp_file_path.toFile().length() + " bytes");
+      }
       // Move the database into its final location
+      Files.move(this.tmp_file_path, this.file_path, StandardCopyOption.REPLACE_EXISTING);
+
+
       Runtime rut = Runtime.getRuntime();
       Process process = rut.exec(new String[] {"mv", this.tmp_file_path.toString(), this.file_path.toString()});
       // The below always says the file doesn't exist over NFS?
-      /*
       if (!this.file_path.toFile().exists())
       {
         System.err.println("Error! Failed to move database file: " + this.tmp_file_path.toString() + " => " + this.file_path.toString());
       }
-      */
+      if (debug)
+      {
+        System.err.println("[DEBUG] final database size: " + this.file_path.toFile().length() + " bytes");
+      }
     }
     catch (Exception ex)