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 02:35:37 UTC
svn commit: r486449 - in
/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business:
datamapper/DatamapperRollerPlanetManagerImpl.java
datamapper/DatamapperWeblogManagerImpl.java jpa/JPAWeblogManagerImpl.java
Author: clr
Date: Tue Dec 12 17:35:35 2006
New Revision: 486449
URL: http://svn.apache.org/viewvc?view=rev&rev=486449
Log:
Datamapper updates to sync with latest Roller changes
Modified:
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerPlanetManagerImpl.java
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerPlanetManagerImpl.java?view=diff&rev=486449&r1=486448&r2=486449
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerPlanetManagerImpl.java (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerPlanetManagerImpl.java Tue Dec 12 17:35:35 2006
@@ -76,11 +76,9 @@
String localURL = RollerRuntimeConfig.getProperty("site.absoluteurl");
// if this is not a local url then let parent deal with it
- if (StringUtils.isEmpty(localURL) ||
- !sub.getFeedURL().startsWith(localURL)) {
+ if (StringUtils.isEmpty(localURL) || !sub.getFeedURL().startsWith(localURL)) {
- log.debug("Feed is remote, letting parent handle it " +
- sub.getFeedURL());
+ log.debug("Feed is remote, letting parent handle it "+sub.getFeedURL());
return super.getNewEntries(sub, feedFetcher, feedInfoCache);
}
@@ -95,16 +93,13 @@
Set newEntries = new TreeSet();
// get corresponding website object
- UserManager usermgr = RollerFactory.getRoller()
- .getUserManager();
- WebsiteData website = usermgr
- .getWebsiteByHandle(sub.getAuthor());
+ UserManager usermgr = RollerFactory.getRoller().getUserManager();
+ WebsiteData website = usermgr.getWebsiteByHandle(sub.getAuthor());
if (website == null)
return newEntries;
// figure website last update time
- WeblogManager blogmgr = RollerFactory.getRoller()
- .getWeblogManager();
+ WeblogManager blogmgr = RollerFactory.getRoller().getWeblogManager();
Date siteUpdated = website.getLastModified();
if (siteUpdated == null) { // Site never updated, skip it
@@ -115,8 +110,7 @@
// if website last update time > subsciption last update time
List entries = new ArrayList();
- if (sub.getLastUpdated()==null ||
- siteUpdated.after(sub.getLastUpdated())) {
+ if (sub.getLastUpdated()==null || siteUpdated.after(sub.getLastUpdated())) {
int entryCount = RollerRuntimeConfig.getIntProperty(
"site.newsfeeds.defaultEntries");
entries = blogmgr.getWeblogEntries(
@@ -128,6 +122,7 @@
null, // tags
WeblogEntryData.PUBLISHED, // status
null, // sortby (null means pubTime)
+ null,
null, // locale
0, // offset
entryCount);
@@ -145,25 +140,39 @@
}
// Populate subscription object with new entries
- PluginManager ppmgr = RollerFactory.getRoller()
- .getPagePluginManager();
+ PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
Map pagePlugins = ppmgr.getWeblogEntryPlugins(website);
Iterator entryIter = entries.iterator();
while (entryIter.hasNext()) {
try {
WeblogEntryData rollerEntry =
- (WeblogEntryData)entryIter.next();
- PlanetEntryData entry = null;
-//TODO: DatamapperPort Need to sync up code with trunk
-// new PlanetEntryData(rollerEntry, sub,
-// pagePlugins);
+ (WeblogEntryData)entryIter.next();
+
+ PlanetEntryData entry = new PlanetEntryData();
+ entry.setSubscription(sub);
+
+ String content = "";
+ if (!StringUtils.isEmpty(rollerEntry.getText())) {
+ content = rollerEntry.getText();
+ } else {
+ content = rollerEntry.getSummary();
+ }
+ content = ppmgr.applyWeblogEntryPlugins(pagePlugins, rollerEntry, content);
+
+ entry.setAuthor(rollerEntry.getCreator().getFullName());
+ entry.setTitle(rollerEntry.getTitle());
+ entry.setPubTime(rollerEntry.getPubTime());
+ entry.setText(content);
+ entry.setPermalink(rollerEntry.getPermalink());
+ entry.setCategoriesString(rollerEntry.getCategory().getPath());
+
saveEntry(entry);
newEntries.add(entry);
} catch (Exception e) {
log.error("ERROR processing subscription entry", e);
}
}
-
+
return newEntries;
}
} catch (Exception e) {
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java?view=diff&rev=486449&r1=486448&r2=486449
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java Tue Dec 12 17:35:35 2006
@@ -467,22 +467,6 @@
/**
* @inheritDoc
*/
- public abstract List getWeblogEntries(
- WebsiteData website,
- UserData user,
- Date startDate,
- Date endDate,
- String catName,
- List tags,
- String status,
- String sortby,
- String locale,
- int offset,
- int length) throws RollerException;
-
- /**
- * @inheritDoc
- */
public List getWeblogEntriesPinnedToMain(Integer max)
throws RollerException {
DatamapperQuery query = strategy.newQuery(WeblogCategoryData.class,
@@ -801,6 +785,7 @@
catName,
tags,
status,
+ null,
null,
locale,
offset,
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java?view=diff&rev=486449&r1=486448&r2=486449
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java Tue Dec 12 17:35:35 2006
@@ -49,6 +49,7 @@
/**
* @inheritDoc
*/
+
public List getWeblogEntries(
WebsiteData website,
UserData user,
@@ -58,6 +59,7 @@
List tags,
String status,
String sortby,
+ String sortOrder,
String locale,
int offset,
int length) throws RollerException {
@@ -122,12 +124,19 @@
}
if (sortby != null && sortby.equals("updateTime")) {
- queryString.append("ORDER BY updateTime DESC");
+ queryString.append("ORDER BY updateTime ");
} else {
- queryString.append("ORDER BY pubTime DESC");
+ queryString.append("ORDER BY pubTime ");
}
+
+ if (sortOrder != null && sortOrder.equals(ASCENDING)) {
+ queryString.append("ASC ");
+ } else {
+ queryString.append("DESC ");
+ }
+
- JPADynamicQueryImpl query = (JPADynamicQueryImpl)
+ JPADynamicQueryImpl query = (JPADynamicQueryImpl)
((JPAPersistenceStrategy) strategy)
.newDynamicQuery(queryString.toString());