Changeset 2092

Timestamp:

08/15/12 10:22:36 (12 years ago)

Author:

oschonef

Message:

• allow generic record data parser using schema wildcard

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUClient.java (modified) (8 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUClient.java

@@ -52 +52 @@
  */
 public class SRUClient {
+    /** constant record data schema parser to match any schema */
+    public static final String RECORD_DATA_PARSER_SCHEMA_ANY = "*";
     private static final String SRU_NS =
             "http://www.loc.gov/zing/srw/";
@@ -73 +75 @@
     /**
      * Constructor.
-     * 
+     *
      * @param defaultVersion
      *            the default version to use for SRU requests; may be overridden
@@ -91 +93 @@
     /**
      * Register a record data parser.
-     * 
+     *
      * @param parser
      *            a parser instance
@@ -127 +129 @@
     /**
      * Perform a <em>explain</em> operation.
-     * 
+     *
      * @param request
      *            an instance of a {@link SRUExplainRequest} object
@@ -208 +210 @@
     /**
      * Perform a <em>scan</em> operation.
-     * 
+     *
      * @param request
      *            an instance of a {@link SRUScanRequest} object
@@ -289 +291 @@
     /**
      * Perform a <em>searchRetreive</em> operation.
-     * 
+     *
      * @param request
      *            an instance of a {@link SRUSearchRetrieveRequest} object
@@ -743 +745 @@
                             surrogate = parseDiagnostic(recordReader, true);
                         } else {
-                            SRURecordDataParser parser = parsers.get(schema);
+                            SRURecordDataParser parser = findParser(schema);
                             if (parser != null) {
                                 try {
@@ -934 +936 @@
 
 
+    private SRURecordDataParser findParser(String schema) {
+        SRURecordDataParser parser = parsers.get(schema);
+        if (parser == null) {
+            parser = parsers.get(RECORD_DATA_PARSER_SCHEMA_ANY);
+        }
+        return parser;
+    }
+
+
     private SRUXMLStreamReader createReader(InputStream in, boolean wrap)
             throws XMLStreamException {