read categories information from the configuration

[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 3e90d11..3bef20e 100644 (file)
--- a/war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/war/src/main/java/pnews/servlet/ArticleProvider.java
@@ -117,7 +117,7 @@ public class ArticleProvider {
                 
                 feedTitle = feed.getTitle().trim();
                 
-                LOG.info("addArticles " + cat.getName() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
+                LOG.info("addArticles " + cat.getLabel() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
                 
                 for (SyndEntry entry: feed.getEntries()) {
                         String link = entry.getLink().trim();
@@ -147,7 +147,7 @@ public class ArticleProvider {
                         }
                 }          
                 
-                LOG.info("addArticles done " + cat.getName());
+                LOG.info("addArticles done " + cat.getLabel());
         }
              
         private void retrieveArticles(Category cat) throws IllegalArgumentException, MalformedURLException, FeedException, IOException {
@@ -161,7 +161,7 @@ public class ArticleProvider {
                                         addArticles(cat, getSyndFeed(f.getURL()));
                                 } catch (Throwable e) {
                                         LOG.log(Level.SEVERE,
-                                                "retrieveArticles failure " + cat.getName() + " " + f.toString(),
+                                                "retrieveArticles failure " + cat.getLabel() + " " + f.toString(),
                                                 e);
                                 }
                 else
@@ -193,7 +193,7 @@ public class ArticleProvider {
                 
                 @Override
                 public void run() {                       
-                        LOG.info("refresher "+ category.getName());
+                        LOG.info("refresher "+ category.getLabel());
                         
                         try {
                                 retrieveArticles(category);
@@ -201,7 +201,7 @@ public class ArticleProvider {
                                 LOG.log(Level.SEVERE, "refresher failure", e);
                         }                        
                         
-                        LOG.info("refresher "+ category.getName() + " done");
+                        LOG.info("refresher "+ category.getLabel() + " done");
                 }                
         }
 }