svn commit: r548360 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa: JPARefererManagerImpl.java JPAWeblogManagerImpl.java

[snoopdave]

Author: snoopdave
Date: Mon Jun 18 07:00:46 2007
New Revision: 548360

URL: http://svn.apache.org/viewvc?view=rev&rev=548360
Log:
Couple of JPA bugs found during deployment to rollerweblogger.org

Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java?view=diff&rev=548360&r1=548359&r2=548360
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
 Mon Jun 18 07:00:46 2007
@@ -195,7 +195,7 @@
         List queryResults = (List)q.getResultList();
         for (Iterator it = queryResults.iterator(); it.hasNext(); ) {
             Object[] row = (Object[])it.next();
-            Integer hits = (Integer)row[0];
+            long hits = ((Number)row[0]).longValue();
             String websiteId = (String)row[1];
             String websiteName = (String)row[2];
             String websiteHandle = (String)row[3];
@@ -204,7 +204,7 @@
                 websiteHandle,
                 websiteName,
                 "statCount.weblogDayHits",
-                hits.longValue()));              
+                hits));              
         }
         // Original query ordered by desc hits.
         // JPA QL doesn't allow queries to be ordered by agregates; do it in 
memory

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?view=diff&rev=548360&r1=548359&r2=548360
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
 Mon Jun 18 07:00:46 2007
@@ -1237,10 +1237,9 @@
                 query.setParameter(1, website);
                 query.setParameter(2, start);
             } else {
-                Timestamp start = new Timestamp(startDate.getTime());
                 query = strategy.getNamedQuery(
                         "WeblogEntryTagAggregate.getPopularTagsByWebsite");
-                query.setParameter(1, start);
+                query.setParameter(1, website);
             }
         } else {
             if (startDate != null) {
@@ -1267,7 +1266,7 @@
             Object[] row = (Object[]) iter.next();
             TagStat t = new TagStat();
             t.setName((String) row[0]);
-            t.setCount(((Integer) row[1]).intValue());
+            t.setCount(((Number) row[1]).intValue());
             
             min = Math.min(min, t.getCount());
             max = Math.max(max, t.getCount());