Changeset 6114 for trunk

Timestamp:

01/20/12 18:18:07 (4 months ago)

Author:

mtld

Message:

added include existence check support

Location:

trunk/pustefix-core/src/main

Files:

• java/de/schlund/pfixxml/IncludeDocumentExtension.java (modified) (5 diffs)
• java/de/schlund/pfixxml/IncludeDocumentExtensionSaxon1.java (modified) (2 diffs)
• java/de/schlund/pfixxml/IncludeDocumentExtensionSaxon2.java (modified) (2 diffs)
• java/de/schlund/pfixxml/IncludePartInfo.java (modified) (3 diffs)
• java/de/schlund/pfixxml/IncludePartsInfo.java (modified) (3 diffs)
• java/de/schlund/pfixxml/IncludePartsInfoFactory.java (modified) (3 diffs)
• java/de/schlund/pfixxml/IncludePartsInfoParser.java (modified) (3 diffs)
• java/de/schlund/pfixxml/resources/DynamicResourceProvider.java (modified) (1 diff)
• java/de/schlund/pfixxml/targets/TargetGenerator.java (modified) (2 diffs)
• resources/PUSTEFIX-INF/xsl/include.xsl (modified) (3 diffs)

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtension.java

@@ -38 +38 @@
 import de.schlund.pfixxml.resources.DynamicResourceProvider;
 import de.schlund.pfixxml.resources.Resource;
+import de.schlund.pfixxml.resources.ResourceProviderRegistry;
 import de.schlund.pfixxml.resources.ResourceUtil;
 import de.schlund.pfixxml.targets.TargetGenerator;
@@ -70 +71 @@
     private static Pattern dynamicUriPattern = Pattern.compile("dynamic://[^?#]*(\\?([^#]*))?(#.*)?");
     
-    private static DynamicResourceProvider dynamicResourceProvider = new DynamicResourceProvider();
+    private static DynamicResourceProvider dynamicResourceProvider = (DynamicResourceProvider)ResourceProviderRegistry.getResourceProvider("dynamic");
     
     //~ Methods
@@ -121 +122 @@
         }
         
-        String uriStr = path_str;
-        
-        if(!uriStr.matches("^\\w+:.*")) {
-            boolean dynamic = false;
-            if(search!=null && !search.trim().equals("")) {
-                if(search.equals("dynamic")) dynamic = true;
-                else throw new XMLException("Unsupported include search argument: " + search);
-            }
-            if(dynamic) {
-                String filter = FilterHelper.getFilter(tenant, language);
-                uriStr = "dynamic:/" + path_str + "?part=" + part + "&parent=" + parent_uri_str;
-                if(!"WEBAPP".equalsIgnoreCase(module)) {
-                    if(module != null) {
-                        uriStr += "&module="+module;
-                    } else if("module".equals(parentURI.getScheme())) {
-                        uriStr += "&module="+parentURI.getAuthority();
-                    }
-                    if(filter != null)  uriStr += "&filter=" + URLEncoder.encode(filter, "UTF-8");
-                }
-            } else {
-                if(!"WEBAPP".equalsIgnoreCase(module)) {
-                    if(module != null) {
-                        uriStr = "module://" + module + "/" + path_str;
-                    } else if("module".equals(parentURI.getScheme())) {
-                        uriStr = "module://" + parentURI.getAuthority() + "/" + path_str;
-                    }
-                }
-            }
-        } else if(uriStr.matches("^dynamic://.*")) {
-            //add missing dynamic URI parameters
-            Matcher matcher = dynamicUriPattern.matcher(uriStr);
-            if(matcher.matches()) {
-                URIParameters params;
-                if(matcher.group(2) != null) params = new URIParameters(matcher.group(2), "UTF-8");
-                else params = new URIParameters();
-                if(params.getParameter("part") == null) params.addParameter("part", part);
-                if(params.getParameter("parent") == null) params.addParameter("parent", parent_uri_str);
-                if(matcher.group(2) == null) {
-                    if(matcher.group(3) == null) uriStr += "?" + params.toString();
-                    else uriStr = uriStr.substring(0, matcher.start(3)) + "?" +  params.toString() + uriStr.substring(matcher.start(3));
-                } else {
-                    uriStr = uriStr.substring(0, matcher.start(2)) + params.toString() + uriStr.substring(matcher.end(2));
-                }
-            }
-        }
-
+        String uriStr = makeURI(path_str, part, module, search, tenant, language, parentURI);
+        
         // EEEEK! this code is in need of some serious beautifying....
         
