[Yanel-commits] rev 25893 - public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-07-10 23:06:33 +0200 (Tue, 10 Jul 2007)
New Revision: 25893

Modified:
   public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
Log:
comments added, obsolete stuff removed and parameters added

Modified: public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java	2007-07-10 21:05:51 UTC (rev 25892)
+++ public/yanel/trunk/src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java	2007-07-10 21:06:33 UTC (rev 25893)
@@ -124,20 +124,16 @@
                 transformer = TransformerFactory.newInstance().newTransformer();
                 defaultView.setMimeType(XML_MIME_TYPE);
             } else {
+                // "Body XSLT"
                 File xsltFile = org.wyona.commons.io.FileUtil.file(getRTD().getConfigFile().getParentFile().getAbsolutePath(), "xslt" + File.separator + "wiki2xhtml.xsl");
                 log.debug("XSLT file: " + xsltFile);
                 transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(xsltFile));
                 transformer.setParameter("yanel.path.name", PathUtil.getName(getPath()));
                 transformer.setParameter("yanel.path", getPath());
+                transformer.setParameter("yanel.last.modified", new java.util.Date(getLastModified()));
                 defaultView.setMimeType("application/xhtml+xml");
             }
             
-/*
-            String path2Resource = path.toString();
-            path2Resource = path2Resource.substring(0, path2Resource.lastIndexOf("/") + 1);
-            log.error("DEBUG: Path 2 resource: " + path2Resource);
-*/
-
             LinkChecker linkChecker = new LinkChecker(getRealm().getRepository(), getPath(), getDataPathImplementation());
             SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
             saxParser.parse(wikiParser.getInputStream(), linkChecker);
@@ -158,10 +154,9 @@
             CatalogResolver catalogResolver = new CatalogResolver();
             xmlReader.setEntityResolver(catalogResolver);
 
-            // create xslt transformer:
+            // create xslt transformer (global, e.g. navigation, header, footer):
             TransformerHandler xsltHandler = null;
             if(getXSLTPath() != null) {
-                
                 SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
                 xsltHandler = tf.newTransformerHandler(new StreamSource(dataRepo.getInputStream(new org.wyona.yarep.core.Path(getXSLTPath().toString()))));
                 transformer = xsltHandler.getTransformer();
@@ -169,7 +164,8 @@
                 transformer.setParameter("yanel.path", getPath());
                 transformer.setParameter("yanel.back2context", PathUtil.backToContext(realm, getPath()));
                 transformer.setParameter("yarep.back2realm", PathUtil.backToRealm(getPath()));
-                
+                transformer.setParameter("yanel.last.modified", new java.util.Date(getLastModified()));
+                transformer.setParameter("yanel.username", "hugo");
             }
 
             // create xinclude transformer: