Changeset 5311

Timestamp:

08/20/10 14:31:13 (18 months ago)

Author:

mtld

Message:

added xslt component stuff

Location:

branches/xsltcomp-2010-08-11/pfixcore

Files:

• pom.xml (modified) (1 diff)
• projects/core/xml (added)
• projects/core/xml/component.xml (added)
• projects/core/xsl/master.xsl (modified) (3 diffs)
• projects/core/xsl/metatags.xsl (modified) (1 diff)
• projects/core/xsl/render.xsl (added)
• projects/sample1/txt/common.xml (added)
• projects/sample1/txt/pages/main_home.xml (modified) (1 diff)
• src/de/schlund/pfixcore/util/TransformerCallback.java (modified) (1 diff)
• src/de/schlund/pfixcore/workflow/Navigation.java (modified) (1 diff)
• src/de/schlund/pfixxml/RenderContext.java (added)
• src/de/schlund/pfixxml/RenderContextSaxon1.java (added)
• src/de/schlund/pfixxml/RenderContextSaxon2.java (added)
• src/de/schlund/pfixxml/RenderExtension.java (added)
• src/de/schlund/pfixxml/RenderExtensionSaxon1.java (added)
• src/de/schlund/pfixxml/targets/TargetGenerator.java (modified) (10 diffs)
• src/de/schlund/pfixxml/util/Xslt.java (modified) (1 diff)
• src/org/pustefixframework/http/AbstractPustefixXMLRequestHandler.java (modified) (4 diffs)
• startup.properties (added)

branches/xsltcomp-2010-08-11/pfixcore/pom.xml

@@ -5 +5 @@
   <artifactId>pfixcore</artifactId>
   <name>pfixcore</name>
-  <version>0.13.22-SNAPSHOT</version>
+  <version>0.13.22-xsltcomp-SNAPSHOT</version>
   <dependencies>
     <dependency>

branches/xsltcomp-2010-08-11/pfixcore/projects/core/xsl/master.xsl

@@ -104 +104 @@
       <ixsl:import href="core/xsl/include.xsl"/>
       <ixsl:import href="core/xsl/functions.xsl"/>
+      <ixsl:import href="core/xsl/render.xsl"/>
 
       <!-- generate user defined imports -->
@@ -128 +129 @@
       <ixsl:param name="navitree" select="$__navitree"/>
       
-      <!-- The next three parameters are opaque Java objects. Use them only to pass them to extension functions! -->
+      <!-- The next four parameters are opaque Java objects. Use them only to pass them to extension functions! -->
       <ixsl:param name="__context__"/>
       <ixsl:param name="__spdoc__"/>
@@ -260 +261 @@
 
       <ixsl:template match="/">
+        <ixsl:call-template name="__render_start__"/>
         <xsl:choose>
           <!-- <xsl:when test="//frameset"> -->

branches/xsltcomp-2010-08-11/pfixcore/projects/core/xsl/metatags.xsl

@@ -9 +9 @@
   <xsl:import href="core/xsl/include.xsl"/>
   <xsl:import href="core/xsl/utils.xsl"/>
+  <xsl:import href="core/xsl/render.xsl"/>
 
   <cus:custom_xsl/>

branches/xsltcomp-2010-08-11/pfixcore/projects/sample1/txt/pages/main_home.xml

@@ -97 +97 @@
           </table>
        </pfx:forminput>
-        
+           
+       <pfx:render href="sample1/txt/common.xml" part="content"/>
+      
       </center>
     </theme>

branches/xsltcomp-2010-08-11/pfixcore/src/de/schlund/pfixcore/util/TransformerCallback.java

@@ -388 +388 @@
     }
     
+    public static String getHandlerPath(String targetgen, String page) {
+        TargetGenerator gen = TargetGeneratorFactory.getInstance().getGenerator(targetgen);
+        return gen.getNavigation().getHandler(page);
+    }
+
 }

branches/xsltcomp-2010-08-11/pfixcore/src/de/schlund/pfixcore/workflow/Navigation.java

@@ -154 +154 @@
     }
 
