You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/27 22:48:33 UTC
svn commit: r468536 - in
/incubator/roller/trunk/src/org/apache/roller/planet:
business/PlanetManager.java
business/hibernate/HibernatePlanetManagerImpl.java
tasks/RefreshEntriesTask.java
Author: snoopdave
Date: Fri Oct 27 13:48:32 2006
New Revision: 468536
URL: http://svn.apache.org/viewvc?view=rev&rev=468536
Log:
Final Roller-Planet changes, use config for cache dir not POJO
Modified:
incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java
incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java
Modified: incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java?view=diff&rev=468536&r1=468535&r2=468536
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/PlanetManager.java Fri Oct 27 13:48:32 2006
@@ -154,7 +154,7 @@
//------------------------------------------------------------------ update
/** Refresh entry data by fetching and parsing feeds. */
- public void refreshEntries() throws RollerException;
+ public void refreshEntries(String cacheDirPath) throws RollerException;
//------------------------------------------------------------------ delete
Modified: incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=468536&r1=468535&r2=468536
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Fri Oct 27 13:48:32 2006
@@ -287,7 +287,7 @@
if (group != null) {
StringBuffer sb = new StringBuffer();
- sb.append("select e from org.apache.roller.planet.pojos.PlanetEntryData e ");
+ sb.append("select distinct e from org.apache.roller.planet.pojos.PlanetEntryData e ");
sb.append("join e.subscription.groups g ");
sb.append("where g.handle=:groupHandle and e.pubTime < :endDate ");
if (startDate != null) {
@@ -305,7 +305,7 @@
ret = query.list();
} else {
StringBuffer sb = new StringBuffer();
- sb.append("select e from org.apache.roller.planet.pojos.PlanetEntryData e ");
+ sb.append("select distinct e from org.apache.roller.planet.pojos.PlanetEntryData e ");
sb.append("join e.subscription.groups g ");
sb.append("where (g.handle='external' or g.handle='all') ");
sb.append("and e.pubTime < :endDate ");
@@ -354,20 +354,20 @@
return (Date)lastUpdatedByGroup.get(group);
}
- public void refreshEntries() throws RollerException {
+ public void refreshEntries(String cacheDirPath) throws RollerException {
Date now = new Date();
long startTime = System.currentTimeMillis();
PlanetConfigData config = getConfiguration();
// can't continue without cache dir
- if (config == null || config.getCacheDir() == null) {
+ if (cacheDirPath == null) {
log.warn("Planet cache directory not set, aborting refresh");
return;
}
// allow ${user.home} in cache dir property
- String cacheDirName = config.getCacheDir().replaceFirst(
+ String cacheDirName = cacheDirPath.replaceFirst(
"\\$\\{user.home}",System.getProperty("user.home"));
// allow ${catalina.home} in cache dir property
@@ -514,9 +514,9 @@
SyndEntry romeEntry = (SyndEntry) entries.next();
PlanetEntryData entry =
new PlanetEntryData(feed, romeEntry, sub);
+ 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) {
Modified: incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java?view=diff&rev=468536&r1=468535&r2=468536
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java Fri Oct 27 13:48:32 2006
@@ -26,6 +26,7 @@
import org.apache.roller.business.runnable.RollerTask;
import org.apache.roller.business.Roller;
import org.apache.roller.business.RollerFactory;
+import org.apache.roller.config.RollerConfig;
/**
@@ -98,7 +99,8 @@
public void runTask() {
try {
Roller roller = RollerFactory.getRoller();
- roller.getPlanetManager().refreshEntries();
+ roller.getPlanetManager().refreshEntries(
+ RollerConfig.getProperty("planet.aggregator.cache.dir"));
roller.flush();
} catch (RollerException e) {
log.error("ERROR refreshing entries", e);