Changeset 6050

Timestamp:

11/14/11 11:57:16 (6 months ago)

Author:

mtld

Message:

added searchengine sitemap generator, support for direct page alternative links

Location:

trunk/pustefix-core/src/main

Files:

• java/de/schlund/pfixcore/util/TransformerCallback.java (modified) (2 diffs)
• java/de/schlund/pfixcore/workflow/Context.java (modified) (1 diff)
• java/de/schlund/pfixcore/workflow/ContextImpl.java (modified) (1 diff)
• java/de/schlund/pfixcore/workflow/SiteMap.java (modified) (10 diffs)
• java/de/schlund/pfixcore/workflow/context/RequestContextImpl.java (modified) (1 diff)
• java/org/pustefixframework/config/project/parser/SiteMapRequestHandlerParsingHandler.java (added)
• java/org/pustefixframework/http/SiteMapRequestHandler.java (added)
• java/org/pustefixframework/test/MockContext.java (modified) (2 diffs)
• resources/META-INF/org/pustefixframework/config/project/parser/project-config.xml (modified) (2 diffs)
• resources/PUSTEFIX-INF/xsl/functions.xsl (modified) (1 diff)
• resources/PUSTEFIX-INF/xsl/navigation.xsl (modified) (4 diffs)

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/util/TransformerCallback.java

@@ -409 +409 @@
     }
     
