Changeset 1520 for trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXschematron.java

Timestamp:

02/09/10 18:26:36 (21 months ago)

Author:

Stephen Rankin

Message:

Added save results feature and single file checking (NXDL). Update of Javadocs. ref#236.

File:

• trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXschematron.java (modified) (6 diffs)

trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXschematron.java

@@ -44 +44 @@
     private File reducedNeXusFile;
     private File schematronFile;
+    private File inputNexusFile;
     private boolean keepTemp;
     private InputStream dsdlIncludeXSLTStream = null;
@@ -52 +53 @@
     //    "iso_abstract_expand.xsl", "iso_svrl_for_xslt2.xsl"};
 
-    public NXschematron(File reducedNeXusFile, File schematronFile,
+    public NXschematron(File inputNexusFile, File reducedNeXusFile, File schematronFile,
             final boolean keepTemp) {
 
         this.reducedNeXusFile = reducedNeXusFile;
         this.schematronFile = schematronFile;
+        this.inputNexusFile = inputNexusFile;
         this.keepTemp = keepTemp;
 
@@ -77 +79 @@
 
     /**
-     * Transform an XML file to somthing else given ans XSLT transformation.
+     * Transform an XML file to something else given an XSLT transformation.
      * @param inputFilename the XML input file name.
      * @param xslFilename the xslt file name.
@@ -92 +94 @@
 
     /**
-     * Transform an XML file to somthing else given ans XSLT transformation.
+     * Transform an XML file to something else given an XSLT transformation.
      * @param inputFile the XML input file
      * @param xslFile the xslt file.
@@ -178 +180 @@
 
         // Now lets validate the actual reduced file.
-        File resultsFile = File.createTempFile("result", ".xml");
+        //File resultsFile = File.createTempFile(inputNexusFile.getName() + ".result", ".xml");
+
+        //File resultsFile = File.createTempFile(inputNexusFile.getName(). + ".result", ".xml");
+
+        File resultsFile = new File(reducedNeXusFile.getName().replaceAll(".reduced", "") + ".result");
 
         if (!this.keepTemp) {
@@ -192 +198 @@
 
     public static void main(String[] args) {
-        if (args.length != 2) {
-            System.out.println("Must specify two input files");
+        if (args.length != 3) {
+            System.out.println("Must specify three input files");
             return;
         }
         try {
-            NXschematron sch = new NXschematron(
-                    new File(args[0]), new File(args[1]), false);
+            NXschematron sch = new NXschematron(new File(args[0]),
+                    new File(args[1]), new File(args[2]), false);
             File results = sch.validate();
             System.out.println(results.getAbsolutePath());