You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by bu...@apache.org on 2004/08/06 03:22:13 UTC
cvs commit: jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate FeedLocator.java LinkLocator.java ProbeLocator.java
burton 2004/08/05 18:22:12
Modified: feedparser/src/java/org/apache/commons/feedparser/locate
FeedLocator.java LinkLocator.java ProbeLocator.java
Log:
Roller blogs supported as well as better support for junk templates and Radio weblogs
Revision Changes Path
1.11 +4 -1 jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/FeedLocator.java
Index: FeedLocator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/FeedLocator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FeedLocator.java 6 Aug 2004 01:13:29 -0000 1.10
+++ FeedLocator.java 6 Aug 2004 01:22:12 -0000 1.11
@@ -81,8 +81,11 @@
//This should find http://www.electoral-vote.com/index.rss
//String resource = "http://brendonwilson.com/";
- String resource = "file:///projects/feedparser/tests/locate4.html";
+ //String resource = "file:///projects/feedparser/tests/locate4.html";
+ String resource = "file:///projects/feedparser/tests/locate5.html";
+ //String resource = "http://blogs.sun.com/roller/page/gonzo";
+
//String resource = "http://www.corante.com/strange/";
//String resource = "http://peerfear.org";
1.5 +14 -3 jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/LinkLocator.java
Index: LinkLocator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/LinkLocator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkLocator.java 6 Aug 2004 01:12:12 -0000 1.4
+++ LinkLocator.java 6 Aug 2004 01:22:12 -0000 1.5
@@ -75,8 +75,6 @@
String current = ResourceExpander.expand( resource, href );
- System.out.println( " FIXME: (debug): current: " + current );
-
if ( current == null )
return true; //obviously not
@@ -109,7 +107,20 @@
//FIXME: we should assert tha that these feeds are from the SAME
//domain not a link to another feed.
- if ( current.endsWith( ".rss" ) ) {
+ boolean isRSSLink = current.endsWith( ".rss" );
+
+ //support ROLLER RSS links and explicit link discovery by
+ //non-extensions.
+ if ( isRSSLink == false ) {
+
+ isRSSLink =
+ title != null &&
+ title.equalsIgnoreCase( "rss" ) &&
+ href.indexOf( "rss" ) != -1;
+
+ }
+
+ if ( isRSSLink ) {
//this is an RSS feed.
FeedReference ref = new FeedReference( current,
1.6 +15 -5 jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java
Index: ProbeLocator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProbeLocator.java 6 Aug 2004 01:13:29 -0000 1.5
+++ ProbeLocator.java 6 Aug 2004 01:22:12 -0000 1.6
@@ -29,7 +29,7 @@
*/
public class ProbeLocator {
- static HashMap atomProbeMapping = new HashMap();
+ static HashMap probeMapping = new HashMap();
static {
@@ -45,8 +45,18 @@
// /index.rdf (for moveable type blogs
//FIXME: Live Journal has both FOAF and Atom... We need support for BOTH
- atomProbeMapping.put( "blogspot.com", "/atom.xml" );
- atomProbeMapping.put( "livejournal.com", "/data/atom" );
+ probeMapping.put( "blogspot.com", "/atom.xml" );
+ probeMapping.put( "livejournal.com", "/data/atom" );
+
+ // http://blogs.sun.com/gonzo
+ //
+ // maps to
+ //
+ // http://blogs.sun.com/roller/rss/gonzo
+ //
+ // but we can't support it JUST yet.
+
+ //probeMapping.put( "livejournal.com", "/data/atom" );
}
@@ -61,9 +71,9 @@
String domain = ResourceExpander.getDomain( resource );
- if ( atomProbeMapping.containsKey( domain ) ) {
+ if ( probeMapping.containsKey( domain ) ) {
- String mapping = (String)atomProbeMapping.get( domain );
+ String mapping = (String)probeMapping.get( domain );
String href = resource;
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org