You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by cl...@apache.org on 2006/12/13 00:07:38 UTC
svn commit: r486401 -
/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetManagerImpl.java
Author: clr
Date: Tue Dec 12 15:07:38 2006
New Revision: 486401
URL: http://svn.apache.org/viewvc?view=rev&rev=486401
Log:
Datamapper updates
Modified:
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetManagerImpl.java
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetManagerImpl.java?view=diff&rev=486401&r1=486400&r2=486401
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetManagerImpl.java (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetManagerImpl.java Tue Dec 12 15:07:38 2006
@@ -48,7 +48,7 @@
import org.apache.roller.planet.pojos.PlanetEntryData;
import org.apache.roller.planet.pojos.PlanetGroupData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
-import org.apache.roller.util.rome.DiskFeedInfoCache;
+import org.apache.roller.planet.util.rome.DiskFeedInfoCache;
/**
@@ -409,7 +409,7 @@
FeedFetcher feedFetcher,
FeedFetcherCache feedInfoCache)
throws RollerException {
-
+
Set newEntries = new TreeSet();
SyndFeed feed = null;
URL feedURL = null;
@@ -436,10 +436,10 @@
if (lastUpdated!=null && sub.getLastUpdated()!=null) {
Calendar feedCal = Calendar.getInstance();
feedCal.setTime(lastUpdated);
-
+
Calendar subCal = Calendar.getInstance();
subCal.setTime(sub.getLastUpdated());
-
+
if (!feedCal.after(subCal)) {
if (log.isDebugEnabled()) {
String msg = MessageFormat.format(
@@ -455,9 +455,9 @@
sub.setLastUpdated(feed.getPublishedDate());
// saving sub here causes detachment issues, so we save it later
}
-
- // Horrible kludge for Feeds without entry dates: most recent entry is
- // given feed's last publish date (or yesterday if none exists) and
+
+ // Horrible kludge for Feeds without entry dates: most recent entry is
+ // given feed's last publish date (or yesterday if none exists) and
// earler entries are placed at once day intervals before that.
Calendar cal = Calendar.getInstance();
if (sub.getLastUpdated() != null) {
@@ -466,7 +466,7 @@
cal.setTime(new Date());
cal.add(Calendar.DATE, -1);
}
-
+
// Populate subscription object with new entries
Iterator entries = feed.getEntries().iterator();
while (entries.hasNext()) {
@@ -474,11 +474,9 @@
SyndEntry romeEntry = (SyndEntry) entries.next();
PlanetEntryData entry =
new PlanetEntryData(feed, romeEntry, sub);
- log.debug("Entry title=" + entry.getTitle() +
- " content size=" + entry.getContent().length());
+ log.debug("Entry title=" + entry.getTitle() + " content size=" + entry.getContent().length());
if (entry.getPubTime() == null) {
- log.debug("No published date, assigning fake date for " +
- feedURL);
+ log.debug("No published date, assigning fake date for "+feedURL);
entry.setPubTime(new Timestamp(cal.getTimeInMillis()));
}
if (entry.getPermalink() == null) {