X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FArticleProvider.java;h=e578d2a0ba8c3e5dd876e20fbbf75535af95c7a9;hb=cc188058e4ca132b48f568b22d37cef8ebc9413e;hp=d3e4f3de76dde49e3262a3e97ea94c9b86cd6938;hpb=f4a4051dca40f99db1d84e6967dafbb6b1af647d;p=pnews.git

diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java
index d3e4f3d..e578d2a 100644
--- 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.setDefaultEncoding("UTF-8");
                 
                 return new SyndFeedInput().build(r);                
         }
@@ -121,9 +120,14 @@ public class ArticleProvider {
         }
         
         private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
-                String desc, title, thumbnail;
+                String desc, title, thumbnail, feedTitle, str;
                 Date date;
                 
+                feedTitle = feed.getTitle();
+                if (feedTitle != null) {
+                        feedTitle = feedTitle.trim();
+                }
+                
                 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();
-                                                
+                             
+                
                 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;
-                        LOG.severe("No description for " + feed.getTitle() + " - " + title);
+                        LOG.severe("No description for " + feedTitle + " - " + title);
                 }
                 
                 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 " + feedTitle + " - " + title + " does not have a date");
                                      
-                return new Article(link, title, desc, thumbnail, date, title);
+                return new Article(link, title, desc, thumbnail, date, feedTitle);
         }
         
         private void addArticles(Category cat, SyndFeed feed) {