[Yanel-commits] rev 20307 - public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources

[josias at wyona.com]

Author: josias
Date: 2006-11-24 14:29:54 +0100 (Fri, 24 Nov 2006)
New Revision: 20307

Modified:
   public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
Log:
applied second patch for bug #5056: fixes links and header on contact page

Modified: public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2006-11-24 13:24:28 UTC (rev 20306)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2006-11-24 13:29:54 UTC (rev 20307)
@@ -161,10 +161,8 @@
                 .newTransformer(getXSLTStreamSource(path, contentRepo));
         transformer.setParameter("yanel.path.name", path.getName());
         transformer.setParameter("yanel.path", path.toString());
-        // transformer.setParameter("yanel.back2context", backToRoot(path,
-        // ""));
-        // transformer.setParameter("yarep.back2realm", backToRoot(new
-        // org.wyona.yanel.core.Path(rp.getPath().toString()), ""));
+        transformer.setParameter("yanel.back2context", backToRoot(path, ""));
+        transformer.setParameter("yarep.back2realm", backToRoot(new org.wyona.yanel.core.Path(rp.getPath().toString()), ""));
         // TODO: Is this the best way to generate an InputStream from an
         // OutputStream?
         java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
@@ -235,10 +233,12 @@
             throws Exception, TransformerConfigurationException,
             TransformerFactoryConfigurationError, NoSuchNodeException,
             TransformerException {
+
+        RepoPath rp = new org.wyona.yarep.util.YarepUtil().getRepositoryPath(new org.wyona.yarep.core.Path(path.toString()), getRepositoryFactory());
+        
         Transformer transformer = prepareTransformer(path);
-        // transformer.setParameter("yanel.back2context", backToRoot(path, ""));
-        // transformer.setParameter("yarep.back2realm", backToRoot(new
-        // org.wyona.yanel.core.Path(rp.getPath().toString()), ""));
+        transformer.setParameter("yanel.back2context", backToRoot(path, ""));
+        transformer.setParameter("yarep.back2realm", backToRoot(new org.wyona.yanel.core.Path(rp.getPath().toString()), ""));
         // TODO: Is this the best way to generate an InputStream from an
         // OutputStream?
         java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
@@ -412,12 +412,38 @@
         return "application/xhtml+xml";
     }
     
+    /**
+     * 
+     * @return
+     */
     protected RepositoryFactory getRepositoryFactory() {
         return yanel.getRepositoryFactory("DefaultRepositoryFactory");
     }
     
+    /**
+     * 
+     * @return
+     */
     protected RepositoryFactory getRTIRepositoryFactory() {
         return yanel.getRepositoryFactory("RTIRepositoryFactory");
     }
     
+   /**
+    *
+    */
+   private String backToRoot(Path path, String backToRoot) {
+       org.wyona.commons.io.Path parent = path.getParent();
+       if (parent != null && !isRoot(parent)) {
+           return backToRoot(new Path(parent.toString()), backToRoot + "../");
+       }
+       return backToRoot;
+   }
+   
+  /**
+   *
+   */
+  private boolean isRoot(org.wyona.commons.io.Path path) {
+      if (path.toString().equals(File.separator)) return true;
+      return false;
+  }
 }