[Staticwiki-svn-commit] SF.net SVN: staticwiki:[53] trunk/staticwiki-servlet/src/main/java/org/ staticwiki/servlet/WikiServlet.java

[<tri...@us...>]

Revision: 53
          http://staticwiki.svn.sourceforge.net/staticwiki/?rev=53&view=rev
Author:   triathlon98
Date:     2009-04-01 15:19:46 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
SW-14 don't require .meta files

Modified Paths:
--------------
    trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java

Modified: trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java
===================================================================
--- trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java	2009-01-09 11:01:59 UTC (rev 52)
+++ trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java	2009-04-01 15:19:46 UTC (rev 53)
@@ -53,16 +53,18 @@
         // quick error checking, the meta stuff should not be directly accessible
         if ( fname.contains( META ) )
         {
+            System.out.println( "should not directly access meta info " + fname );
             response.sendError( HttpServletResponse.SC_NOT_FOUND );
             return;
         }
 
         String fnameOriginal = fname;
+        if ( fname.endsWith( "/" ) ) fname += "index"; // @todo index page should be configurable 
         if ( fname.endsWith( ".html" ) ) fname = fname.substring( 0, fname.length() - 5 );
         File meta = new File( root, fname + ".meta" );
-        if ( meta.exists() )
+        File wiki = new File( root, fname + ".wiki" );
+        if ( meta.exists() || wiki.exists() )
         {
-            File wiki = new File( root, fname + ".wiki" );
             try
             {
                 DefaultWikiContext context = new DefaultWikiContext();
@@ -75,7 +77,7 @@
             }
             catch ( WikiException we )
             {
-                log.error( "wiki render error" + we.toString(), we );
+                log.error( "wiki render error " + we.toString(), we );
                 response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.