Changeset 1504 for trunk/applications/NXconvertpy/src/org/nexusformat/nxvalidate/NXconvert.java

Timestamp:

13/08/10 16:34:17 (22 months ago)

Author:

Stephen Rankin

Message:

Bulk Load working but not really tested. Fixed various bugs fixed, but single file validation is not working now! Close all files function added. Check for NEXUS/HDF files added. Added threads for file loading actions. Some refactoring of code. refs #236.

File:

• trunk/applications/NXconvertpy/src/org/nexusformat/nxvalidate/NXconvert.java (modified) (4 diffs)

trunk/applications/NXconvertpy/src/org/nexusformat/nxvalidate/NXconvert.java

@@ -5 +5 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.nexusformat.nxvalidate.exceptions.NXConvertpyException;
 
 public class NXconvert {
@@ -41 +42 @@
     }
 
-    public File convert() throws IOException, InterruptedException {
+    public File convert() throws IOException, InterruptedException, NXConvertpyException {
 
         Logger.getLogger(NXconvert.class.getName()).log(
                 Level.INFO, "Creating " + redfile.getAbsolutePath());
-
-        // the command to run
-        //String command = props.getProperty(NXCONVERT) +
-         //       " -d " + this.rawfile + " " + redfile;
 
         String command = "";
@@ -54 +51 @@
             command = convertFile.getAbsolutePath() +
                 " -d " + this.rawfile + " " + redfile;;
-            System.out.println(command);
         }
         else{
@@ -78 +74 @@
             buffer.append("\" failed. Returned ");
             buffer.append(exitValue);
-            throw new IOException(buffer.toString());
+            throw new NXConvertpyException(buffer.toString());
         }
         return redfile;