projects
/
pnews.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduce log level
[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
ddec874
..
9095526
100644
(file)
--- a/
war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/
war/src/main/java/pnews/servlet/ArticleProvider.java
@@
-98,13
+98,18
@@
public class ArticleProvider {
private void addArticles(Category cat, SyndFeed feed) {
String thumbnail;
private void addArticles(Category cat, SyndFeed feed) {
String thumbnail;
- String desc, link, title, feedTitle;
+ String desc, link, title, feedTitle
, feedImage
;
Date date;
List<Article> articles;
boolean exist;
feedTitle = feed.getTitle().trim();
Date date;
List<Article> articles;
boolean exist;
feedTitle = feed.getTitle().trim();
+ if (feed.getImage() != null)
+ feedImage = feed.getImage().getUrl();
+ else
+ feedImage = null;
+
LOG.info("addArticles " + cat.getId() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
for (SyndEntry entry: feed.getEntries()) {
LOG.info("addArticles " + cat.getId() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
for (SyndEntry entry: feed.getEntries()) {
@@
-114,6
+119,8
@@
public class ArticleProvider {
thumbnail = e.getUrl();
break;
}
thumbnail = e.getUrl();
break;
}
+ if (thumbnail == null)
+ thumbnail = feedImage;
title = entry.getTitle().trim();
title = entry.getTitle().trim();
@@
-143,7
+150,7
@@
public class ArticleProvider {
} else {
for (Article a: articles)
if (a.link.equals(link)) {
} else {
for (Article a: articles)
if (a.link.equals(link)) {
- LOG.
info("addArticles " + link + "
already present");
+ LOG.
fine("addArticles " + link + " is
already present");
exist = true;
}
}
exist = true;
}
}