[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalManagerImpl.java PortalPresenter.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21101/portal

Modified Files:
	PortalManagerImpl.java PortalPresenter.java 
Log Message:


Index: PortalPresenter.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- PortalPresenter.java	13 Sep 2006 12:51:23 -0000	1.44
+++ PortalPresenter.java	14 Sep 2006 12:21:26 -0000	1.45
@@ -520,7 +520,7 @@
         
         HttpServletRequest request = portalRequest.getHttpServletRequest();
         String uri = request.getRequestURI();
-        logger.info("navigation: "+uri);
+        uri = portalRequest.getPagePath()+portalRequest.getPageName();
         int poslast = uri.lastIndexOf("/");
         String pagename = "";
         String fullpagename = "";
@@ -542,7 +542,7 @@
                 PortalFolder pf = portalManager.getPortalFolder(tmpurl);
                 String tmpname = tmps;
                 if (pf != null)
-                    tmpname = pf.getTitle("$!lang");
+                    tmpname = pf.getTitle(portalRequest.getLang());
                 result.append(" → ");
                 result.append("<a href=\"");
                 result.append(tmpurl);
@@ -551,7 +551,7 @@
                 result.append("</a>");
             }
             if (pagename!=null && pagename.length()>0 &&
-                (!(pagename.startsWith("index.")))) {
+                (!(pagename.equals("index")))) {
                 result.append(" &rarr; ");
                 result.append("<a href=\"");
                 tmpurl = tmpurl + fullpagename;

Index: PortalManagerImpl.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- PortalManagerImpl.java	12 Sep 2006 12:40:50 -0000	1.85
+++ PortalManagerImpl.java	14 Sep 2006 12:21:26 -0000	1.86
@@ -470,20 +470,11 @@
 
         Object content = page.getPageContent(lang);
         if (content == null) {
-            logger.warn("Failed getting content for page "+pagePath+pageName
-                        +","+lang+" - sending error 404");
-            /*
-            pagePath = notFoundPath;
-            pageName = "notfound.html";
-            int pos = pagePath.indexOf("/");
-            if (pos > -1) {
-                pageName = pagePath.substring(pos+1);
-                pagePath = pagePath.substring(0, pos+1);
+            if (!pageName.equals("favicon.ico")) {
+                logger.warn("Failed getting content for page "
+                            +pagePath+pageName
+                            +","+lang+" - sending error 404");
             }
-            page = getObject(pagePath, pageName);
-            printPage(portalRequest, page, out);
-            return;
-            */
             HttpServletResponse response =
                 portalRequest.getHttpServletResponse();
             response.setStatus(404);