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 2004/08/02 02:23:43 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search body.xsl
michi 2004/08/01 17:23:43
Modified: src/webapp/lenya/pubs/oscom/config/menus matrix.xsp
src/webapp/lenya/pubs/oscom/lenya lucene.xmap
src/webapp/lenya/pubs/oscom/xslt/search body.xsl
Log:
search and results improved
Revision Changes Path
1.42 +2 -2 cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp
Index: matrix.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/matrix.xsp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- matrix.xsp 31 Jul 2004 05:35:53 -0000 1.41
+++ matrix.xsp 2 Aug 2004 00:23:43 -0000 1.42
@@ -56,7 +56,7 @@
-->
</block>
<block>
- <item uc:usecase="publish" uc:step="showscreen"><xsp:attribute name="href">?sources=/matrix/<xsp:expr>projectid</xsp:expr>.xml&uris=/lenya/oscom/matrix/<xsp:expr>projectid</xsp:expr>.html,/lenya/oscom/matrix/index.html&files2index=/matrix/<xsp:expr>projectid</xsp:expr>.xml</xsp:attribute>Publish</item>
+ <item uc:usecase="publish" uc:step="showscreen"><xsp:attribute name="href">?sources=/matrix/<xsp:expr>projectid</xsp:expr>.xml&uris=/lenya/oscom/matrix/<xsp:expr>projectid</xsp:expr>.html,/lenya/oscom/matrix/index.html&files2index=/<xsp:expr>projectid</xsp:expr>.xml</xsp:attribute>Publish</item>
</block>
<block>
<item><xsp:attribute name="href">?lenya.usecase=logout</xsp:attribute>Logout</item>
1.9 +2 -2 cocoon-lenya/src/webapp/lenya/pubs/oscom/lenya/lucene.xmap
Index: lucene.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/lenya/lucene.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lucene.xmap 12 May 2004 16:21:40 -0000 1.8
+++ lucene.xmap 2 Aug 2004 00:23:43 -0000 1.9
@@ -83,7 +83,7 @@
<map:parameter name="pub4-name" value="Matrix"/>
<map:parameter name="pub4-index-dir" value="../work/search/lucene/index/index-cmfsMatrix"/>
<map:parameter name="pub4-search-fields" value="title,contents,license,plang,features"/>
- <map:parameter name="pub4-excerpt-dir" value="../content/authoring/matrix"/>
+ <map:parameter name="pub4-excerpt-dir" value="../content/live/matrix"/>
<map:parameter name="pub4-prefix" value="http://www.oscom.org/matrix"/>
</map:generate>
1.20 +20 -4 cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search/body.xsl
Index: body.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/xslt/search/body.xsl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- body.xsl 13 Mar 2004 12:42:20 -0000 1.19
+++ body.xsl 2 Aug 2004 00:23:43 -0000 1.20
@@ -88,7 +88,7 @@
<xsl:attribute name="checked">checked</xsl:attribute>
</xsl:if>
</xsl:for-each>
- Contents
+ Description
</input>
<input type="checkbox" name="matrix.fields.title">
<xsl:for-each select="search/fields/field">
@@ -216,11 +216,27 @@
<td>
<xsl:variable name="url"><xsl:value-of select="/oscom/search-and-results/search/publication-prefix"/><xsl:choose><xsl:when test="uri/@filename = 'index.html'"><xsl:value-of select="normalize-space(uri/@parent)"/>/</xsl:when><xsl:otherwise><xsl:value-of select="normalize-space(uri)"/></xsl:otherwise></xsl:choose></xsl:variable>
- <a href="{$url}"><xsl:apply-templates select="title"/></a><xsl:apply-templates select="no-title"/>
+ <xsl:choose>
+ <xsl:when test="/oscom/search-and-results/configuration/@checked-pid = 'matrix'">
+ <xsl:variable name="mhref"><xsl:value-of select="substring-before($url, '.xml')"/>.html</xsl:variable>
+ <a href="{$mhref}"><xsl:apply-templates select="title"/></a><xsl:apply-templates select="no-title"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{$url}"><xsl:apply-templates select="title"/></a><xsl:apply-templates select="no-title"/>
+ </xsl:otherwise>
+ </xsl:choose>
<br />
<font size="-1"><xsl:apply-templates select="excerpt"/><xsl:apply-templates select="no-excerpt"/></font>
<br />
- <font size="-1">URL: <a href="{$url}"><xsl:value-of select="$url"/></a></font>
+ <xsl:choose>
+ <xsl:when test="/oscom/search-and-results/configuration/@checked-pid = 'matrix'">
+ <xsl:variable name="mhref"><xsl:value-of select="substring-before($url, '.xml')"/>.html</xsl:variable>
+ <font size="-1">URL: <a href="{$mhref}"><xsl:value-of select="$mhref"/></a></font>
+ </xsl:when>
+ <xsl:otherwise>
+ <font size="-1">URL: <a href="{$url}"><xsl:value-of select="$url"/></a></font>
+ </xsl:otherwise>
+ </xsl:choose>
<br />
<br />
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org