[MMBASE CVS] applications/mynews/src/org/mmbase/mynews MyNewsUrlConverter.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/mynews/src/org/mmbase/mynews
In directory james.mmbase.org:/tmp/cvs-serv13876

Modified Files:
        MyNewsUrlConverter.java 
Log Message:
cleaned up a bit


See also: 
http://cvs.mmbase.org/viewcvs/applications/mynews/src/org/mmbase/mynews


Index: MyNewsUrlConverter.java
===================================================================
RCS file: 
/var/cvs/applications/mynews/src/org/mmbase/mynews/MyNewsUrlConverter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- MyNewsUrlConverter.java     20 Oct 2008 16:45:21 -0000      1.21
+++ MyNewsUrlConverter.java     21 Oct 2008 14:55:48 -0000      1.22
@@ -34,7 +34,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: MyNewsUrlConverter.java,v 1.21 2008/10/20 16:45:21 michiel 
Exp $
+ * @version $Id: MyNewsUrlConverter.java,v 1.22 2008/10/21 14:55:48 michiel 
Exp $
  * @since MMBase-1.9
  */
 public class MyNewsUrlConverter extends DirectoryUrlConverter {
@@ -62,10 +62,10 @@
                                 Parameters parameters,
                                 Parameters frameworkParameters,  boolean 
action) throws FrameworkException {
         if (log.isDebugEnabled()) {
-            log.debug("" + block + parameters + frameworkParameters);
+            log.debug("" + parameters + frameworkParameters);
+            log.debug("Found mynews block " + block);
         }
 
-        log.debug("Found mynews block " + block);
         StringBuilder b = new StringBuilder(directory);
         if(block.getName().equals("article")) {
             Node n = parameters.get(Framework.N);
@@ -97,7 +97,10 @@
 
     public String getFilteredInternalDirectoryUrl(List<String>  path, 
Map<String, Object> params, Parameters frameworkParameters) throws 
FrameworkException {
         StringBuilder result = new 
StringBuilder("/mmbase/framework/render.jspx?component=mynews");
-        if (path.size() > 0) {
+        if (path.size() == 0) {
+            result.append("&block=magazine");
+        } else {
+            result.append("&block=article&n=");
             // article mode
             String id = path.get(path.size() - 1); // last element in the list 
identifies the article
             String n;
@@ -145,8 +148,8 @@
                 // node was specified by number. Date spec can be ignored.
                 n = id;
             }
-            result.append("&block=article&n=" + n);
-            return result.toString();
+
+            result.append(n);
         }
         return result.toString();
     }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs