Changeset 3014 for OAIHarvester

Timestamp:

06/11/13 11:09:44 (11 years ago)

Author:

oschonef

Message:

• just skip empty <compression> elements or unsupported compression methods within Identify response

Location:

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl

Files:

• HarvestWorker.java (modified) (2 diffs)
• Response.java (modified) (2 diffs)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/HarvestWorker.java

@@ -236 +236 @@
             int mask = 0;
             do {
-                s = response.readContent(OAI_NS, "compression", false);
+                s = response.readContent(OAI_NS, "compression", false, false);
                 if (s != null) {
                     if (COMPRESSION_DEFLATE.equals(s)) {
@@ -242 +242 @@
                     } else if (COMPRESSION_GZIP.equals(s)) {
                         mask |= Repository.COMPRESSION_METHOD_GZIP;
+                    } else {
+                        logger.info("ignoring unsupported compression " +
+                                "method '{}'", s);
                     }
+                } else {
+                    logger.warn("skipping empty <compression> element " +
+                            "in Identify response");
                 }
             } while (s != null);

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java

@@ -331 +331 @@
             try {
                 result = readString(contentRequired);
-                if (!contentRequired && (result == null)) {
-                    result = "";
-                }
             } catch (XMLStreamException e) {
+                e.printStackTrace();
                 StringBuilder sb = new StringBuilder();
                 sb.append("element '");
                 sb.append(new QName(namespaceURI, localName));
-                sb.append(localName).append("' may not be empty");
+                sb.append("' may not be empty");
                 throw new XMLStreamException(sb.toString(), e.getLocation());
             }
@@ -384 +382 @@
             if (s != null) {
                 sb.append(s);
+            }
+            if (!reader.hasNext()) {
+                break;
             }
             reader.next();