+    public String getHandler(String page) {
+        NavigationElement element = pagetonavi.get(page);
+        if(element == null) throw new IllegalArgumentException("Page '" + page + "' not found in navigation.");
+        return element.getHandler();
+    }
+    
+    
     public class NavigationElement {
         private ArrayList<NavigationElement> children = new ArrayList<NavigationElement>();

branches/xsltcomp-2010-08-11/pfixcore/src/de/schlund/pfixxml/targets/TargetGenerator.java

@@ -55 +55 @@
 
 import de.schlund.pfixcore.util.Meminfo;
+import de.schlund.pfixcore.workflow.Navigation;
 import de.schlund.pfixcore.workflow.NavigationFactory;
+import de.schlund.pfixcore.workflow.NavigationInitializationException;
 import de.schlund.pfixxml.IncludeDocumentFactory;
 import de.schlund.pfixxml.XMLException;
@@ -72 +74 @@
 import de.schlund.pfixxml.targets.cachestat.SPCacheStatistic;
 import de.schlund.pfixxml.util.TransformerHandlerAdapter;
+import de.schlund.pfixxml.util.XMLUtils;
 import de.schlund.pfixxml.util.Xml;
 import de.schlund.pfixxml.util.XsltVersion;
@@ -121 +124 @@
 
     private FileResource config_path;
-
+    
+    private Navigation navigation;
+    
     //--
 
@@ -162 +167 @@
     }
 
+    public Navigation getNavigation() {
+        return navigation;
+    }
+    
     //-- targets
 
@@ -172 +181 @@
     public Target getTarget(String key) {
         synchronized (alltargets) {
-            return (Target) alltargets.get(key);
+            Target target = (Target) alltargets.get(key);
+            if(target == null && key.contains("$")) {
+                Target compTarget = createTargetForComponent(key);
+                return compTarget;
+            }
+            return target;
         }
     }
@@ -322 +336 @@
             throw new RuntimeException("Could not get instance of SAXTransformerFactory!");
         }
-
+try {
+    XMLUtils.serialize(config);
+} catch(Exception x) {
+    x.printStackTrace();
+}
         Element root = (Element) config.getElementsByTagName("make").item(0);
         
@@ -448 +466 @@
             allstructs.put(nameattr, struct);
         }
+        
+        
+        try {
+            navigation = NavigationFactory.getInstance().getNavigation(this.config_path,getXsltVersion());
+        } catch (NavigationInitializationException e) {
+            throw new XMLException("Error reading page navigation.");
+        }
+        
         LOG.warn("\n=====> Preliminaries took " + (System.currentTimeMillis() - start) + "ms. Now looping over " + allstructs.keySet().size() + " targets");
         start = System.currentTimeMillis();
@@ -534 +560 @@
             virtual.addParam(XSLPARAM_TG, tgParam);
             virtual.addParam(XSLPARAM_TKEY, key);
+            System.out.println(">>>>>>>>>>>>>>>>>> "+tgParam+" "+key);
             try {
-                virtual.addParam(XSLPARAM_NAVITREE, NavigationFactory.getInstance().getNavigation(this.config_path,getXsltVersion()).getNavigationXMLElement());
+                virtual.addParam(XSLPARAM_NAVITREE, navigation.getNavigationXMLElement());
             } catch (Exception e) {
                 throw new XMLException("Cannot get navigation tree", e);
@@ -555 +582 @@
         }
     }
-
+    
+    private TargetRW createTargetForComponent(String componentKey) {
+
+        String[] comps = splitComponentKey(componentKey);
+        String href = comps[0];
+        String part = comps[1];
+        String module = "";
+        if(comps.length>2) module = comps[2];
+        String search = "";
+        if(comps.length>3) search = comps[3];
+        
+        System.out.println("NNNNNNNNNNNNNNNNNN: " + componentKey);
+        //sample1_txt_pages_main_foo@content::foo:bar:baz.xml
+        Themes themes = global_themes;
+        
+        if(getTargetRW(name) != null) throw new RuntimeException("Target already exists"); 
+        
+        String tgParam = config_path.toString();
+        
+        XMLVirtualTarget xmlTarget = (XMLVirtualTarget)createTarget(TargetType.XML_VIRTUAL, componentKey + ".xml", themes);
+        Target xmlSource = createTarget(TargetType.XML_LEAF, "core/xml/component.xml", null);
+        Target xslSource = createTarget(TargetType.XSL_VIRTUAL, "metatags.xsl", null);
+        xmlTarget.setXMLSource(xmlSource);
+        xmlTarget.setXSLSource(xslSource);
+        xmlTarget.addParam(XSLPARAM_TG, tgParam);
+        xmlTarget.addParam(XSLPARAM_TKEY, componentKey + ".xml");
+        xmlTarget.addParam("component_href", href);
+        xmlTarget.addParam("component_part", part);
+        xmlTarget.addParam("component_module", module);
+        xmlTarget.addParam("component_search", search);
+        
+        XSLVirtualTarget xslTarget = (XSLVirtualTarget)createTarget(TargetType.XSL_VIRTUAL, componentKey + ".xsl", themes);
+        xmlSource = xmlTarget;
+        xslSource = createTarget(TargetType.XSL_VIRTUAL, "master.xsl", null);
+        xslTarget.setXMLSource(xmlSource);
+        xslTarget.setXSLSource(xslSource);
+        xslTarget.addParam(XSLPARAM_TG, tgParam);
+        xslTarget.addParam(XSLPARAM_TKEY, componentKey + ".xsl");
+        
+        return xslTarget;
+    }
+    
+    
+    
+    
+    
     // *******************************************************************************************
     private TargetRW getTargetRW(String key) {
@@ -879 +951 @@
         return this.config_path;
     }
