Changeset 5394 for CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java

Timestamp:

06/26/14 22:58:39 (10 years ago)

Author:

Oliver Schonefeld

Message:

• increased raw parsing performance by making Saxon use the Xerces-J SAX parser
• use XQuery for Schematron report processing
• report line and column numbers for Schematron validation

File:

• CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java (modified) (12 diffs)

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java

@@ -22 +22 @@
 
 import org.apache.http.HttpStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import net.sf.saxon.s9api.SaxonApiException;
 import net.sf.saxon.s9api.XPathCompiler;
@@ -36 +33 @@
 import eu.clarin.cmdi.validator.CMDIValidatorWriteableResult;
 import eu.clarin.cmdi.validator.utils.HandleResolver;
+import eu.clarin.cmdi.validator.utils.SaxonLocationUtils;
 
 public class CheckHandlesExtension extends CMDIValidatorExtension {
-    private static final String XPATH = "//*:ResourceProxy[*:ResourceType/text() = 'Resource' or *:ResourceType/text() = 'Metadata']/*:ResourceRef/text()";
+    private static final String XPATH = "//*:ResourceProxy[*:ResourceType/text() = 'Resource' or *:ResourceType/text() = 'Metadata']/*:ResourceRef";
     private static final String HDL_SCHEME = "hdl";
     private static final String HDL_PROXY_HTTP = "http";
@@ -44 +42 @@
     private static final String HDL_PROXY_HOST = "hdl.handle.net";
     private static final String URN_SCHEME = "urn";
-    @SuppressWarnings("unused")
-    private static final Logger logger =
-            LoggerFactory.getLogger(CheckHandlesExtension.class);
     private final boolean resolveHandles;
     private HandleResolver resolver = null;
@@ -91 +86 @@
             for (XdmItem item : selector) {
                 String handle = null;
+                final int line   = SaxonLocationUtils.getLineNumber(item);
+                final int column = SaxonLocationUtils.getColumnNumber(item);
                 final String h = item.getStringValue();
                 if (h != null) {
@@ -98 +95 @@
                     } else {
                         if (!handle.equals(h)) {
-                            result.reportWarning(-1, -1, "handle '" + h +
+                            result.reportWarning(line, column, "handle '" + h +
                                     "' contains leading or tailing spaces " +
                                     "within <ResourceRef> element");
@@ -106 +103 @@
 
                 if (handle != null) {
-                    checkHandleURISyntax(handle, result);
-                } else {
-                    result.reportError(-1, -1,
+                    checkHandleURISyntax(handle, result, line, column);
+                } else {
+                    result.reportError(line, column,
                             "invalid handle (<ResourceRef> was empty)");
                 }
@@ -119 +116 @@
 
     private void checkHandleURISyntax(String handle,
-            CMDIValidatorWriteableResult result) throws CMDIValidatorException {
+            CMDIValidatorWriteableResult result, int line, int column)
+            throws CMDIValidatorException {
         try {
             final URI uri = new URI(handle);
@@ -130 +128 @@
                     final URI actionableURI =
                             new URI(HDL_PROXY_HTTP, HDL_PROXY_HOST, path, null);
-                    checkHandleResolves(actionableURI, result);
+                    checkHandleResolves(actionableURI, result, line, column);
                 } catch (URISyntaxException e) {
                     /* should not happen */
@@ -138 +136 @@
             } else if (URN_SCHEME.equals(uri.getScheme())) {
                 if (resolveHandles) {
-                    result.reportInfo(-1, -1, "PID '" + handle +
+                    result.reportInfo(line, column, "PID '" + handle +
                             "' skipped, because URN resolving is not supported");
                 } else {
-                    result.reportInfo(-1, -1, "PID '" + handle +
+                    result.reportInfo(line, column, "PID '" + handle +
                             "' skipped, because URN sytax checking is not supported");
                 }
@@ -148 +146 @@
                 if (uri.getHost() != null) {
                     if (!HDL_PROXY_HOST.equalsIgnoreCase(uri.getHost())) {
-                        result.reportError(-1, -1,
+                        result.reportError(line, column,
                                 "The URI of PID '" + handle +
                                 "' contains an unexpected host part of '" +
                                 uri.getHost() + "'");
                     }
-                    checkHandleResolves(uri, result);
-                } else {
-                    result.reportError(-1, -1, "The URI of PID '" + handle +
-                            "' is missing the host part");
+                    checkHandleResolves(uri, result, line, column);
+                } else {
+                    result.reportError(line, column, "The URI of PID '" +
+                            handle + "' is missing the host part");
                 }
             } else {
                 if (uri.getScheme() != null) {
-                    result.reportError(-1, -1,
+                    result.reportError(line, column,
                             "The URI of PID '" + handle +
                             "' contains an unexpected schema part of '" +
                             uri.getScheme() + "'");
                 } else {
-                    result.reportError(-1, -1, "The URI of PID '" + handle +
-                            "' is missing a proper schema part");
+                    result.reportError(line, column, "The URI of PID '" +
+                            handle + "' is missing a proper schema part");
                 }
             }
         } catch (URISyntaxException e) {
-            result.reportError(-1, -1, "PID '" + handle +
+            result.reportError(line, column, "PID '" + handle +
                     "' is not a well-formed URI: " + e.getMessage());
         }
@@ -177 +175 @@
 
     private void checkHandleResolves(URI uri,
-            CMDIValidatorWriteableResult result) throws CMDIValidatorException {
+            CMDIValidatorWriteableResult result, int line, int column)
+            throws CMDIValidatorException {
         if (resolver != null) {
             try {
@@ -188 +187 @@
                     /* FALL-THROUGH */
                 case HttpStatus.SC_FORBIDDEN:
-                    result.reportInfo(-1, -1, "PID '" + uri +
+                    result.reportInfo(line, column, "PID '" + uri +
                             "' resolved to an access protected resource (" +
                             code + ")");
                     break;
                 case HttpStatus.SC_NOT_FOUND:
-                    result.reportError(-1, -1, "PID '" + uri +
-                            "' resolved to an non-existing resource (" + code +
-                            ")");
+                    result.reportError(line, column, "PID '" + uri +
+                            "' resolved to an non-existing resource (" +
+                            code + ")");
                     break;
                 case HandleResolver.TIMEOUT:
-                    result.reportWarning(-1, -1, "Timeout while resolving PID '" +
-                            uri + "'");
+                    result.reportWarning(line, column,
+                            "Timeout while resolving PID '" + uri + "'");
                     break;
                 case HandleResolver.UNKNOWN_HOST:
-                    result.reportWarning(-1, -1, "Unable to resolve host '" +
-                            uri.getHost() + "' while resolving PID '" +
-                            uri + "'");
+                    result.reportWarning(line, column,
+                            "Unable to resolve host '" + uri.getHost() +
+                            "' while resolving PID '" + uri + "'");
                     break;
                 case HandleResolver.ERROR:
-                    result.reportWarning(-1, -1,
+                    result.reportWarning(line, column,
                             "An error occurred while resolving PID '" +
                             uri + "'");
                     break;
                 default:
-                    result.reportWarning(-1, -1, "PID '" + uri +
-                            "' resolved with an unexpected result (" + code +
-                            ")");
+                    result.reportWarning(-line, column, "PID '" + uri +
+                            "' resolved with an unexpected result (" +
+                            code + ")");
                     break;
                 } // switch