svn commit: r294903 - in /lenya/sandbox/search: ./: msg#00018 cms.lenya.cvs

Author: chestnut
Date: Tue Oct 4 12:35:24 2005
New Revision: 294903

URL: http://svn.apache.org/viewcvs?rev=294903&view=rev
Log:
made some updates to get search working,
separated index into live and authoring indexes

Modified:
lenya/sandbox/search/README-lenya-search
lenya/sandbox/search/src/cocoon/local.blocks.properties
lenya/sandbox/search/src/java/org/apache/lenya/lenya.roles
lenya/sandbox/search/src/modules/lucene/config/index_manager.xconf

lenya/sandbox/search/src/webapp/lenya/pubs/default/config/index_manager_index.xconf

lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java

lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
lenya/sandbox/search/src/webapp/lenya/usecases/lucene/usecase.xmap
lenya/sandbox/search/src/webapp/lenya/xslt/lucene/homepage2index.xsl
lenya/sandbox/search/src/webapp/lenya/xslt/lucene/links2index.xsl
lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2html.xsl
lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2opensearch.xsl
lenya/sandbox/search/src/webapp/lenya/xslt/lucene/xhtml2index.xsl

Modified: lenya/sandbox/search/README-lenya-search
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/README-lenya-search?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/README-lenya-search (original)
+++ lenya/sandbox/search/README-lenya-search Tue Oct 4 12:35:24 2005
@@ -49,7 +49,10 @@

First, copy the files in the root of the current trunk of lenya.
Second, copy the local.block.properties to the cocoon root and build cocoon.
-Third, clean and rebuild lenya.
+Third, delete the lucene indexes for the default pub:
+ src\webapp\lenya\pubs\default\work\search\lucene\index\authoring\index\*
+ src\webapp\lenya\pubs\default\work\search\lucene\index\live\index\*
+Fourth, clean and rebuild lenya.

U s e

@@ -132,3 +135,5 @@

I will provide a patch to avoid this in a short while, for the experimenting
with external code will be more easy to manage.
+
+* Make other usecases update indexes (edit, delete, rollback, etc)

Modified: lenya/sandbox/search/src/cocoon/local.blocks.properties
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/cocoon/local.blocks.properties?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/cocoon/local.blocks.properties (original)
+++ lenya/sandbox/search/src/cocoon/local.blocks.properties Tue Oct 4 12:35:24
2005
@@ -20,7 +20,7 @@
# NOTE for Devs: Update this number if this file is being updated.
# Also update the version number within
src/targets/init-build.xml

-lenya.blocks.properties.version=220218
+lenya.blocks.properties.version=290647

#------------------------------------------------------------------------------#
# Cocoon Blocks
#
@@ -113,7 +113,7 @@
#-----[dependency]: "apples" depends on "forms" (for samples).
include.block.apples=false
#-----[dependency]: "asciiart" is needed by "mail".
-include.block.asciiart=false
+include.block.asciiart=true
#-----[dependency]: "axis" is needed by "scratchpad".
include.block.axis=false
#-----[dependency]: "cron" is needed by "scratchpad".
@@ -126,7 +126,7 @@
include.block.faces=false
#-----[dependency]: "forms" depends on "xsp" (for samples).
#-----[dependency]: "forms" is needed by "apples", "javaflow", "lucene",
"ojb", "petstore", "tour".
-include.block.forms=true
+#include.block.forms=false
#-----[dependency]: "javaflow" depends on "forms", "ojb".
include.block.javaflow=false
include.block.jcr=true
@@ -135,7 +135,7 @@
include.block.jms=false
include.block.linotype=false
#-----[dependency]: "mail" depends on "asciiart".
-include.block.mail=false
+include.block.mail=true
include.block.midi=false
#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for
samples), "hsqldb" (for samples).
#-----[dependency]: "ojb" is needed by "javaflow".

