Changeset 2946 for SRUClient

Timestamp:

05/28/13 13:39:34 (11 years ago)

Author:

oschonef

Message:

• (revert) remove version argument from SRURecordDataParser parse() method
• re-factor and specialize SRUExplainRecordDataParser

Location:

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

Files:

• SRUExplainRecordDataParser.java (modified) (2 diffs)
• SRURecordDataParser.java (modified) (2 diffs)
• SRUSimpleClient.java (modified) (3 diffs)
• fcs/ClarinFCSRecordParser.java (modified) (2 diffs)

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

@@ -35 +35 @@
  * @see <a href="http://zeerex.z3950.org/dtd/">The ZeeRex DTD</a>
  */
-public class SRUExplainRecordDataParser implements SRURecordDataParser {
-    static final String ZEEREX_NS       = SRUExplainRecordData.RECORD_SCHEMA;
-    static final String ZEEREX_NS_QUIRK = "http://explain.z3950.org/dtd/2.1/";
+class SRUExplainRecordDataParser {
+    private static final String ZEEREX_NS       =
+            SRUExplainRecordData.RECORD_SCHEMA;
+    private static final String ZEEREX_NS_QUIRK =
+            "http://explain.z3950.org/dtd/2.1/";
     private static final String VERSION_1_1     = "1.1";
     private static final String VERSION_1_2     = "1.2";
@@ -45 +47 @@
             LoggerFactory.getLogger(SRUExplainRecordDataParser.class);
 
-    @Override
-    public String getRecordSchema() {
-        return SRUExplainRecordData.RECORD_SCHEMA;
-    }
-
-
-    @Override
-    public SRURecordData parse(final XMLStreamReader reader, SRUVersion version)
-            throws XMLStreamException, SRUClientException {
-        logger.debug("parsing explain record data for version {}", version);
+
+    public SRURecordData parse(XMLStreamReader reader,
+            SRUVersion version, String recordSchema) throws XMLStreamException,
+            SRUClientException {
+        // sanity check, if we are dealing with the expected record schema
+        if (!(ZEEREX_NS.equals(recordSchema) ||
+                ZEEREX_NS_QUIRK.equals(recordSchema))) {
+            throw new SRUClientException("record schema '" + recordSchema +
+                    "' not supported in explain response record data");
+        }
+
+        logger.debug("parsing explain record data (version={} schema={})",
+                version, recordSchema);
 
         // explain

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

@@ -39 +39 @@
      * @param reader
      *            a {@link XMLStreamReader} to parse the record data
-     * @param version
-     *            the {@link SRUVersion} that was used to encode the record
      * @return the parsed record
      * @throws XMLStreamException
@@ -48 +46 @@
      * @see SRURecordData
      */
-    public SRURecordData parse(XMLStreamReader reader, SRUVersion version)
+    public SRURecordData parse(XMLStreamReader reader)
             throws XMLStreamException, SRUClientException;
 

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

@@ -496 +496 @@
 
         // FIXME: ship explain record data for now
-//        doParseExplainResponse(reader, request, handler, true);
-        doParseExplainResponse(reader, request, handler, false);
+        doParseExplainResponse(reader, request, handler, true);
+//        doParseExplainResponse(reader, request, handler, false);
     }
 
@@ -556 +556 @@
                 }
 
-                /*
-                 * Hard-coded record schema identifiers for explain
-                 */
-                if (!(SRUExplainRecordDataParser.ZEEREX_NS.equals(schema) ||
-                      SRUExplainRecordDataParser.ZEEREX_NS_QUIRK.equals(schema))) {
-                    throw new SRUClientException("record schema '" + schema +
-                            "' not supported in explain response");
-                }
-
                 try {
                     proxy.reset(recordReader);
-                    recordData = explainRecordParser.parse(proxy, version);
+                    /*
+                     * Try to parse explain record data with explain record
+                     * parser. It will throw an exception, if it cannot handle
+                     * the data.
+                     */
+                    recordData =
+                            explainRecordParser.parse(proxy, version, schema);
                 } catch (XMLStreamException e) {
                     throw new SRUClientException(
@@ -1024 +1021 @@
                                     try {
                                         proxy.reset(recordReader);
-                                        recordData =
-                                                parser.parse(proxy, version);
+                                        recordData = parser.parse(proxy);
                                     } catch (XMLStreamException e) {
                                         throw new SRUClientException(

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

@@ -27 +27 @@
 import eu.clarin.sru.client.SRURecordData;
 import eu.clarin.sru.client.SRURecordDataParser;
-import eu.clarin.sru.client.SRUVersion;
 import eu.clarin.sru.client.XmlStreamReaderUtils;
 
@@ -54 +53 @@
 
     @Override
-    public SRURecordData parse(XMLStreamReader reader, SRUVersion version)
+    public SRURecordData parse(XMLStreamReader reader)
             throws XMLStreamException, SRUClientException {
         logger.debug("parsing CLARIN-FCS record");