+    
+    public static String createComponentKey(String href, String part, String module, String search) {
+        if(href == null || href.equals("")) throw new IllegalArgumentException("Argument 'href' must not be empty");
+        if(part == null || part.equals("")) throw new IllegalArgumentException("Argument 'part' must not be empty");
+        if(module == null) module = "";
+        if(search == null) search = "";
+        String targetKey = encode(href) + "$" + encode(part) + "$" + encode(module) + "$" + encode(search);
+        return targetKey;
+    }
+    
+    public static String encode(String str) {
+        str = str.replace("%", "%" + Integer.toHexString('%'));
+        str = str.replace("$", "%" + Integer.toHexString('$'));
+        str = str.replace("+", "%" + Integer.toHexString('+'));
+        str = str.replace("/", "+");
+        return str;
+    }
+    
+    public static String decode(String str) {
+        str = str.replace("+", "/");
+        str = str.replace("%" + Integer.toHexString('+'), "+");
+        str = str.replace("%" + Integer.toHexString('$'), "$");
+        str = str.replace("%" + Integer.toHexString('%'), "%");
+        return str;
+    }
+    
+    public static String[] splitComponentKey(String componentKey) {
+        String[] comps = componentKey.split("\\$");
+        for(int i=0; i<comps.length; i++) {
+            comps[i] = decode(comps[i]);
+        }
+        return comps;
+    }
 
 }

branches/xsltcomp-2010-08-11/pfixcore/src/de/schlund/pfixxml/util/Xslt.java

@@ -268 +268 @@
             if(href.equals("core/xsl/include.xsl")) {
                 if(xsltVersion==XsltVersion.XSLT2) href="core/xsl/include_xslt2.xsl";
+            } else if(href.equals("core/xsl/render.xsl")) {
+                if(xsltVersion==XsltVersion.XSLT2) href="core/xsl/render_xslt2.xsl";
             }
             

branches/xsltcomp-2010-08-11/pfixcore/src/org/pustefixframework/http/AbstractPustefixXMLRequestHandler.java

@@ -28 +28 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -59 +60 @@
 import de.schlund.pfixcore.workflow.NavigationInitializationException;
 import de.schlund.pfixxml.PfixServletRequest;
+import de.schlund.pfixxml.RenderContext;
 import de.schlund.pfixxml.RenderingException;
 import de.schlund.pfixxml.RequestParam;
@@ -729 +731 @@
                      ((spdoc != null) ? ("pagename=" +  spdoc.getPagename()) : "spdoc==null")); 
         }
+        RenderContext renderContext = RenderContext.create(generator.getXsltVersion());
+        paramhash.put("__rendercontext__", renderContext);
+        renderContext.setParameters(Collections.unmodifiableMap(paramhash));
         try {
+            long t1 = System.currentTimeMillis();
             Xslt.transform(spdoc.getDocument(), stylevalue, paramhash, new StreamResult(output), getServletEncoding());
+            long t2 = System.currentTimeMillis();
+            System.out.println("TTTTTTTTTTTTTTTTTTTT: " + (t2-t1));
         } catch (TransformerException e) {
             Throwable inner = e.getException();
@@ -744 +752 @@
                 throw e;
             }
-        }
+        } 
     }