@@ -326 +283 @@
     }
     
+    private static String makeURI(String path, String part, String module, String search, String tenant, String language, URI parentURI) throws Exception {
+        String uriStr = path;
+        if(!uriStr.matches("^\\w+:.*")) {
+            boolean dynamic = false;
+            if(search!=null && !search.trim().equals("")) {
+                if(search.equals("dynamic")) dynamic = true;
+                else throw new XMLException("Unsupported include search argument: " + search);
+            }
+            if(dynamic) {
+                String filter = FilterHelper.getFilter(tenant, language);
+                uriStr = "dynamic:/" + path + "?part=" + part + "&parent=" + parentURI.toASCIIString();
+                if(!"WEBAPP".equalsIgnoreCase(module)) {
+                    if(module != null) {
+                        uriStr += "&module="+module;
+                    } else if("module".equals(parentURI.getScheme())) {
+                        uriStr += "&module="+parentURI.getAuthority();
+                    }
+                    if(filter != null)  uriStr += "&filter=" + URLEncoder.encode(filter, "UTF-8");
+                }
+            } else {
+                if(!"WEBAPP".equalsIgnoreCase(module)) {
+                    if(module != null) {
+                        uriStr = "module://" + module + "/" + path;
+                    } else if("module".equals(parentURI.getScheme())) {
+                        uriStr = "module://" + parentURI.getAuthority() + "/" + path;
+                    }
+                }
+            }
+        } else if(uriStr.matches("^dynamic://.*")) {
+            //add missing dynamic URI parameters
+            Matcher matcher = dynamicUriPattern.matcher(uriStr);
+            if(matcher.matches()) {
+                URIParameters params;
+                if(matcher.group(2) != null) params = new URIParameters(matcher.group(2), "UTF-8");
+                else params = new URIParameters();
+                if(params.getParameter("part") == null) params.addParameter("part", part);
+                if(params.getParameter("parent") == null) params.addParameter("parent", parentURI.toASCIIString());
+                if(matcher.group(2) == null) {
+                    if(matcher.group(3) == null) uriStr += "?" + params.toString();
+                    else uriStr = uriStr.substring(0, matcher.start(3)) + "?" +  params.toString() + uriStr.substring(matcher.start(3));
+                } else {
+                    uriStr = uriStr.substring(0, matcher.start(2)) + params.toString() + uriStr.substring(matcher.end(2));
+                }
+            }
+        }
+        return uriStr;
+    }
+    
+    public static final boolean exists(XsltContext context, String path_str, String part, TargetGenerator targetgen, 
+                                       String targetkey, String module, String search, String tenant, String language) throws Exception {
+
+        if(path_str.startsWith("docroot:")) path_str = path_str.substring(9);
+        if(module != null) {
+            module = module.trim();
+            if(module.equals("")) module = null;
+        }
+        if (path_str == null || path_str.equals("")) {
+            throw new XMLException("Need href for pfx:include existence check");
+        }
+        if (path_str.startsWith("/")) path_str = path_str.substring(1);
+        
+        String parentSystemId = getSystemId(context);
+        URI parentURI = new URI(parentSystemId);
+        String uriStr = makeURI(path_str, part, module, search, tenant, language, parentURI);
+        
+        try {
+            
+            Resource    path        = ResourceUtil.getResource(uriStr);
+            resolvedUri.set(path.toURI().toString());
+          
+            VirtualTarget target = (VirtualTarget) targetgen.getTarget(targetkey);
+
+            String[] themes = targetgen.getGlobalThemes().getThemesArr();
+            if (!targetkey.equals(NOTARGET)) {
+                themes = target.getThemes().getThemesArr();
+            }
+            if (themes == null) {
+                XMLException ex = new XMLException("Target has a 'null' themes array!");
+                target.setStoredException(ex);
+                throw ex;
+            }
+            if (themes.length < 1) {
+                XMLException ex = new XMLException("Target has an empty themes array!");
+                target.setStoredException(ex);
+                throw ex;
+            }
+            
+            if (path != null && path.exists()) {
+                IncludePartsInfo partsInfo = dynamicResourceProvider.getIncludePartsInfoFactory().getIncludePartsInfo(path);
+                if(partsInfo != null) {
+                    IncludePartInfo partInfo = partsInfo.getPart(part);
+                    if(partInfo != null) {
+                        String matchingTheme = partInfo.getMatchingTheme(themes);
+                        if(matchingTheme != null) {
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+            
+        } catch (Exception e) {
+            ExtensionFunctionUtils.setExtensionFunctionError(e);
+            throw e;
+        }
+    } 
+    
+    
     public static String getResolvedURI() {
         return resolvedUri.get();
@@ -375 +440 @@
         }
     }
+    
+    public static final String getModuleFromSystemId(XsltContext context) {
+        String sysid = context.getSystemId();
+        if(sysid.startsWith("module://")) {
+            int ind = sysid.indexOf('/', 9);
+            String module = sysid.substring(9, ind);
+            return module;
+        }
+        return "";
+    }
 
     public static boolean isIncludeDocument(XsltContext context) {
         return context.getDocumentElementName().equals("include_parts");
     }
+
 }// end of class IncludeDocumentExtension

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtensionSaxon1.java

@@ -44 +44 @@
     }
     
+    public static boolean exists(Context context,String path_str,String part,TargetGenerator targetgen,String targetkey,
+            String module,String search, String tenant, String language) throws Exception {    
+        try {
+            XsltContext xsltContext=new XsltContextSaxon1(context);
+            return IncludeDocumentExtension.exists(xsltContext,path_str,part,targetgen,targetkey,
+                                                   module,search, tenant, language);
+        } catch(Exception x) {
+            ExtensionFunctionUtils.setExtensionFunctionError(x);
+            throw x;
+        }
+    }
+    
     public static String getSystemId(Context context) {
         XsltContext xsltContext=new XsltContextSaxon1(context);
@@ -52 +64 @@
         XsltContext xsltContext=new XsltContextSaxon1(context);
         return IncludeDocumentExtension.getRelativePathFromSystemId(xsltContext);
+    }
+    
+    public static final String getModuleFromSystemId(Context context) {
+        XsltContext xsltContext = new XsltContextSaxon1(context);
+        return IncludeDocumentExtension.getModuleFromSystemId(xsltContext);
     }
     

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtensionSaxon2.java

@@ -46 +46 @@
     }
     
