projects
/
pnews.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve image build
[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
c6cad50
..
5e7d429
100644
(file)
--- a/
war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/
war/src/main/java/pnews/servlet/ArticleProvider.java
@@
-120,10
+120,14
@@
public class ArticleProvider {
return false;
}
return false;
}
- private
Article toArticle(String link, Category cat
, SyndEntry entry, SyndFeed feed) {
- String desc, title, thumbnail;
+ private
static Article toArticle(String link
, SyndEntry entry, SyndFeed feed) {
+ String desc, title, thumbnail
, feedTitle
;
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/"))
@@
-140,20
+144,20
@@
public class ArticleProvider {
desc = Jsoup.parse(entry.getDescription().getValue()).text();
} else {
desc = null;
desc = Jsoup.parse(entry.getDescription().getValue()).text();
} 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) {
- String
link,
feedTitle;
+ String feedTitle;
List<Article> articles;
Article a;
List<Article> articles;
Article a;
@@
-162,14
+166,14
@@
public class ArticleProvider {
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()) {
- link = entry.getLink().trim();
+
String
link = entry.getLink().trim();
articles = getArticlesForUpdate(cat);
if (exists(link, articles)) {
LOG.fine("addArticles " + link + " is already present");
continue ;
}
articles = getArticlesForUpdate(cat);
if (exists(link, articles)) {
LOG.fine("addArticles " + link + " is already present");
continue ;
}
- a =
toArticle(link, cat, entry, feed);
+ a =
ArticleStore.singleton.getArticle(link, ()->toArticle(link, entry, feed));
synchronized (articles) {
articles.add(a);
synchronized (articles) {
articles.add(a);
@@
-185,14
+189,13
@@
public class ArticleProvider {
return -1;
return o2.publicationDate.compareTo(o1.publicationDate);
}
return -1;
return o2.publicationDate.compareTo(o1.publicationDate);
}
-
});
}
}
LOG.info("addArticles done " + cat.getId());
}
});
}
}
LOG.info("addArticles done " + cat.getId());
}
-
+
private void retrieveArticles(Category cat) throws IllegalArgumentException, MalformedURLException, FeedException, IOException {
String[] feeds;
private void retrieveArticles(Category cat) throws IllegalArgumentException, MalformedURLException, FeedException, IOException {
String[] feeds;