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 2005/09/30 15:18:32 UTC
svn commit: r292721 - in
/incubator/roller/branches/roller_2.0/src/org/roller:
business/hibernate/HibernateRefererManagerImpl.java
pojos/WebsiteDisplayData.java
presentation/website/actions/YourWebsitesAction.java
Author: snoopdave
Date: Fri Sep 30 06:18:26 2005
New Revision: 292721
URL: http://svn.apache.org/viewcvs?rev=292721&view=rev
Log:
Fixed bug in display of hot blogs list
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteDisplayData.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java?rev=292721&r1=292720&r2=292721&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java Fri Sep 30 06:18:26 2005
@@ -181,21 +181,21 @@
if (con.getMetaData().getDriverName().startsWith("HSQL")) {
// special handling for HSQLDB
stmt = con.prepareStatement(
- "select top ? u.username,w.name,w.name,w.handle,sum(r.dayhits) as s "+
- "from rolleruser as u, website as w, referer as r "+
- "where r.websiteid=w.id and w.userid=u.id and w.isenabled=? " +
- "group by u.username,w.name,w.id order by s desc");
+ "select top ? w.id,w.name,w.handle,sum(r.dayhits) as s "+
+ "from website as w, referer as r "+
+ "where r.websiteid=w.id and and w.isenabled=? " +
+ "group by w.name,w.handle,w.id order by s desc");
stmt.setInt(1, max);
stmt.setBoolean(2, true);
} else {
stmt = con.prepareStatement(
- "select u.username,w.name,w.name,w.handle,sum(r.dayhits) as s "+
- "from rolleruser as u, website as w, referer as r "+
- "where r.websiteid=w.id and w.userid=u.id and w.isenabled= ? " +
+ "select w.id,w.name,w.handle,sum(r.dayhits) as s "+
+ "from website as w, referer as r "+
+ "where r.websiteid=w.id and w.isenabled= ? " +
// Ben Walding (a Postgres SQL user): Basically, you have
// to have all non-aggregated columns that exist in your
// 'SELECT' section, in the 'GROUP BY' section as well:
- "group by u.username,w.name,w.id order by s desc limit ?");
+ "group by w.name,w.handle,w.id order by s desc limit ?");
// and not this: "group by w.id order by s desc");
stmt.setBoolean(1, true);
stmt.setInt(2, max);
@@ -204,14 +204,12 @@
if ( rs.next() ) {
do
{
- String userName = rs.getString(1);
- String name = rs.getString(2);
- String websiteName = rs.getString(3);
- String websiteHandle = rs.getString(4);
- Integer hits = new Integer(rs.getInt(5));
+ String websiteId = rs.getString(1);
+ String websiteName = rs.getString(2);
+ String websiteHandle = rs.getString(3);
+ Integer hits = new Integer(rs.getInt(4));
list.add(new WebsiteDisplayData(
- name,
- userName,
+ websiteId,
websiteName,
websiteHandle,
hits));
Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteDisplayData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteDisplayData.java?rev=292721&r1=292720&r2=292721&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteDisplayData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteDisplayData.java Fri Sep 30 06:18:26 2005
@@ -17,7 +17,6 @@
static final long serialVersionUID = 5264701383470813687L;
private String mId;
- private String mUserName = null;
private String mWebsiteName = null;
private String mWebsiteHandle = null;
private Integer mHits = new Integer(0);
@@ -34,13 +33,11 @@
*/
public WebsiteDisplayData(
String id,
- String userName,
String websiteName,
String websiteHandle,
Integer hits) {
super();
mId = id;
- mUserName = userName;
mWebsiteName = websiteName;
mWebsiteHandle = websiteHandle;
mHits = hits;
@@ -66,22 +63,7 @@
public void setId(String id) {
mId = id;
}
-
-
- /**
- * @ejb:persistent-field
- */
- public String getUserName() {
- return mUserName;
- }
-
- /**
- * @param string
- */
- public void setUserName(String string) {
- mUserName = string;
- }
-
+
/**
* @ejb:persistent-field
*/
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=292721&r1=292720&r2=292721&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java Fri Sep 30 06:18:26 2005
@@ -159,6 +159,7 @@
private boolean groupBloggingEnabled = false;
private List permissions = new ArrayList();
private List pendings = new ArrayList();
+ private int userWeblogCount = 0;
public YourWebsitesPageModel(HttpServletRequest request,
HttpServletResponse response, ActionMapping mapping) throws RollerException
@@ -168,6 +169,7 @@
RollerSession rollerSession = RollerSession.getRollerSession(request);
UserData user = rollerSession.getAuthenticatedUser();
permissions = roller.getUserManager().getAllPermissions(user);
+ userWeblogCount = permissions.size();
pendings = roller.getUserManager().getPendingPermissions(user);
groupBloggingEnabled =
RollerConfig.getBooleanProperty("groupblogging.enabled");
@@ -205,6 +207,12 @@
public void setPlanetAggregatorEnabled(boolean planetAggregatorEnabled) {
this.planetAggregatorEnabled = planetAggregatorEnabled;
}
-
+
+ public int getUserWeblogCount() {
+ return userWeblogCount;
+ }
+ public void setUserWeblogCount(int count) {
+ userWeblogCount = count;
+ }
}
}