svn commit: r528289 - in /roller/trunk: metadata/database/droptables.sql src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java

[agilliland]

Author: agilliland
Date: Thu Apr 12 17:03:00 2007
New Revision: 528289

URL: http://svn.apache.org/viewvc?view=rev&rev=528289
Log:
a couple files that were missed from the previous commit.


Modified:
    roller/trunk/metadata/database/droptables.sql
    
roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java

Modified: roller/trunk/metadata/database/droptables.sql
URL: 
http://svn.apache.org/viewvc/roller/trunk/metadata/database/droptables.sql?view=diff&rev=528289&r1=528288&r2=528289
==============================================================================
--- roller/trunk/metadata/database/droptables.sql (original)
+++ roller/trunk/metadata/database/droptables.sql Thu Apr 12 17:03:00 2007
@@ -15,11 +15,13 @@
 -- directory of this distribution.
 
 -- planet tables
-drop table rag_config;
-drop table rag_group;
-drop table rag_subscription;
 drop table rag_entry;
 drop table rag_group_subscription;
+drop table rag_subscription;
+drop table rag_group;
+drop table rag_planet;
+drop table rag_properties;
+drop table rag_config;
 
 -- non-associated tables
 drop table newsfeed;

Modified: 
roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java?view=diff&rev=528289&r1=528288&r2=528289
==============================================================================
--- 
roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java 
(original)
+++ 
roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java 
Thu Apr 12 17:03:00 2007
@@ -93,23 +93,18 @@
             List results = new ArrayList();
             try {
                 PlanetManager planetManager = 
PlanetFactory.getPlanet().getPlanetManager();
+                PlanetData planet = 
planetManager.getPlanet("zzz_default_planet_zzz");
                 
                 List rawEntries = null;
                 if (feedURL != null) {
                     PlanetSubscriptionData sub = 
planetManager.getSubscription(feedURL);
                     rawEntries = planetManager.getEntries(sub, offset, 
length+1);
                 } else if (groupHandle != null) {
-                    PlanetData planet = 
planetManager.getPlanet("zzz_default_planet_zzz");
                     PlanetGroupData group = planetManager.getGroup(planet, 
groupHandle);
-                    rawEntries = 
planetManager.getEntries(Collections.singletonList(group), startDate, null, 
offset, length+1);
+                    rawEntries = planetManager.getEntries(group, startDate, 
null, offset, length+1);
                 } else {
-                    PlanetData planet = 
planetManager.getPlanet("zzz_default_planet_zzz");
-                    PlanetGroupData groupAll = planetManager.getGroup(planet, 
"all");
-                    PlanetGroupData groupDefault = 
planetManager.getGroup(planet, "default");
-                    List groups = new ArrayList();
-                    groups.add(groupAll);
-                    groups.add(groupDefault);
-                    rawEntries = planetManager.getEntries(groups, startDate, 
null, offset, length+1);
+                    PlanetGroupData group = planetManager.getGroup(planet, 
"all");
+                    rawEntries = planetManager.getEntries(group, startDate, 
null, offset, length+1);
                 }
                 
                 // check if there are more results for paging