svn commit: r289292 - /incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java

[ag...@apache.org]

Author: agilliland
Date: Thu Sep 15 12:15:28 2005
New Revision: 289292

URL: http://svn.apache.org/viewcvs?rev=289292&view=rev
Log:
allow page servlet to render comment popup requests.


Modified:
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java?rev=289292&r1=289291&r2=289292&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java Thu Sep 15 12:15:28 2005
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.Date;
 import java.util.Map;
 
 import javax.servlet.ServletConfig;
@@ -20,7 +21,7 @@
 import org.apache.velocity.servlet.VelocityServlet;
 import org.roller.model.RollerFactory;
 import org.roller.model.UserManager;
-import org.roller.pojos.UserData;
+import org.roller.pojos.WeblogTemplate;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.RollerRequest;
 
@@ -50,9 +51,12 @@
     }
     
     
-    public Template handleRequest( HttpServletRequest request,
-            HttpServletResponse response,
-            Context ctx ) throws Exception {
+    /**
+     * Process a request for a Weblog page.
+     */
+    public Template handleRequest(HttpServletRequest request,
+                            HttpServletResponse response, Context ctx)
+        throws Exception {
         
         Template outty = null;
         Exception pageException = null;
@@ -75,12 +79,29 @@
             
             org.roller.pojos.Template page = null;
             
+            // If this is a popup request, then deal with it specially
+            if (request.getParameter("popup") != null) {
+                try {
+                    // Does user have a popupcomments page?
+                    page = website.getPageByName("_popupcomments");
+                } catch(Exception e ) {
+                    // ignored ... considered page not found
+                }
+                
+                // User doesn't have one so return the default
+                if (page == null) {
+                    page = new WeblogTemplate("/popupcomments.vm", website, 
+                            "Comments", "Comments", "dummy_link", 
+                            "dummy_template", new Date());
+                }
+                rreq.setPage(page);
+                
             // If request specified the page, then go with that
-            if (rreq.getPage() != null &&
+            } else if (rreq.getPage() != null &&
                     rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE) == null) {
                 page = rreq.getPage();
                 
-                // If page not available from request, then use website's default
+            // If page not available from request, then use website's default
             } else if (website != null) {
                 page = website.getDefaultPage();
                 rreq.setPage(page);