You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by el...@apache.org on 2006/09/26 21:04:36 UTC

svn commit: r450149 - in /incubator/roller/trunk/src/org/apache/roller: business/hibernate/HibernateWeblogManagerImpl.java planet/tasks/SyncWebsitesTask.java

Author: eliast
Date: Tue Sep 26 12:04:35 2006
New Revision: 450149

URL: http://svn.apache.org/viewvc?view=rev&rev=450149
Log:
Fixing bugs from Allen's mail
  http://mail-archives.apache.org/mod_mbox/incubator-roller-dev/200609.mbox/%3c45195FFE.2050706@sun.com%3e

- Fixed getTags query to not include aggregates in the order clause.
- Fixed SyncWebsitesTask compilation problem.

Modified:
    incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
    incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java

Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=450149&r1=450148&r2=450149
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Tue Sep 26 12:04:35 2006
@@ -835,7 +835,7 @@
         if(user != null)
           queryString.append("and t.user.id = '" + user.getId() + "' ");
         queryString.append("group by t.name ");
-        queryString.append(sortByCount ? "order by count(t.name) desc " : "order by t.name ");
+        queryString.append(sortByCount ? "order by col_1_0_ desc " : "order by t.name ");
 
         Query query = session.createQuery(queryString.toString());
         query.setTimestamp(0, DateUtil.getStartOfDay(startDate));

Modified: incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java?view=diff&rev=450149&r1=450148&r2=450149
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java Tue Sep 26 12:04:35 2006
@@ -107,7 +107,7 @@
                 WebsiteData weblog = (WebsiteData) websites.next();
                 
                 String siteUrl = URLUtilities.getWeblogURL(weblog, null, true);
-                String feedUrl = URLUtilities.getWeblogFeedURL(weblog, null, "entries", "rss", null, false, true);
+                String feedUrl = URLUtilities.getWeblogFeedURL(weblog, null, "entries", "rss", null, null, false, true);
                 
                 // add feed url to the "live" list
                 liveUserFeeds.add(feedUrl);