boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

a test with http://validator.w3.org/feed/#validate_by_input shows that

Browse Source 
the time format was wrong; we must use RFC-822
pull/1/head
Michael Peter Christen 10 years ago
parent 8cafdb989a
commit b07afbc115
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File

9
source/net/yacy/cora/document/feed/RSSMessage.java
Unescape View File

@ -36,7 +36,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.date.GenericFormatter;
import net.yacy.cora.date.ISO8601Formatter;
import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.lod.vocabulary.DublinCore; import net.yacy.cora.lod.vocabulary.DublinCore;
import net.yacy.cora.lod.vocabulary.Geo; import net.yacy.cora.lod.vocabulary.Geo;
@ -121,7 +120,7 @@ public class RSSMessage implements Hit, Comparable<RSSMessage>, Comparator<RSSMe
if (title.length() > 0) this.map.put(Token.title.name(), title); if (title.length() > 0) this.map.put(Token.title.name(), title);
if (description.length() > 0) this.map.put(Token.description.name(), description); if (description.length() > 0) this.map.put(Token.description.name(), description);
if (link.length() > 0) this.map.put(Token.link.name(), link); if (link.length() > 0) this.map.put(Token.link.name(), link);
this.map.put(Token.pubDate.name(), ISO8601Formatter.FORMATTER.format()); this.map.put(Token.pubDate.name(), HeaderFramework.FORMAT_RFC1123.format(new Date()));
this.map.put(Token.guid.name(), artificialGuidPrefix + Integer.toHexString((title + description + link).hashCode())); this.map.put(Token.guid.name(), artificialGuidPrefix + Integer.toHexString((title + description + link).hashCode()));
} }
@ -130,7 +129,7 @@ public class RSSMessage implements Hit, Comparable<RSSMessage>, Comparator<RSSMe
if (title.length() > 0) this.map.put(Token.title.name(), title); if (title.length() > 0) this.map.put(Token.title.name(), title);
if (description.length() > 0) this.map.put(Token.description.name(), description); if (description.length() > 0) this.map.put(Token.description.name(), description);
this.map.put(Token.link.name(), link.toNormalform(true)); this.map.put(Token.link.name(), link.toNormalform(true));
this.map.put(Token.pubDate.name(), ISO8601Formatter.FORMATTER.format()); this.map.put(Token.pubDate.name(), HeaderFramework.FORMAT_RFC1123.format(new Date()));
if (guid.length() > 0) this.map.put(Token.guid.name(), guid); if (guid.length() > 0) this.map.put(Token.guid.name(), guid);
} }
@ -218,7 +217,7 @@ public class RSSMessage implements Hit, Comparable<RSSMessage>, Comparator<RSSMe
final String dateString = Token.pubDate.valueFrom(this.map, ""); final String dateString = Token.pubDate.valueFrom(this.map, "");
Date date; Date date;
try { try {
date = ISO8601Formatter.FORMATTER.parse(dateString); date = HeaderFramework.FORMAT_RFC1123.parse(dateString);
} catch (final ParseException e) { } catch (final ParseException e) {
try { try {
date = GenericFormatter.SHORT_SECOND_FORMATTER.parse(dateString); date = GenericFormatter.SHORT_SECOND_FORMATTER.parse(dateString);
@ -338,7 +337,7 @@ public class RSSMessage implements Hit, Comparable<RSSMessage>, Comparator<RSSMe
@Override @Override
public void setPubDate(final Date pubdate) { public void setPubDate(final Date pubdate) {
setValue(Token.pubDate, ISO8601Formatter.FORMATTER.format(pubdate)); setValue(Token.pubDate, HeaderFramework.FORMAT_RFC1123.format(pubdate));
} }
@Override @Override

8
source/net/yacy/cora/protocol/HeaderFramework.java
Unescape View File

@ -251,10 +251,10 @@ public class HeaderFramework extends TreeMap<String, String> implements Map<Stri
private static final String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz"; private static final String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz";
private static final String PATTERN_ANSIC = "EEE MMM d HH:mm:ss yyyy"; private static final String PATTERN_ANSIC = "EEE MMM d HH:mm:ss yyyy";
private static final String PATTERN_GSAFS = "yyyy-MM-dd"; private static final String PATTERN_GSAFS = "yyyy-MM-dd";
private static final SimpleDateFormat FORMAT_RFC1123 = new SimpleDateFormat(PATTERN_RFC1123, Locale.US); public static final SimpleDateFormat FORMAT_RFC1123 = new SimpleDateFormat(PATTERN_RFC1123, Locale.US);
private static final SimpleDateFormat FORMAT_RFC1036 = new SimpleDateFormat(PATTERN_RFC1036, Locale.US); public static final SimpleDateFormat FORMAT_RFC1036 = new SimpleDateFormat(PATTERN_RFC1036, Locale.US);
private static final SimpleDateFormat FORMAT_ANSIC = new SimpleDateFormat(PATTERN_ANSIC, Locale.US); public static final SimpleDateFormat FORMAT_ANSIC = new SimpleDateFormat(PATTERN_ANSIC, Locale.US);
private static final SimpleDateFormat FORMAT_GSAFS = new SimpleDateFormat(PATTERN_GSAFS, Locale.US); public static final SimpleDateFormat FORMAT_GSAFS = new SimpleDateFormat(PATTERN_GSAFS, Locale.US);
private static final TimeZone TZ_GMT = TimeZone.getTimeZone("GMT"); private static final TimeZone TZ_GMT = TimeZone.getTimeZone("GMT");
private static final Calendar CAL_GMT = Calendar.getInstance(TZ_GMT, Locale.US); private static final Calendar CAL_GMT = Calendar.getInstance(TZ_GMT, Locale.US);

Write Preview
Loading…
Cancel
Save