+    public static boolean exists(XPathContext context,String path_str,String part,TargetGenerator targetgen,String targetkey,
+            String module,String search, String tenant, String language) throws Exception {    
+        try {
+            XsltContext xsltContext=new XsltContextSaxon2(context);
+            return IncludeDocumentExtension.exists(xsltContext,path_str,part,targetgen,targetkey,
+                                                   module,search, tenant, language);
+        } catch(Exception x) {
+            ExtensionFunctionUtils.setExtensionFunctionError(x);
+            throw x;
+        }
+    }
+    
     public static String getSystemId(XPathContext context) {
         XsltContext xsltContext=new XsltContextSaxon2(context);
@@ -54 +66 @@
         XsltContext xsltContext=new XsltContextSaxon2(context);
         return IncludeDocumentExtension.getRelativePathFromSystemId(xsltContext);
+    }
+    
+    public static final String getModuleFromSystemId(XPathContext context) {
+        XsltContext xsltContext = new XsltContextSaxon2(context);
+        return IncludeDocumentExtension.getModuleFromSystemId(xsltContext);
     }
     

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludePartInfo.java

@@ -1 +1 @@
 package de.schlund.pfixxml;
 
+import java.util.HashSet;
 import java.util.Set;
 
 public class IncludePartInfo {
 
-    private String name;
-    private boolean render;
-    private Set<String> renderVariants;
+    private final String name;
+    private final boolean render;
+    private final Set<String> renderVariants;
+    private final Set<String> themes;
     
     public IncludePartInfo(String name, boolean render, Set<String> renderVariants) {
@@ -13 +15 @@
         this.render = render;
         this.renderVariants = renderVariants;
+        this.themes = new HashSet<String>();
     }
     
@@ -27 +30 @@
     }
     
