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/14 13:02:52 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/search search-and-results.xsp
michi 2003/11/14 04:02:52
Modified: src/java/org/apache/lenya/lucene Publication.java
src/webapp/lenya/content/search search-and-results.xsp
Log:
Fields parameter added
Revision Changes Path
1.9 +21 -4 cocoon-lenya/src/java/org/apache/lenya/lucene/Publication.java
Index: Publication.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/lucene/Publication.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Publication.java 23 Jul 2003 13:21:26 -0000 1.8
+++ Publication.java 14 Nov 2003 12:02:52 -0000 1.9
@@ -1,5 +1,4 @@
/*
-$Id$
<License>
============================================================================
@@ -55,17 +54,35 @@
*/
package org.apache.lenya.lucene;
+import java.util.StringTokenizer;
/**
- * DOCUMENT ME!
+ * Parameters to do a search by Lucene and display results
*
- * @author $author$
- * @version $Revision$
+ * @author Michael Wechner
+ * @version $Id$
*/
public class Publication {
public String id = null;
public String name = null;
public String indexDir = null;
+ public String searchFields = null;
public String excerptDir = null;
public String prefix = null;
+
+ /**
+ *
+ */
+ public String[] getFields() {
+ String[] fields = null;
+ if (searchFields != null) {
+ StringTokenizer st = new StringTokenizer(searchFields, ",");
+ int length = st.countTokens();
+ fields = new String[length];
+ for (int i = 0; i < length; i++) {
+ fields[i] = st.nextToken();
+ }
+ }
+ return fields;
+ }
}
1.5 +13 -0 cocoon-lenya/src/webapp/lenya/content/search/search-and-results.xsp
Index: search-and-results.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/search/search-and-results.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- search-and-results.xsp 24 Apr 2003 13:53:17 -0000 1.4
+++ search-and-results.xsp 14 Nov 2003 12:02:52 -0000 1.5
@@ -114,6 +114,7 @@
pubs[i].id = parameters.getParameter("pub"+i+"-id","@ID@");
pubs[i].name = parameters.getParameter("pub"+i+"-name","@NAME@");
pubs[i].indexDir = parameters.getParameter("pub"+i+"-index-dir","@INDEX-DIR@");
+ pubs[i].searchFields = parameters.getParameter("pub"+i+"-search-fields","title,contents");
pubs[i].excerptDir = parameters.getParameter("pub"+i+"-excerpt-dir","@EXCERPT-DIR@");
pubs[i].prefix = parameters.getParameter("pub"+i+"-prefix","@PREFIX@");
}
@@ -191,6 +192,18 @@
<publication><xsp:attribute name="pid"><xsp:expr>pubs[i].id</xsp:expr></xsp:attribute>
<name><xsp:expr>pubs[i].name</xsp:expr></name>
<index-dir><xsp:expr>pubs[i].indexDir</xsp:expr></index-dir>
+ <search-fields>
+ <xsp:logic>
+ String[] searchFields = pubs[i].getFields();
+ if (searchFields != null) {
+ for (int k = 0; k < searchFields.length; k++) {
+ <field><xsp:expr>searchFields[k]</xsp:expr></field>
+ }
+ } else {
+ <xsp:content><xsp:expr>pubs[i].searchFields</xsp:expr></xsp:content><exception>.getFields() returned null</exception>
+ }
+ </xsp:logic>
+ </search-fields>
<excerpt-dir><xsp:expr>pubs[i].excerptDir</xsp:expr></excerpt-dir>
<prefix><xsp:expr>pubs[i].prefix</xsp:expr></prefix>
</publication>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org