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

[josias at wyona.com]

Author: josias
Date: 2007-07-23 09:49:04 +0200 (Mon, 23 Jul 2007)
New Revision: 26200

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
Log:
added viewId parameter to getContentXML() method, and added yanel.back2realm as xslt parameter for consistency reasons

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2007-07-23 07:43:41 UTC (rev 26199)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2007-07-23 07:49:04 UTC (rev 26200)
@@ -68,7 +68,7 @@
      * @see org.wyona.yanel.core.api.attributes.ViewableV2#getView(java.lang.String)
      */
     public View getView(String viewId) throws Exception {
-        InputStream xmlInputStream = getContentXML();
+        InputStream xmlInputStream = getContentXML(viewId);
         return getXMLView(viewId, xmlInputStream);
     }
     
@@ -176,7 +176,9 @@
         transformer.setParameter("yanel.path.name", PathUtil.getName(getPath()));
         transformer.setParameter("yanel.path", getPath());
         transformer.setParameter("yanel.back2context", PathUtil.backToContext(realm, getPath()));
-        transformer.setParameter("yarep.back2realm", PathUtil.backToRealm(getPath()));
+        String backToRealm = PathUtil.backToRealm(getPath());
+        transformer.setParameter("yanel.back2realm", backToRealm);
+        transformer.setParameter("yarep.back2realm", backToRealm); // for backwards compatibility
         String userAgent = getEnvironment().getRequest().getHeader("User-Agent");
         transformer.setParameter("language", getRequestedLanguage());
         String os = getOS(userAgent);
@@ -197,7 +199,7 @@
      * @return xml stream
      * @throws Exception
      */
-    protected InputStream getContentXML() throws Exception {
+    protected InputStream getContentXML(String viewId) throws Exception {
         return getRealm().getRepository().getNode(getPath()).getInputStream();
     }