You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2006/07/28 07:43:31 UTC

svn commit: r426391 - in /lenya/trunk/src/modules: lucene/sitemap.xmap xhtml/sitemap.xmap

Author: chestnut
Date: Thu Jul 27 22:43:31 2006
New Revision: 426391

URL: http://svn.apache.org/viewvc?rev=426391&view=rev
Log:
Allow nested documents to be indexed

Modified:
    lenya/trunk/src/modules/lucene/sitemap.xmap
    lenya/trunk/src/modules/xhtml/sitemap.xmap

Modified: lenya/trunk/src/modules/lucene/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/sitemap.xmap?rev=426391&r1=426390&r2=426391&view=diff
==============================================================================
--- lenya/trunk/src/modules/lucene/sitemap.xmap (original)
+++ lenya/trunk/src/modules/lucene/sitemap.xmap Thu Jul 27 22:43:31 2006
@@ -112,7 +112,7 @@
       </map:match>
 
       <!-- {pub-id}/{area}{doc-id}/{language} -->
-      <map:match pattern="index-document/*/*/*/*.xml">
+      <map:match pattern="index-document/*/*/**/*.xml">
         <map:generate src="{resource-type:{doc-info:{1}:{2}:/{3}:{4}:resourceType}:format-luceneIndex}/{1}/{2}/{3}/{4}"/>
         <map:transform src="fallback://lenya/modules/lucene/xslt/index.xsl">
           <map:parameter name="index" value="{1}-{2}"/>
@@ -122,7 +122,7 @@
         <map:serialize type="xml"/>
       </map:match>
       
-      <map:match pattern="delete-document/*/*/*/*.xml">
+      <map:match pattern="delete-document/*/*/**/*.xml">
         <map:generate src="context://lenya/content/util/empty.xml"/>
         <map:transform src="fallback://lenya/modules/lucene/xslt/delete.xsl">
           <map:parameter name="index" value="{1}-{2}"/>

Modified: lenya/trunk/src/modules/xhtml/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/sitemap.xmap?rev=426391&r1=426390&r2=426391&view=diff
==============================================================================
--- lenya/trunk/src/modules/xhtml/sitemap.xmap (original)
+++ lenya/trunk/src/modules/xhtml/sitemap.xmap Thu Jul 27 22:43:31 2006
@@ -39,7 +39,7 @@
     <map:pipeline>
       
       <!-- {pub-id}/{area}{doc-id}/{language} -->
-      <map:match pattern="metadata/*/*/*/*">
+      <map:match pattern="metadata/*/*/**/*">
         <map:generate type="lenyaMetaData">
           <map:parameter name="pubid" value="{1}"/>
           <map:parameter name="area" value="{2}"/>
@@ -50,7 +50,7 @@
       </map:match>
       
       <!-- {pub-id}/{area}{doc-id}/{language} -->
-      <map:match pattern="lucene-index/*/*/*/*">
+      <map:match pattern="lucene-index/*/*/**/*">
         <map:aggregate element="cmsbody">
           <map:part src="lenyadoc://{1}/{2}/{4}//{3}"/>
           <map:part src="cocoon:/metadata/{1}/{2}/{3}/{4}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org


Re: svn commit: r426391 - in /lenya/trunk/src/modules: lucene/sitemap.xmap xhtml/sitemap.xmap

Posted by Andreas Hartmann <an...@apache.org>.
Hi Doug,

chestnut@apache.org wrote:

>        <!-- {pub-id}/{area}{doc-id}/{language} -->
> -      <map:match pattern="index-document/*/*/*/*.xml">
> +      <map:match pattern="index-document/*/*/**/*.xml">

thanks a lot for the fix!

-- Andreas

>          <map:generate src="{resource-type:{doc-info:{1}:{2}:/{3}:{4}:resourceType}:format-luceneIndex}/{1}/{2}/{3}/{4}"/>
>          <map:transform src="fallback://lenya/modules/lucene/xslt/index.xsl">
>            <map:parameter name="index" value="{1}-{2}"/>
> @@ -122,7 +122,7 @@
>          <map:serialize type="xml"/>
>        </map:match>
>        
> -      <map:match pattern="delete-document/*/*/*/*.xml">
> +      <map:match pattern="delete-document/*/*/**/*.xml">
>          <map:generate src="context://lenya/content/util/empty.xml"/>
>          <map:transform src="fallback://lenya/modules/lucene/xslt/delete.xsl">
>            <map:parameter name="index" value="{1}-{2}"/>
> 
> Modified: lenya/trunk/src/modules/xhtml/sitemap.xmap
> URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/sitemap.xmap?rev=426391&r1=426390&r2=426391&view=diff
> ==============================================================================
> --- lenya/trunk/src/modules/xhtml/sitemap.xmap (original)
> +++ lenya/trunk/src/modules/xhtml/sitemap.xmap Thu Jul 27 22:43:31 2006
> @@ -39,7 +39,7 @@
>      <map:pipeline>
>        
>        <!-- {pub-id}/{area}{doc-id}/{language} -->
> -      <map:match pattern="metadata/*/*/*/*">
> +      <map:match pattern="metadata/*/*/**/*">
>          <map:generate type="lenyaMetaData">
>            <map:parameter name="pubid" value="{1}"/>
>            <map:parameter name="area" value="{2}"/>
> @@ -50,7 +50,7 @@
>        </map:match>
>        
>        <!-- {pub-id}/{area}{doc-id}/{language} -->
> -      <map:match pattern="lucene-index/*/*/*/*">
> +      <map:match pattern="lucene-index/*/*/**/*">
>          <map:aggregate element="cmsbody">
>            <map:part src="lenyadoc://{1}/{2}/{4}//{3}"/>
>            <map:part src="cocoon:/metadata/{1}/{2}/{3}/{4}"/>


-- 
Andreas Hartmann
Wyona Inc.  -   Open Source Content Management   -   Apache Lenya
http://www.wyona.com                      http://lenya.apache.org
andreas.hartmann@wyona.com                     andreas@apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org