Changeset 3015 for OAIHarvester

Timestamp:

06/11/13 11:21:27 (11 years ago)

Author:

oschonef

Message:

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

Location:

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

Files:

• HarvestWorker.java (modified) (1 diff)
• Response.java (modified) (1 diff)

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

@@ -242 +242 @@
                     } else if (COMPRESSION_GZIP.equals(s)) {
                         mask |= Repository.COMPRESSION_METHOD_GZIP;
+                    } else if ("".equals(s)) {
+                        logger.warn("skipping empty <compression> element " +
+                                "in Identify response");
                     } 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 '");