projects
/
pnews.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed encoding bug
[pnews.git]
/
war
/
src
/
main
/
java
/
pnews
/
servlet
/
ArticleProvider.java
diff --git
a/war/src/main/java/pnews/servlet/ArticleProvider.java
b/war/src/main/java/pnews/servlet/ArticleProvider.java
index
d3e4f3d
..
e578d2a
100644
(file)
--- a/
war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/
war/src/main/java/pnews/servlet/ArticleProvider.java
@@
-43,7
+43,6
@@
public class ArticleProvider {
XmlReader r;
r = new XmlReader(new URL(u));
XmlReader r;
r = new XmlReader(new URL(u));
- XmlReader.setDefaultEncoding("UTF-8");
return new SyndFeedInput().build(r);
}
return new SyndFeedInput().build(r);
}
@@
-121,9
+120,14
@@
public class ArticleProvider {
}
private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
}
private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
- String desc, title, thumbnail;
+ String desc, title, thumbnail
, feedTitle, str
;
Date date;
Date date;
+ feedTitle = feed.getTitle();
+ if (feedTitle != null) {
+ feedTitle = feedTitle.trim();
+ }
+
thumbnail = null;
for (SyndEnclosure e: entry.getEnclosures()) {
if (e.getType().startsWith("image/"))
thumbnail = null;
for (SyndEnclosure e: entry.getEnclosures()) {
if (e.getType().startsWith("image/"))
@@
-133,23
+137,25
@@
public class ArticleProvider {
if (thumbnail == null && feed.getImage() != null)
thumbnail = feed.getImage().getUrl();
if (thumbnail == null && feed.getImage() != null)
thumbnail = feed.getImage().getUrl();
-
+
+
title = entry.getTitle().trim();
title = entry.getTitle().trim();
- if (entry.getDescription() != null) {
- desc = Jsoup.parse(entry.getDescription().getValue()).text();
+ if (entry.getDescription() != null) {
+ str = entry.getDescription().getValue();
+ desc = Jsoup.parse(str).text();
} else {
desc = null;
} else {
desc = null;
- LOG.severe("No description for " + feed
.getTitle()
+ " - " + title);
+ LOG.severe("No description for " + feed
Title
+ " - " + title);
}
date = entry.getPublishedDate();
if (date == null)
date = entry.getUpdatedDate();
if (date == null)
}
date = entry.getPublishedDate();
if (date == null)
date = entry.getUpdatedDate();
if (date == null)
- LOG.severe("The article " + feed
.getTitle()
+ " - " + title + " does not have a date");
+ LOG.severe("The article " + feed
Title
+ " - " + title + " does not have a date");
- return new Article(link, title, desc, thumbnail, date,
t
itle);
+ return new Article(link, title, desc, thumbnail, date,
feedT
itle);
}
private void addArticles(Category cat, SyndFeed feed) {
}
private void addArticles(Category cat, SyndFeed feed) {