Use jakarta feedparser to parse RSS2 files.

[mir.git] / source / mir / producer / RSSProducerNode.java

diff --git a/source/mir/producer/RSSProducerNode.java b/source/mir/producer/RSSProducerNode.java
index fa2bef1..2d485a9 100755 (executable)
--- a/source/mir/producer/RSSProducerNode.java
+++ b/source/mir/producer/RSSProducerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -19,8 +19,6 @@
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
  * the code of this program with  any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
  * and distribute linked combinations including the two.  You must obey the
  * GNU General Public License in all respects for all of the code used other than
  * the above mentioned libraries.  If you modify this file, you may extend this
@@ -29,16 +27,16 @@
  */
 package mir.producer;
 
-import java.util.Map;
-
 import mir.log.LoggerWrapper;
 import mir.rss.RSS091Reader;
+import mir.rss.RSS2Reader;
 import mir.rss.RSSData;
 import mir.rss.RSSReader;
-import mir.util.ExceptionFunctions;
 import mir.util.ParameterExpander;
 
-public class RSSProducerNode implements ProducerNode {
+import java.util.Map;
+
+public class RSSProducerNode extends AbstractProducerNode {
   private String key;
   private String url;
   private String version;
@@ -86,11 +84,20 @@ public class RSSProducerNode implements ProducerNode {
           rssData = reader.parseUrl(expandedUrl);
         }
       }
+      else if (expandedVersion.equals("2")) {
+        RSS2Reader reader = new RSS2Reader();
+        if (expandedEncoding!=null) {
+          rssData = reader.parseUrl(expandedUrl, expandedEncoding);
+        }
+        else {
+          rssData = reader.parseUrl(expandedUrl);
+        }
+      }
+
       ParameterExpander.setValueForKey(aValueMap, expandedKey, rssData);
     }
     catch (Throwable t) {
-      Throwable s = ExceptionFunctions.traceCauseException(t);
-      aLogger.error("Error while processing RSS data: " + s.getClass().getName()+","+ s.getMessage());
+      aLogger.warn("Error while processing RSS data", t);
     }
   }
-}
\ No newline at end of file
+}