You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/11/10 18:11:49 UTC
cvs commit: cocoon-lenya/src/webapp/lenya lucene.xmap
michi 2003/11/10 09:11:49
Modified: src/webapp global-sitemap.xmap
src/webapp/lenya lucene.xmap
Log:
lucene mounting generalized
Revision Changes Path
1.28 +1 -23 cocoon-lenya/src/webapp/global-sitemap.xmap
Index: global-sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/global-sitemap.xmap,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- global-sitemap.xmap 10 Nov 2003 13:09:17 -0000 1.27
+++ global-sitemap.xmap 10 Nov 2003 17:11:48 -0000 1.28
@@ -631,30 +631,8 @@
<!-- Search with Lucene -->
<map:pipeline>
- <map:match pattern="lucene/**">
- <map:mount uri-prefix="lucene" src="lenya/lucene.xmap" check-reload="true" reload-method="synchron"/>
- </map:match>
<map:match pattern="*/search-*/lucene">
- <map:generate type="serverpages" src="lenya/content/search/search-and-results.xsp">
- <map:parameter name="max-hits-per-page" value="3"/>
- <map:parameter name="max-pages" value="7"/>
- <map:parameter name="number-of-pubs" value="1"/>
- <map:parameter name="pub0-id" value="{1}"/>
- <map:parameter name="pub0-name" value="{1}"/>
- <map:parameter name="pub0-index-dir" value="lenya/pubs/{1}/work/search/lucene/index/{2}/index"/>
- <map:parameter name="pub0-excerpt-dir" value="lenya/pubs/{1}/work/search/lucene/htdocs_dump/{2}"/>
- <map:parameter name="pub0-prefix" value=""/>
- </map:generate>
- <map:transform src="lenya/xslt/search/sort.xsl"/>
-
- <map:act type="resource-exists" src="lenya/pubs/{1}/lenya/xslt/search/search-and-results.xsl">
- <map:transform src="lenya/pubs/{../1}/lenya/xslt/search/search-and-results.xsl"/>
- <map:serialize type="html"/>
- </map:act>
- <map:transform src="lenya/xslt/search/search-and-results.xsl">
- <map:parameter name="area" value="{2}"/>
- </map:transform>
- <map:serialize type="html"/>
+ <map:mount uri-prefix="" src="lenya/{fallback:lucene.xmap}" check-reload="true" reload-method="synchron"/>
</map:match>
<map:handle-errors type="500">
<map:serialize type="xml"/>
1.7 +31 -40 cocoon-lenya/src/webapp/lenya/lucene.xmap
Index: lucene.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/lucene.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lucene.xmap 4 Mar 2003 21:44:16 -0000 1.6
+++ lucene.xmap 10 Nov 2003 17:11:48 -0000 1.7
@@ -1,57 +1,48 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:actions/>
- <map:selectors/>
- </map:components>
-
- <map:views>
- <map:view name="xml" from-label="xml">
- <map:serialize type="xml"/>
- </map:view>
- </map:views>
+ <map:components/>
+
+ <map:pipelines>
- <map:pipelines>
- <!-- Create Search Index -->
<map:pipeline>
- <map:match pattern="create">
- <map:generate type="serverpages" src="content/search/create-index.xsp"/>
- <map:transform src="xslt/search/dynamic-page2html.xsl">
- <map:parameter name="view-source" value="lucene/create-index.xsp"/>
+ <map:match pattern="*/search-*/lucene">
+ <map:generate type="serverpages" src="content/search/search-and-results.xsp">
+ <map:parameter name="max-hits-per-page" value="3"/>
+ <map:parameter name="max-pages" value="7"/>
+ <map:parameter name="number-of-pubs" value="1"/>
+ <map:parameter name="pub0-id" value="{1}"/>
+ <map:parameter name="pub0-name" value="{1}"/>
+ <map:parameter name="pub0-index-dir" value="pubs/{1}/work/search/lucene/index/{2}/index"/>
+ <map:parameter name="pub0-excerpt-dir" value="pubs/{1}/work/search/lucene/htdocs_dump/{2}"/>
+ <map:parameter name="pub0-prefix" value=""/>
+ </map:generate>
+ <map:transform src="xslt/search/sort.xsl"/>
+
+ <map:act type="resource-exists" src="pubs/{1}/lenya/xslt/search/search-and-results.xsl">
+ <map:transform src="pubs/{../1}/lenya/xslt/search/search-and-results.xsl"/>
+ <map:serialize type="html"/>
+ </map:act>
+ <map:transform src="xslt/search/search-and-results.xsl">
+ <map:parameter name="area" value="{2}"/>
</map:transform>
<map:serialize type="html"/>
</map:match>
- <map:handle-errors>
+ <map:handle-errors type="500">
<map:serialize type="xml"/>
</map:handle-errors>
</map:pipeline>
- <!-- /Create Search Index -->
-
- <!-- Search and Result Screen -->
- <map:pipeline>
- <map:match pattern="search">
- <map:generate type="serverpages" src="content/search/search-and-results.xsp" label="xml"/>
+ <!-- Lucene web based administration -->
<!--
- <map:transform src="xslt/search/dynamic-page2html.xsl">
- <map:parameter name="view-source" value="lucene/search-index.xsp"/>
- </map:transform>
--->
- <map:transform src="xslt/search/search-and-results.xsl"/>
- <map:serialize type="html"/>
+ <map:pipeline>
+ <map:match pattern="lucene/**">
+ <map:mount uri-prefix="lucene" src="lucene.xmap" check-reload="true" reload-method="synchron"/>
</map:match>
- <map:handle-errors>
- <map:serialize type="xml"/>
- </map:handle-errors>
</map:pipeline>
- <!-- /Search and Result Screen -->
- </map:pipelines>
+-->
+ </map:pipelines>
+
</map:sitemap>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org