Changeset 5073

Timestamp:

04/25/14 14:38:07 (10 years ago)

Author:

Oliver Schonefeld

Message:

• allow user to supply custom Schematron schema file
• rename option for setting custom schema cache directory

Location:

CMDIValidator/trunk/src/main/java/eu/clarin/cmdi/validator

Files:

• CMDIValidatorFactory.java (modified) (5 diffs)
• tool/CMDIValidatorTool.java (modified) (6 diffs)

CMDIValidator/trunk/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorFactory.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -36 +37 @@
 
 
-    private CMDIValidatorFactory(File cacheDirectory, boolean disableSchematron)
+    private CMDIValidatorFactory(File cacheDirectory,
+            File schematronSchemaFile, boolean disableSchematron)
             throws CMDIValidatorInitException {
         /*
@@ -93 +95 @@
         if (!disableSchematron) {
             logger.debug("initializing Schematron validator ...");
-            URL schema = this.getClass().getResource(DEFAULT_SCHEMATRON_SCHEMA);
-            if (schema == null) {
-                throw new CMDIValidatorInitException(
-                        "cannot locate schematron schema");
+
+            URL schema = null;
+            if (schematronSchemaFile != null) {
+                if (!schematronSchemaFile.exists()) {
+                    throw new CMDIValidatorInitException("file '" +
+                            schematronSchemaFile.getAbsolutePath() +
+                            "' does not exist");
+                }
+                if (!schematronSchemaFile.isFile()) {
+                    throw new CMDIValidatorInitException("file '" +
+                            schematronSchemaFile.getAbsolutePath() +
+                            "' is not a regular file");
+                }
+                if (!schematronSchemaFile.canRead()) {
+                    throw new CMDIValidatorInitException("file '" +
+                            schematronSchemaFile.getAbsolutePath() +
+                            "' cannot be read");
+                }
+                try {
+                    schema = schematronSchemaFile.toURI().toURL();
+                } catch (MalformedURLException e) {
+                    throw new CMDIValidatorInitException("internal error", e);
+                }
+            } else {
+                schema = this.getClass().getResource(DEFAULT_SCHEMATRON_SCHEMA);
+                if (schema == null) {
+                    throw new CMDIValidatorInitException(
+                            "cannot locate bundled Schematron schema: " +
+                                    DEFAULT_SCHEMATRON_SCHEMA);
+                }
             }
             final XsltCompiler compiler = processor.newXsltCompiler();
@@ -132 +160 @@
 
     public static CMDIValidatorFactory newInstance(File cacheDircetory,
-            boolean disableSchematron) throws CMDIValidatorInitException {
-        return new CMDIValidatorFactory(cacheDircetory, disableSchematron);
+            File schematronSchemaFile, boolean disableSchematron)
+            throws CMDIValidatorInitException {
+        return new CMDIValidatorFactory(cacheDircetory, schematronSchemaFile,
+                disableSchematron);
     }
 
@@ -139 +169 @@
     public static CMDIValidatorFactory newInstance()
             throws CMDIValidatorInitException {
-        return new CMDIValidatorFactory(null, false);
+        return new CMDIValidatorFactory(null, null, false);
     }
 

CMDIValidator/trunk/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java

@@ -45 +45 @@
     private static final char OPT_NO_THREADS            = 'T';
     private static final char OPT_NO_ESTIMATE           = 'E';
-    private static final char OPT_SCHEMA_CACHE_DIR      = 'C';
+    private static final char OPT_SCHEMA_CACHE_DIR      = 'c';
     private static final char OPT_NO_SCHEMATRON         = 'S';
     private static final char OPT_SCHEMATRON_FILE       = 's';
@@ -65 +65 @@
         File schemaCacheDir       = null;
         boolean disableSchematron = false;
+        File schematronFile       = null;
 
         /*
@@ -120 +121 @@
                 String dir = line.getOptionValue(OPT_SCHEMA_CACHE_DIR);
                 if ((dir == null) || dir.isEmpty()) {
-                    throw new ParseException("invalid argument for -S");
+                    throw new ParseException("invalid argument for -" +
+                            OPT_SCHEMA_CACHE_DIR);
                 }
                 schemaCacheDir = new File(dir);
@@ -126 +128 @@
             if (line.hasOption(OPT_NO_SCHEMATRON)) {
                 disableSchematron = true;
+            }
+            if (line.hasOption(OPT_SCHEMATRON_FILE)) {
+                String name = line.getOptionValue(OPT_SCHEMATRON_FILE);
+                if ((name == null) || name.isEmpty()) {
+                    throw new ParseException("invalid argument for -" +
+                            OPT_SCHEMATRON_FILE);
+                }
+                schematronFile = new File(name);
             }
 
@@ -157 +167 @@
                     logger.info("using schema cache directory: {}", schemaCacheDir);
                 }
+                if (schematronFile != null) {
+                    logger.info("using Schematron schema from file: {}", schematronFile);
+                }
                 final CMDIValidatorFactory factory =
                         CMDIValidatorFactory.newInstance(schemaCacheDir,
-                                disableSchematron);
+                                schematronFile, disableSchematron);
 
                 /*
@@ -340 +353 @@
                 .withLongOpt("no-schematron")
                 .create(OPT_NO_SCHEMATRON));
-//        g3.addOption(OptionBuilder
-//                .withDescription("load Schematron validator rules from file")
-//                .hasArg()
-//                .withArgName("FILE")
-//                .withLongOpt("schematron-file")
-//                .create(OPT_SCHEMATRON_FILE));
+        g3.addOption(OptionBuilder
+                .withDescription("load Schematron schema from file")
+                .hasArg()
+                .withArgName("FILE")
+                .withLongOpt("schematron-file")
+                .create(OPT_SCHEMATRON_FILE));
         options.addOptionGroup(g3);
         return options;