+    public Set<String> getThemes() {
+        return themes;
+    }
+    
+    void addTheme(String theme) {
+        themes.add(theme);
+    }
+    
+    public String getMatchingTheme(String[] themeList) {
+        for(String theme: themeList) {
+            if(themes.contains(theme)) {
+                return theme;
+            }
+        }
+        return null;
+    }
+
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludePartsInfo.java

@@ -1 +1 @@
 package de.schlund.pfixxml;
 
+import java.util.Collections;
 import java.util.Map;
 
 public class IncludePartsInfo {
     
-    private Map<String, IncludePartInfo> parts;
+    private final Map<String, IncludePartInfo> parts;
     private long lastMod;
     
-    public void setParts(Map<String, IncludePartInfo> parts) {
-        this.parts = parts;
+    public IncludePartsInfo(Map<String, IncludePartInfo> parts) {
+        this.parts = Collections.unmodifiableMap(parts);
     }
     
@@ -16 +17 @@
     }
     
-    public void setLastMod(long lastMod) {
-        this.lastMod = lastMod;
+    public IncludePartInfo getPart(String partName) {
+        return parts.get(partName);
     }
     
@@ -24 +25 @@
     }
     
+    void setLastMod(long lastMod) {
+        this.lastMod = lastMod;
+    }
+    
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludePartsInfoFactory.java

@@ -9 +9 @@
 public class IncludePartsInfoFactory {
     
-    private Map<String, IncludePartsInfo> urisToInfo;
-    private boolean reloadable;
+    private final Map<String, IncludePartsInfo> urisToInfo;
+    private final boolean reloadable;
     
     public IncludePartsInfoFactory() {
         urisToInfo = new HashMap<String, IncludePartsInfo>();
         String mode = EnvironmentProperties.getProperties().getProperty("mode");
-        if(mode != null && !mode.equals("prod")) reloadable = true;
+        reloadable = !"prod".equals(mode);
     }
     
@@ -28 +28 @@
     public IncludePartsInfo getIncludePartsInfo(Resource resource) throws IncludePartsInfoParsingException {
         String uri = resource.toURI().toString();
-        IncludePartsInfo info = urisToInfo.get(uri);
+        IncludePartsInfo info = null;
+        synchronized(urisToInfo) {
+            info = urisToInfo.get(uri);
+        }
         if(info == null || (reloadable && (info.getLastMod() < resource.lastModified()))) {
             info = IncludePartsInfoParser.parse(resource);
-            urisToInfo.put(uri, info);
+            synchronized(urisToInfo) {
+                urisToInfo.put(uri, info);
+            }
         }
         return info;
@@ -37 +42 @@
     
     public void reset() {
-        urisToInfo.clear();
+        synchronized(urisToInfo) {
+            urisToInfo.clear();
+        }
     }
     

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludePartsInfoParser.java

@@ -44 +44 @@
             throw new IncludePartsInfoParsingException(source.getSystemId(), x);
         }
-        IncludePartsInfo info = new IncludePartsInfo();
-        info.setParts(handler.getParts());
-        return info;
+        return new IncludePartsInfo(handler.getParts());
     }
     
@@ -53 +51 @@
         private int level;
         private boolean isIncludeParts;
+        
+        private IncludePartInfo currentInfo;
+        
         private Map<String, IncludePartInfo> includePartInfos = new HashMap<String, IncludePartInfo>();
         
@@ -66 +67 @@
                     isIncludeParts = true;
                 }