Modified: lenya/sandbox/search/src/java/org/apache/lenya/lenya.roles
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/java/org/apache/lenya/lenya.roles?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/java/org/apache/lenya/lenya.roles (original)
+++ lenya/sandbox/search/src/java/org/apache/lenya/lenya.roles Tue Oct 4
12:35:24 2005
@@ -39,7 +39,7 @@
XML snippet which is then automatically passed to the service's
configure() method at initialization.

- $Id: lenya.roles 234485 2005-08-22 13:06:26Z andreas $
+ $Id: lenya.roles 290476 2005-09-20 15:44:16Z andreas $
-->

<!DOCTYPE role-list [
@@ -124,7 +124,7 @@

<role name="org.apache.lenya.workflow.WorkflowManager"
shorthand="workflow-manager"
- default-class="org.apache.lenya.cms.workflow.LenyaWorkflowManager"/>
+ default-class="org.apache.lenya.workflow.impl.WorkflowManagerImpl"/>

<role name="org.apache.lenya.cms.site.usecases.LinkRewriter"
shorthand="link-rewriter"
@@ -169,6 +169,14 @@
<role name="org.apache.lenya.cms.repository.RepositoryManager"
shorthand="repository-manager"
default-class="org.apache.lenya.cms.repository.RepositoryManagerImpl"/>
+
+ <role name="org.apache.lenya.cms.publication.PublicationManager"
+ shorthand="publication-manager"
+
default-class="org.apache.lenya.cms.publication.PublicationManagerImpl"/>
+
+ <role name="org.apache.lenya.notification.Notifier"
+ shorthand="notifier"
+ default-class="org.apache.lenya.notification.DefaultNotifier"/>

<role name="org.apache.lenya.cms.repository.NodeFactory"
shorthand="node-factory"

Modified: lenya/sandbox/search/src/modules/lucene/config/index_manager.xconf
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/modules/lucene/config/index_manager.xconf?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/modules/lucene/config/index_manager.xconf
(original)
+++ lenya/sandbox/search/src/modules/lucene/config/index_manager.xconf Tue Oct
4 12:35:24 2005
@@ -27,33 +27,6 @@


<indexes>
-
- 
- 
- 


<index id="HTML" analyzer="stopword_en"
directory="/home/robert/Projects/lenya-1.4.x/index/" >

Modified:
lenya/sandbox/search/src/webapp/lenya/pubs/default/config/index_manager_index.xconf
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/pubs/default/config/index_manager_index.xconf?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
---
lenya/sandbox/search/src/webapp/lenya/pubs/default/config/index_manager_index.xconf
(original)
+++
lenya/sandbox/search/src/webapp/lenya/pubs/default/config/index_manager_index.xconf
Tue Oct 4 12:35:24 2005
@@ -15,16 +15,26 @@
limitations under the License.
-->

- <xconf xpath="/cocoon/index_manager/indexes"
remove="/cocoon/index_manager/indexes/index"
unless="/cocoon/index_manager/indexes/index[@id = 'default']">
-
- <index id="default" analyzer="stopword_en"
directory="/home/robert/Projects/lenya-1.4.x/build/lenya/webapp/lenya/pubs/default/work/lucene/index"
>
- <structure>
- <field id="url" type="keyword" />
- <field id="title" type="text" storetext="true"/>
- <field id="description" type="text" storetext="true"/>
- <field id="subject" type="keyword" storetext="true" />

- <field id="body" type="text" storetext="true"/>
- </structure>
- </index>
+ <xconf xpath="/cocoon/index_manager/indexes"
remove="/cocoon/index_manager/indexes/index"
unless="/cocoon/index_manager/indexes/index[@id = 'default-live' or @id =
'default-authoring']">
+
+ <index id="default-live" analyzer="stopword_en"
directory="build/lenya/webapp/lenya/pubs/default/work/search/lucene/index/live/index"
>
+ <structure>
+ <field id="url" type="keyword" />
+ <field id="title" type="text" storetext="true"/>
+ <field id="description" type="text" storetext="true"/>
+ <field id="subject" type="keyword" storetext="true" />