-    public static String omitPage(RequestContextImpl requestContext, TargetGenerator gen, String pageName, String lang) throws Exception {
+    public static String omitPage(RequestContextImpl requestContext, TargetGenerator gen, String pageName, String lang, String altKey) throws Exception {
         try {
             ContextImpl context = requestContext.getParentContext();
@@ -423 +423 @@
                 return langPrefix;
             } else {
-                String alias = gen.getSiteMap().getAlias(pageName, lang);
+                String alias = gen.getSiteMap().getAlias(pageName, lang, altKey);
                 if(langPrefix.length() > 0) {
                     alias = langPrefix + "/" + alias;

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/Context.java

@@ -78 +78 @@
     
     void setPageAlternative(String key);
+    String getPageAlternative();
 
     void addCookie(Cookie cookie);

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/ContextImpl.java

@@ -218 +218 @@
     }
     
+    public String getPageAlternative() {
+        return getRequestContextForCurrentThreadWithError().getPageAlternative();
+    }
+    
     public void setVariant(Variant variant) {
         getRequestContextForCurrentThreadWithError().setVariantForThisRequestOnly(variant);

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/SiteMap.java

@@ -19 +19 @@
 package de.schlund.pfixcore.workflow;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
@@ -62 +63 @@
     private Set<Resource> fileDependencies = new HashSet<Resource>();
     private Map<String, Document> langToDoc = new HashMap<String, Document>();
-    private List<Page> pageList;
-    private Map<String, Page> pageNameToPage;
-    private Map<String, Map<String, String>> aliasMaps;
-    private Map<String, Map<String, String>> pageMaps;
-    private Map<String, Page> pageAlternativeToPage;
-    private Map<String, Page> pageAliasToPage;
+    private List<Page> pageList = new ArrayList<Page>();
+    private Map<String, Page> pageNameToPage = new LinkedHashMap<String, Page>();
+    private Map<String, Map<String, String>> aliasMaps = new HashMap<String, Map<String, String>>();
+    private Map<String, Map<String, String>> pageMaps = new HashMap<String, Map<String, String>>();
+    private Map<String, Page> pageAlternativeToPage = new HashMap<String, Page>();
+    private Map<String, Page> pageAliasToPage = new HashMap<String, Page>();
     private boolean provided;
+    
+    public SiteMap(File siteMapFile, File[] siteMapAliasFiles) throws IOException, SAXException {
+        if(siteMapFile.exists()) {
+            Document siteMapDoc = Xml.parseMutable(siteMapFile);
+            readSiteMap(siteMapDoc.getDocumentElement());
+            for(File siteMapAliasFile: siteMapAliasFiles) {
+                readSiteMapAliases(Xml.parseMutable(siteMapAliasFile));
+            }
+            provided = true;
+        }
+    }
     
     public SiteMap(Resource siteMapFile) throws IOException, SAXException, XMLException {
@@ -76 +88 @@
         if(uriStr.endsWith("depend.xml")) uriStr = uriStr.substring(0, uriStr.length() -10) + "sitemap.xml";
         siteMapFile = ResourceUtil.getResource(uriStr);
-        
-        pageList = new ArrayList<Page>();
-        pageNameToPage = new HashMap<String, Page>();
-        pageAlternativeToPage = new HashMap<String, Page>();
-        pageAliasToPage = new HashMap<String, Page>();
         
         if(siteMapFile.exists()) {
@@ -133 +140 @@
             readSiteMap(siteMapDoc.getDocumentElement());
             
-            aliasMaps = new HashMap<String, Map<String, String>>();
-            pageMaps = new HashMap<String, Map<String, String>>();
-            
             Resource res = ResourceUtil.getResource("/WEB-INF/sitemap-aliases.xml");
             if(res.exists()) {
@@ -155 +159 @@
         
     }
-   
+    
     public boolean isProvided() {
         return provided;
@@ -171 +175 @@
         String name = pageElem.getAttribute("name").trim();
         Page page = new Page(name);
+        String internal = pageElem.getAttribute("internal").trim();
+        if(internal.length() > 0) {
+            page.internal = Boolean.valueOf(internal);
+        }
         pageNameToPage.put(page.name, page);
         String alias = pageElem.getAttribute("alias").trim();
@@ -236 +244 @@
     }
     
-    public String getAlias(String name, String lang) {
-        String alias = null;
+    public List<String> getPageNames(boolean excludeInternal) {
+        List<String> pageNames = new ArrayList<String>();
+        for(Page page: pageList) {
+            getPageNames(page, excludeInternal, pageNames);
+        }
+        return pageNames;
+    }
+    
+    private void getPageNames(Page page, boolean excludeInternal, List<String> pageNames) {
+        if(!excludeInternal || !page.internal) {
+            pageNames.add(page.name);
+            for(Page child: page.pages) {
+                getPageNames(child, excludeInternal, pageNames);
+            }
+        }
+    }
+    
+    public String getAlias(final String name, final String lang) {
+        String aliasName = name;
+        if(pageNameToPage != null) {
+            Page page = pageNameToPage.get(name);
+            if(page != null && page.alias != null) {
+                aliasName = page.alias;
+            }
+        }
+        String aliasTranslated = null;
         if(lang != null) {
             if(aliasMaps != null) {
                 Map<String, String> aliases = aliasMaps.get(lang);
                 if(aliases != null) {
-                    alias = aliases.get(name);
-                }
-                if(alias == null) {
+                    aliasTranslated = aliases.get(aliasName);
+                }
+                if(aliasTranslated == null) {
                     int ind = lang.indexOf('_');
                     if(ind > -1) {
-                        lang = lang.substring(0, ind);
-                        aliases = aliasMaps.get(lang);
+                        String mainLang = lang.substring(0, ind);
+                        aliases = aliasMaps.get(mainLang);
                         if(aliases != null) {
-                            alias = aliases.get(name);
+                            aliasTranslated = aliases.get(aliasName);
                         }
                     }
@@ -256 +288 @@
             }
         }
-        if(alias == null) {
-            if(pageNameToPage != null) {
-                Page page = pageNameToPage.get(name);
-                if(page != null && page.alias != null) {
-                    alias = page.alias;
-                }
-            }
-        }
-        if(alias != null) {
-            return alias;
+        if(aliasTranslated != null) {
+            return aliasTranslated;
         } else {
-            return name;
+            return aliasName;
         }
     }
     
     public String getAlias(String name, String lang, String pageAlternativeKey) {
-        if(pageAlternativeKey == null) {
+        if(pageAlternativeKey == null || pageAlternativeKey.equals("")) {
             return getAlias(name, lang);
         } else {
@@ -330 +354 @@
                 }
             }
+            if(page != null) {
+                if(pageAliasToPage != null) {
+                    Page p = pageAliasToPage.get(page);
+                    if(p != null) page = p.name;
+                }
+            }
         }
         if(page == null) {
@@ -362 +392 @@
     }
     
-    
-    class Page {
+
+    
+    public class Page {
         
         String name;
+        boolean internal;
+        Map<String, String> customAttributes = new HashMap<String, String>();
         String alias;
         List<Page> pages = new ArrayList<Page>();

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/context/RequestContextImpl.java

@@ -252 +252 @@
     public void setPageAlternative(String key) {
         pageAlternativeKey = key;
+    }
+    
+    public String getPageAlternative() {
+        return pageAlternativeKey;
     }
     

trunk/pustefix-core/src/main/java/org/pustefixframework/test/MockContext.java

@@ -82 +82 @@
     private Set<String> pageNeedsDataSet = new HashSet<String>();
     private Set<String> pageAccessibleSet = new HashSet<String>();
-    
+    private String pageAltKey;
     
     public void addCookie(Cookie cookie) {
@@ -331 +331 @@
     
     public void setPageAlternative(String key) {
+        this.pageAltKey = key;
+    }
+    
+    public String getPageAlternative() {
+        return pageAltKey;
     }
     

trunk/pustefix-core/src/main/resources/META-INF/org/pustefixframework/config/project/parser/project-config.xml

@@ -40 +40 @@
   
   <!-- Creates request handler for search engine sitemaps -->
-  <!--
   <handler class="org.pustefixframework.config.project.parser.SiteMapRequestHandlerParsingHandler">
-    <match>/p:project-config/p:application/p:sitemaps-protocol-generator</match>
+    <match>/p:project-config/p:searchengine-sitemap</match>
   </handler>
-  -->
+  
   <handler class="org.pustefixframework.config.project.parser.StaticPathParsingHandler">
     <match>/p:project-config/p:application/p:static//p:path</match>
@@ -72 +71 @@
   </handler>
   
-  <!-- Adds Statistics bean -->
-  <!--
-  <handler class="org.pustefixframework.config.project.parser.StatisticsParsingHandler">
-    <match>/p:project-config/p:application</match>
-  </handler>
-  -->
   <!-- Reads path to depend.xml file -->
   <handler class="org.pustefixframework.config.project.parser.XMLGeneratorInfoParsingHandler">

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

@@ -123 +123 @@
     <xsl:param name="pageName"/>
     <xsl:param name="language"><xsl:value-of select="$lang"/></xsl:param>
-    <func:result select="callback:omitPage($__context__,$__target_gen,$pageName,$language)"/>
+    <xsl:param name="altKey"/>
+    <func:result select="callback:omitPage($__context__,$__target_gen,$pageName,$language,$altKey)"/>
   </func:function>
   

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

@@ -12 +12 @@
   <xsl:template match="pfx:normal"/>
   <xsl:template match="pfx:argument"/>
+  <xsl:template match="pfx:altkey"/>
   
   <xsl:template match="pfx:command">
@@ -157 +158 @@
       <xsl:with-param name="popupfeatures" select="@popupfeatures"/>
       <xsl:with-param name="popupid" select="@popupid"/>
+      <xsl:with-param name="altkey">
+        <xsl:choose>
+          <xsl:when test="./pfx:altkey">
+            <xsl:apply-templates select="./pfx:altkey/node()">
+              <xsl:with-param name="thepagename" select="@page"/>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="@altkey">
+            <xsl:value-of select="@altkey"/>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:with-param>
     </xsl:call-template>
   </xsl:template>
@@ -207 +220 @@
     <xsl:param name="popupfeatures"/>
     <xsl:param name="popupid"/>
+    <xsl:param name="altkey"/>
     <xsl:param name="nodata"/>
     <xsl:param name="args"/>
@@ -245 +259 @@
     </xsl:variable>
     <xsl:variable name="fulllink">
-      <ixsl:value-of select="$__contextpath"/>/<ixsl:value-of select="pfx:__omitPage({$mypage})"/><ixsl:value-of select="$__sessionIdPath"/>
+      <ixsl:variable name="tmpaltkey">
+        <xsl:if test="$altkey"><xsl:copy-of select="$altkey"/></xsl:if>
+      </ixsl:variable>
+      <ixsl:value-of select="$__contextpath"/>/<ixsl:value-of select="pfx:__omitPage({$mypage}, $lang, $tmpaltkey)"/><ixsl:value-of select="$__sessionIdPath"/>
       <ixsl:variable name="params">
       <xsl:if test="not($frame_impl='')">__frame=<xsl:value-of select="$frame_impl"/></xsl:if>