-            } else if(level == 2 && isIncludeParts) {
-                if(localName.equals("part")) {
-                    String partName = attributes.getValue("name");
-                    if(partName != null) {
-                        partName = partName.trim();
-                        boolean render = false;
-                        String val = attributes.getValue("render");
-                        if(val != null) {
-                            render = Boolean.parseBoolean(val);
+            } else if(isIncludeParts) {
+                if(level == 2) {
+                    if(localName.equals("part")) {
+                        String partName = attributes.getValue("name");
+                        if(partName != null) {
+                            partName = partName.trim();
+                            boolean render = false;
+                            String val = attributes.getValue("render");
+                            if(val != null) {
+                                render = Boolean.parseBoolean(val);
+                            }
+                            String[] variants = null;
+                            val = attributes.getValue("render-variants");
+                            if(val != null) {
+                                val = val.trim();
+                                variants = val.split("\\s+");
+                            }
+                            Set<String> variantSet = new HashSet<String>();
+                            if(variants != null) {
+                                for(String variant: variants) variantSet.add(variant);
+                            }
+                            currentInfo = new IncludePartInfo(partName, render, variantSet);
+                            includePartInfos.put(partName, currentInfo);
                         }
-                        String[] variants = null;
-                        val = attributes.getValue("render-variants");
-                        if(val != null) {
-                            val = val.trim();
-                            variants = val.split("\\s+");
+                    }
+                } else if(level == 3) {
+                    if(localName.equals("theme")) {
+                        String themeName = attributes.getValue("name");
+                        if(themeName != null) {
+                            themeName = themeName.trim();
+                            currentInfo.addTheme(themeName);
                         }
-                        Set<String> variantSet = new HashSet<String>();
-                        if(variants != null) {
-                            for(String variant: variants) variantSet.add(variant);
-                        }
-                        IncludePartInfo info = new IncludePartInfo(partName, render, variantSet);
-                        includePartInfos.put(partName, info);
                     }
                 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/resources/DynamicResourceProvider.java

@@ -226 +226 @@
     }
     
+    public IncludePartsInfoFactory getIncludePartsInfoFactory() {
+        return incInfo;
+    }
+    
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/TargetGenerator.java

@@ -83 +83 @@
 import de.schlund.pfixxml.event.ConfigurationChangeListener;
 import de.schlund.pfixxml.resources.DocrootResource;
+import de.schlund.pfixxml.resources.DynamicResourceProvider;
 import de.schlund.pfixxml.resources.FileResource;
 import de.schlund.pfixxml.resources.ModuleResource;
 import de.schlund.pfixxml.resources.Resource;
 import de.schlund.pfixxml.resources.ResourceFinder;
+import de.schlund.pfixxml.resources.ResourceProviderRegistry;
 import de.schlund.pfixxml.resources.ResourceUtil;
 import de.schlund.pfixxml.resources.ResourceVisitor;
@@ -210 +212 @@
         sharedLeafFactory = new SharedLeafFactory();
         pageInfoFactory = new PageInfoFactory();
-        includePartsInfo = new IncludePartsInfoFactory();
+        includePartsInfo = ((DynamicResourceProvider)ResourceProviderRegistry.getResourceProvider("dynamic")).getIncludePartsInfoFactory();
         Meminfo meminfo = new Meminfo();
         meminfo.print("TG: Before loading " + config_path.toString());

trunk/pustefix-core/src/main/resources/PUSTEFIX-INF/xsl/include.xsl

@@ -471 +471 @@
         </xsl:choose>
       </ixsl:with-param>
-      <xsl:if test="@module">
-        <ixsl:with-param name="module"><xsl:value-of select="@module"/></ixsl:with-param>
-      </xsl:if>
+      <ixsl:with-param name="module">
+        <xsl:choose>
+          <xsl:when test="@module">
+            <xsl:value-of select="@module"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="include:getModuleFromSystemId()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:with-param>
       <xsl:if test="@search">
         <ixsl:with-param name="search"><xsl:value-of select="@search"/></ixsl:with-param>
@@ -479 +486 @@
     </ixsl:call-template>
   </xsl:template>
+
+  <xsl:template match="pfx:checkinclude">
+    <xsl:param name="part"><xsl:value-of select="@part"/></xsl:param>
+    <xsl:param name="href"><xsl:value-of select="@href"/></xsl:param>
+    <xsl:param name="module"><xsl:value-of select="@module"/></xsl:param>
+    <xsl:param name="search"><xsl:value-of select="@search"/></xsl:param>
+    <xsl:variable name="module_name">
+      <xsl:choose>
+        <xsl:when test="@module='PAGEDEF' or @module='pagedef'">
+          <xsl:value-of select="$__defining_module"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$module"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="realpath">
+      <xsl:choose>
+        <xsl:when test="not($href='')">
+          <xsl:value-of select="$href"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="include:getRelativePathFromSystemId()"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="include:exists($realpath, $part, $__target_gen, $__target_key, $module, $search, $tenant, $lang)">
+      <xsl:apply-templates/>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="pfx:checkinclude[@level='runtime']">
+    <ixsl:if test="true()">
+      <ixsl:variable name="_href_">
+        <xsl:choose>
+          <xsl:when test="pfx:href">
+            <xsl:apply-templates select="pfx:href/node()"/>
+          </xsl:when>
+          <xsl:when test="@href">
+            <xsl:value-of select="@href"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="include:getRelativePathFromSystemId()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:variable>
+      <ixsl:variable name="_part_">
+        <xsl:choose>
+          <xsl:when test="pfx:part">
+            <xsl:apply-templates select="pfx:part/node()"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="@part"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:variable>
+      <ixsl:variable name="_module_">
+        <xsl:choose>
+          <xsl:when test="@module">
+            <xsl:value-of select="module"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="include:getModuleFromSystemId()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:variable>
+      <ixsl:if test="pfx:checkInclude($_href_, $_part_, $_module_, '{@search}')">
+        <xsl:apply-templates/>
+      </ixsl:if>
+    </ixsl:if>
+  </xsl:template>
+
+  <xsl:template match="pfx:checknoinclude">
+    <xsl:param name="part"><xsl:value-of select="@part"/></xsl:param>
+    <xsl:param name="href"><xsl:value-of select="@href"/></xsl:param>
+    <xsl:param name="module"><xsl:value-of select="@module"/></xsl:param>
+    <xsl:param name="search"><xsl:value-of select="@search"/></xsl:param>
+    <xsl:variable name="module_name">
+      <xsl:choose>
+        <xsl:when test="@module='PAGEDEF' or @module='pagedef'">
+          <xsl:value-of select="$__defining_module"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$module"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="realpath">
+      <xsl:choose>
+        <xsl:when test="not($href='')">
+          <xsl:value-of select="$href"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="include:getRelativePathFromSystemId()"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="not(include:exists($realpath, $part, $__target_gen, $__target_key, $module, $search, $tenant, $lang))">
+      <xsl:apply-templates/>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="pfx:checknoinclude[@level='runtime']">
+    <ixsl:if test="true()">
+      <ixsl:variable name="_href_">
+        <xsl:choose>
+          <xsl:when test="pfx:href">
+            <xsl:apply-templates select="pfx:href/node()"/>
+          </xsl:when>
+          <xsl:when test="@href">
+            <xsl:value-of select="@href"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="include:getRelativePathFromSystemId()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:variable>
+      <ixsl:variable name="_part_">
+        <xsl:choose>
+          <xsl:when test="pfx:part">
+            <xsl:apply-templates select="pfx:part/node()"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="@part"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:variable>
+      <ixsl:variable name="_module_">
+        <xsl:choose>
+          <xsl:when test="@module">
+            <xsl:value-of select="module"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="include:getModuleFromSystemId()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ixsl:variable>
+      <ixsl:if test="not(pfx:checkInclude($_href_, $_part_, $_module_, '{@search}'))">
+        <xsl:apply-templates/>
+      </ixsl:if>
+    </ixsl:if>
+  </xsl:template>
+  
+  <xsl:template match="pfx:href"/>
+  <xsl:template match="pfx:part"/>
 
   <xsl:template name="pfx:image_register_src">
@@ -682 +834 @@
   </func:function>
  
+  <func:function name="pfx:checkInclude">
+    <xsl:param name="href"/>
+    <xsl:param name="part"/>
+    <xsl:param name="module"/>
+    <xsl:param name="search"/>
+    <func:result select="include:exists($href, $part, $__target_gen, $__target_key, $module, $search, $tenant, $lang)"/>
+  </func:function>
+ 
 </xsl:stylesheet>