tried to make last_modified recognition smarter

yacy · May 21, 2014 · 53948da · 53948da
1 parent 2d03037
commit 53948da
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/source/net/yacy/cora/protocol/HeaderFramework.java b/source/net/yacy/cora/protocol/HeaderFramework.java
@@ -492,7 +492,7 @@ public String getContentType() {
     protected Date headerDate(final String kind) {
         if (containsKey(kind)) {
             Date parsedDate = parseHTTPDate(get(kind));
-            if (parsedDate == null) parsedDate = new Date();
+            if (parsedDate == null) return null;
             return parsedDate;
         }
         return null;

diff --git a/source/net/yacy/cora/protocol/ResponseHeader.java b/source/net/yacy/cora/protocol/ResponseHeader.java
@@ -84,7 +84,8 @@ public Date expires() {
 
     public Date lastModified() {
         if (this.date_cache_LastModified != null) return this.date_cache_LastModified;
-        final Date d = headerDate(HeaderFramework.LAST_MODIFIED);
+        Date d = headerDate(HeaderFramework.LAST_MODIFIED);
+        if (d == null) d = date();
         final Date now = new Date();
         this.date_cache_LastModified = (d == null) ? date() : d.after(now) ? now : d;
         return this.date_cache_LastModified;

diff --git a/source/net/yacy/search/index/Segment.java b/source/net/yacy/search/index/Segment.java
@@ -529,6 +529,7 @@ public SolrInputDocument storeDocument(
 
         // STORE URL TO LOADED-URL-DB
         Date modDate = responseHeader == null ? new Date() : responseHeader.lastModified();
+        if (modDate == null) modDate = new Date();
         if (modDate.getTime() > loadDate.getTime()) modDate = loadDate;
         char docType = Response.docType(document.dc_format());
 

diff --git a/source/net/yacy/search/schema/CollectionConfiguration.java b/source/net/yacy/search/schema/CollectionConfiguration.java
@@ -468,6 +468,7 @@ public SolrVector yacy2solr(
         if (allAttr || contains(CollectionSchema.content_type)) add(doc, CollectionSchema.content_type, new String[]{document.dc_format()});
         if (allAttr || contains(CollectionSchema.last_modified)) {
             Date lastModified = responseHeader == null ? new Date() : responseHeader.lastModified();
+            if (lastModified == null) lastModified = new Date();
             if (document.getDate().before(lastModified)) lastModified = document.getDate();
             add(doc, CollectionSchema.last_modified, lastModified);
         }