X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fproducer%2FRSSProducerNode.java;h=2d485a908885451b59a9bf080deb61f113d7ad41;hb=0b28407d4cbb0b1fd2f99c998192292a4a486943;hp=29ee973ece6aabaf1b495934cb75b11d951b47ad;hpb=6b6b6215ebe066b81f1fa6b0c71a532ca7b4fc3f;p=mir.git

diff --git a/source/mir/producer/RSSProducerNode.java b/source/mir/producer/RSSProducerNode.java
index 29ee973e..2d485a90 100755
--- 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,15 +27,15 @@
  */
 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.ExceptionRoutines;
 import mir.util.ParameterExpander;
 
+import java.util.Map;
+
 public class RSSProducerNode extends AbstractProducerNode {
   private String key;
   private String url;
@@ -86,10 +84,20 @@ public class RSSProducerNode extends AbstractProducerNode {
           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) {
       aLogger.warn("Error while processing RSS data", t);
     }
   }
-}
\ No newline at end of file
+}