+ <field id="body" type="text" storetext="true"/>
+ </structure>
+ </index>
+
+ <index id="default-authoring" analyzer="stopword_en"
directory="build/lenya/webapp/lenya/pubs/default/work/search/lucene/index/authoring/index"
>
+ <structure>
+ <field id="url" type="keyword" />
+ <field id="title" type="text" storetext="true"/>
+ <field id="description" type="text" storetext="true"/>
+ <field id="subject" type="keyword" storetext="true" />

+ <field id="body" type="text" storetext="true"/>
+ </structure>
+ </index>

</xconf>

Modified:
lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
---
lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
(original)
+++
lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
Tue Oct 4 12:35:24 2005
@@ -40,7 +40,7 @@
/**
* Deactivate usecase handler.
*
- * @version $Id: Deactivate.java 233165 2005-08-17 12:54:06Z andreas $
+ * @version $Id: Deactivate.java 264805 2005-08-30 16:20:15Z andreas $
*/
public class Deactivate extends DocumentUsecase implements DocumentVisitor {

Modified:
lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
---
lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
(original)
+++
lenya/sandbox/search/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
Tue Oct 4 12:35:24 2005
@@ -26,9 +26,15 @@
import java.util.Map;

import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.cocoon.components.ContextHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.lenya.ac.Identifiable;
+import org.apache.lenya.ac.User;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.DocumentIdentityMap;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Proxy;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.util.DocumentVisitor;
@@ -42,6 +48,9 @@
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
import org.apache.lenya.cms.workflow.WorkflowUtil;
+import org.apache.lenya.notification.Message;
+import org.apache.lenya.notification.NotificationException;
+import org.apache.lenya.notification.NotificationUtil;
import org.apache.lenya.workflow.WorkflowException;

import org.apache.excalibur.source.SourceResolver;
@@ -50,15 +59,18 @@
/**
* Publish usecase handler.
*
- * @version $Id: Publish.java 233165 2005-08-17 12:54:06Z andreas $
+ * @version $Id: Publish.java 290693 2005-09-21 13:32:31Z andreas $
*/
public class Publish extends DocumentUsecase implements DocumentVisitor {

+ protected static final String MESSAGE_SUBJECT = "notification-message";
+ protected static final String MESSAGE_DOCUMENT_PUBLISHED =
"document-published";
protected static final String MISSING_DOCUMENTS = "missingDocuments";
protected static final String SUBTREE = "subtree";
protected static final String ALLOW_SINGLE_DOCUMENT =
"allowSingleDocument";
protected static final String SCHEDULE = "schedule";
protected static final String SCHEDULE_TIME = "schedule.time";
+ protected static final String SEND_NOTIFICATION = "sendNotification";

/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
@@ -69,6 +81,8 @@
Date now = new GregorianCalendar().getTime();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
setParameter(SCHEDULE_TIME, format.format(now));
+
+ setParameter(SEND_NOTIFICATION, Boolean.TRUE);
}

/**
@@ -245,7 +259,13 @@

resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
source = resolver.resolveURI("cocoon://core/lucene/index.xml");
- InputSource xmlInputSource =
org.apache.cocoon.components.source.SourceUtil.getInputSource(source);
+ InputSource xmlInputSource =
org.apache.cocoon.components.source.SourceUtil.getInputSource(source);
+
+ boolean notify =
Boolean.valueOf(getBooleanCheckboxParameter(SEND_NOTIFICATION))
+ .booleanValue();
+ if (notify) {
+ sendNotification(authoringDocument);
+ }

} catch (Exception e) {
throw new RuntimeException(e);
@@ -260,6 +280,34 @@
this.manager.release(documentManager);
}
}
+ }
+
+ protected void sendNotification(Document authoringDocument) throws
DocumentBuildException,
+ NotificationException {
+ User sender = getSession().getUnitOfWork().getIdentity().getUser();
+ Identifiable[] recipients = { sender };
+ Document liveVersion =
getDocumentIdentityMap().getAreaVersion(authoringDocument,
+ Publication.LIVE_AREA);
+
+ String url;
+
+ Proxy proxy = liveVersion.getPublication().getProxy(liveVersion,
false);
+ if (proxy != null) {
+ url = proxy.getURL(liveVersion);
+ } else {
+ Request request = ContextHelper.getRequest(this.context);
+ final String serverUrl = "http://"; + request.getServerName() + ":"
+ + request.getServerPort();
+ final String webappUrl = liveVersion.getCanonicalWebappURL();
+ url = serverUrl + request.getContextPath() + webappUrl;
+ }
+ String[] params = { url };
+ Message message = new Message(MESSAGE_SUBJECT,
+ new String[0],
+ MESSAGE_DOCUMENT_PUBLISHED,
+ params);
+
+ NotificationUtil.notify(this.manager, recipients, sender, message);
}

/**

Modified: lenya/sandbox/search/src/webapp/lenya/usecases/lucene/usecase.xmap
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/usecases/lucene/usecase.xmap?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/webapp/lenya/usecases/lucene/usecase.xmap
(original)
+++ lenya/sandbox/search/src/webapp/lenya/usecases/lucene/usecase.xmap Tue Oct
4 12:35:24 2005
@@ -34,18 +34,12 @@

<map:pipelines>

- <map:pipeline>
- <map:match pattern="modules/*/**">
- <map:mount uri-prefix="modules/{1}/"
src="context://lenya/modules/{1}/sitemap.xmap" check-reload="true"
reload-method="synchron"/>
- </map:match>
- </map:pipeline>
-
<map:pipeline>

<map:match pattern="opensearch.xml">

<map:generate type="search">
- <map:parameter name="index"
value="{realpath://lenya/pubs/{page-envelope:publication-id}/work/lucene/index}"/>
+ <map:parameter name="index"
value="{realpath://lenya/pubs/{page-envelope:publication-id}/work/search/lucene/index}"/>
</map:generate>

<map:transform
src="fallback://lenya/xslt/lucene/search2opensearch.xsl">
@@ -88,18 +82,17 @@
</map:match>

<map:match pattern="search.xml">
- <map:generate type="search">
- <map:parameter name="index"
value="{realpath://lenya/pubs/{page-envelope:publication-id}/work/lucene/index}"/>
- </map:generate>
-
- <map:transform src="fallback://lenya/xslt/lucene/search2html.xsl">

- <map:parameter name="url" value="{page-envelope:document-url}"/>
- <map:parameter name="area" value="{page-envelope:area}"/>
- <map:parameter name="pub" value="{page-envelope:publication-id}"/>
- <map:parameter name="root"
value="{page-envelope:context-prefix}/{page-envelope:publication-id}/{page-envelope:area}"/>
- </map:transform>
+ <map:generate type="search">
+ <map:parameter name="index"
value="{realpath://lenya/pubs/{page-envelope:publication-id}/work/search/lucene/index/{page-envelope:area}/index}"/>
+ </map:generate>
+ <map:transform src="fallback://lenya/xslt/lucene/search2html.xsl">

+ <map:parameter name="url" value="{page-envelope:document-url}"/>
+ <map:parameter name="area" value="{page-envelope:area}"/>
+ <map:parameter name="pub" value="{page-envelope:publication-id}"/>
+ <map:parameter name="root"
value="{page-envelope:context-prefix}/{page-envelope:publication-id}/{page-envelope:area}"/>
+ </map:transform>

- <map:transform type="cinclude"/>
+ <map:transform type="cinclude"/>

<map:transform src="fallback://xslt/page2xhtml.xsl">
<map:parameter name="root"
value="{page-envelope:context-prefix}/{page-envelope:publication-id}/{page-envelope:area}"/>
@@ -122,12 +115,26 @@
<map:part
src="fallback://content/{page-envelope:area}/{page-envelope:document-id}/index_{page-envelope:document-language}.xml"/>
</map:aggregate>

- <map:transform
src="fallback://lenya/xslt/lucene/{page-envelope:document-type}2index.xsl">
- <map:parameter name="index" value="{page-envelope:publication-id}"/>
- <map:parameter name="action" value="index"/>
- <map:parameter name="url" value="{request:requestURI}"/>
- <map:parameter name="id" value="{page-envelope:document-url}"/>
- </map:transform>
+
+ <map:select type="request-parameter">
+ <map:parameter name="parameter-name" value="lenya.usecase"/>
+ <map:when test="workflow.publish">
+ <map:transform
src="fallback://lenya/xslt/lucene/{page-envelope:document-type}2index.xsl">
+ <map:parameter name="index"
value="{page-envelope:publication-id}-live"/>
+ <map:parameter name="action" value="index"/>
+ <map:parameter name="url" value="{request:requestURI}"/>
+ <map:parameter name="id" value="{page-envelope:document-url}"/>
+ </map:transform>
+ </map:when>
+ <map:otherwise>
+ <map:transform
src="fallback://lenya/xslt/lucene/{page-envelope:document-type}2index.xsl">
+ <map:parameter name="index"
value="{page-envelope:publication-id}-authoring"/>
+ <map:parameter name="action" value="index"/>
+ <map:parameter name="url" value="{request:requestURI}"/>
+ <map:parameter name="id" value="{page-envelope:document-url}"/>
+ </map:transform>
+ </map:otherwise>
+ </map:select>

<map:transform type="index2"/>
<map:serialize type="xml"/>
@@ -140,13 +147,26 @@
<map:part
src="fallback://content/{page-envelope:area}/{page-envelope:document-id}/index_{page-envelope:document-language}.xml.meta"/>
<map:part
src="fallback://content/{page-envelope:area}/{page-envelope:document-id}/index_{page-envelope:document-language}.xml"/>
</map:aggregate>
-
- <map:transform
src="fallback://lenya/xslt/lucene/{page-envelope:document-type}2index.xsl">
- <map:parameter name="index" value="{page-envelope:publication-id}"/>
- <map:parameter name="action" value="delete"/>
- <map:parameter name="url" value="{request:requestURI}"/>
- <map:parameter name="id" value="{page-envelope:document-url}"/>
- </map:transform>
+
+ <map:select type="request-parameter">
+ <map:parameter name="parameter-name" value="lenya.usecase"/>
+ <map:when test="workflow.deactivate">
+ <map:transform
src="fallback://lenya/xslt/lucene/{page-envelope:document-type}2index.xsl">
+ <map:parameter name="index"
value="{page-envelope:publication-id}-live"/>
+ <map:parameter name="action" value="delete"/>
+ <map:parameter name="url" value="{request:requestURI}"/>
+ <map:parameter name="id" value="{page-envelope:document-url}"/>
+ </map:transform>
+ </map:when>
+ <map:otherwise>
+ <map:transform
src="fallback://lenya/xslt/lucene/{page-envelope:document-type}2index.xsl">
+ <map:parameter name="index"
value="{page-envelope:publication-id}-authoring"/>
+ <map:parameter name="action" value="delete"/>
+ <map:parameter name="url" value="{request:requestURI}"/>
+ <map:parameter name="id" value="{page-envelope:document-url}"/>
+ </map:transform>
+ </map:otherwise>
+ </map:select>

<map:transform type="index2"/>
<map:serialize type="xml"/>

Modified: lenya/sandbox/search/src/webapp/lenya/xslt/lucene/homepage2index.xsl
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/xslt/lucene/homepage2index.xsl?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/webapp/lenya/xslt/lucene/homepage2index.xsl
(original)
+++ lenya/sandbox/search/src/webapp/lenya/xslt/lucene/homepage2index.xsl Tue
Oct 4 12:35:24 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->

-<xsl:stylesheet
+<xsl:stylesheet version="1.0"
xmlns="http://www.w3.org/1999/xhtml";
xmlns:lucene="http://apache.org/cocoon/lucene/1.0";
xmlns:dc="http://purl.org/dc/elements/1.1/";

Modified: lenya/sandbox/search/src/webapp/lenya/xslt/lucene/links2index.xsl
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/xslt/lucene/links2index.xsl?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/webapp/lenya/xslt/lucene/links2index.xsl (original)
+++ lenya/sandbox/search/src/webapp/lenya/xslt/lucene/links2index.xsl Tue Oct
4 12:35:24 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->

-<xsl:stylesheet
+<xsl:stylesheet version="1.0"
xmlns="http://www.w3.org/1999/xhtml";
xmlns:lucene="http://apache.org/cocoon/lucene/1.0";
xmlns:dc="http://purl.org/dc/elements/1.1/";

Modified: lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2html.xsl
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2html.xsl?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2html.xsl (original)
+++ lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2html.xsl Tue Oct
4 12:35:24 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->

-<xsl:stylesheet
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:search="http://apache.org/cocoon/search/1.0";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
@@ -30,10 +30,10 @@

<xsl:template match="search:results">
<cmsbody>
- <cinclude:include
src="cocoon:/modules/sitetree/{$pub}/{$area}/breadcrumb{$url}.xml"/>
- <cinclude:include
src="cocoon:/modules/sitetree/{$pub}/{$area}/menu{$url}.xml"/>
- <cinclude:include
src="cocoon:/modules/sitetree/{$pub}/{$area}/tabs{$url}.xml"/>
- <cinclude:include
src="cocoon:/modules/sitetree/{$pub}/{$area}/search{$url}.xml"/>
+ <cinclude:include
src="cocoon://modules/sitetree/{$pub}/{$area}/breadcrumb{$url}.xml"/>
+ <cinclude:include
src="cocoon://modules/sitetree/{$pub}/{$area}/menu{$url}.xml"/>
+ <cinclude:include
src="cocoon://modules/sitetree/{$pub}/{$area}/tabs{$url}.xml"/>
+ <cinclude:include
src="cocoon://modules/sitetree/{$pub}/{$area}/search{$url}.xml"/>
<xhtml:div id="body">
<xsl:apply-templates/>
</xhtml:div>
@@ -94,7 +94,7 @@
<xsl:template match="search:hit">
<li>
<h2>Score: <xsl:value-of select="format-number( @score, '### %' )"/>
Rank: <xsl:value-of select="@rank"/></h2>
- <p><a href="{@uri}"><xsl:value-of select="@uri"/></a></p>
+ <p><a href="{$root}{search:field[@name='uid']}"><xsl:value-of
select="search:field[@name='title']"/></a></p>
</li>
</xsl:template>

Modified:
lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2opensearch.xsl
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2opensearch.xsl?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2opensearch.xsl
(original)
+++ lenya/sandbox/search/src/webapp/lenya/xslt/lucene/search2opensearch.xsl Tue
Oct 4 12:35:24 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->

-<xsl:stylesheet
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:search="http://apache.org/cocoon/search/1.0";
xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/";

Modified: lenya/sandbox/search/src/webapp/lenya/xslt/lucene/xhtml2index.xsl
URL:
http://svn.apache.org/viewcvs/lenya/sandbox/search/src/webapp/lenya/xslt/lucene/xhtml2index.xsl?rev=294903&r1=294902&r2=294903&view=diff
==============================================================================
--- lenya/sandbox/search/src/webapp/lenya/xslt/lucene/xhtml2index.xsl (original)
+++ lenya/sandbox/search/src/webapp/lenya/xslt/lucene/xhtml2index.xsl Tue Oct
4 12:35:24 2005
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<xsl:stylesheet
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:lucene="http://apache.org/cocoon/lucene/1.0";

Previous by Date:	svn commit: r293281 - in /lenya/trunk/src/webapp/jcr-repository: repository.xml repository/workspaces/default/workspace.xml, michi
Next by Date:	svn commit: r295023 - /lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java, andreas
Previous by Thread:	svn commit: r293281 - in /lenya/trunk/src/webapp/jcr-repository: repository.xml repository/workspaces/default/workspace.xml, michi
Next by Thread:	svn commit: r295023 - /lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java, andreas
Indexes:	[Date] [Thread] [Top] [All Lists]

svn commit: r294903 - in /lenya/sandbox/search: ./ src/cocoon/ src/java/org: msg#00018

cms.lenya.cvs

Free Magazines

<Prev in Thread]	Current Thread	[Next in Thread>