vgritsenko 2002/07/13 09:28:04
Modified: src/webapp/search Tag: cocoon_2_0_3_branch create-index.xsp
search-index.xsp sitemap.xmap statistic-index.xsp
src/webapp/search/stylesheets Tag: cocoon_2_0_3_branch
search2html.xsl
src/webapp/samples/search create-index.xsp search-index.xsp
sitemap.xmap statistic-index.xsp
src/webapp/samples/search/stylesheets search2html.xsl
Log:
fix search samples navigation
Revision Changes Path
No revision
No revision
1.4.2.1 +18 -3 xml-cocoon2/src/webapp/search/Attic/create-index.xsp
Index: create-index.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/search/Attic/create-index.xsp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- create-index.xsp 28 Feb 2002 15:11:28 -0000 1.4
+++ create-index.xsp 13 Jul 2002 16:28:03 -0000 1.4.2.1
@@ -52,12 +52,12 @@
lcii = null;
}
}
-
</xsp:logic>
<page>
<xsp:logic>
boolean create;
+ boolean created = false;
String createParam = <xsp-request:get-parameter name="create" />;
if (createParam == null) {
create = false;
@@ -67,8 +67,10 @@
String baseURL = <xsp-request:get-parameter name="baseURL" />;
if (baseURL != null && baseURL.length() > 0) {
- createIndex(baseURL, create );
+ createIndex(baseURL, create);
+ created = true;
}
+
if (baseURL == null || baseURL.length() < 1) {
baseURL =
"http://"; +
@@ -77,8 +79,15 @@
<xsp-request:get-context-path/> + "/" + "documents/index.html";
}
</xsp:logic>
+ <title>Create a Lucene search index</title>
<content>
- <h1>Create a Lucene search index</h1>
+ <para>
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a> |
+ <a href="statistic">Index Statistics</a>
+ </small>
+ </para>
<para>
This process might take some time (follow the tail of your logfiles
to see the indexer in progress).
@@ -97,6 +106,12 @@
<li>get-sitemap-uri <xsp-request:get-sitemap-uri/>
</li>
</ul>
+
+ <xsp:logic>
+ if (created) {
+ <strong>Index has been created</strong>
+ }
+ </xsp:logic>
<form action="create">
<table>
1.3.2.1 +5 -4 xml-cocoon2/src/webapp/search/Attic/search-index.xsp
Index: search-index.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/search/Attic/search-index.xsp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- search-index.xsp 28 Feb 2002 15:11:28 -0000 1.3
+++ search-index.xsp 13 Jul 2002 16:28:03 -0000 1.3.2.1
@@ -100,10 +100,11 @@
<content>
<a href="http://jakarta.apache.org/lucene/";><img border="0" alt="Lucene Logo"
src="images/lucene_green_300.gif"/></a>
<para>
- <font size="-1">
- <a target="_blank" href="statistic">Index Statistics</a> |
- <a href="welcome">Welcome</a>
- </font>
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a> |
+ <a href="statistic">Index Statistics</a>
+ </small>
</para>
<para>
<form action="search">
1.5.2.1 +4 -0 xml-cocoon2/src/webapp/search/Attic/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/search/Attic/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- sitemap.xmap 18 Mar 2002 19:59:37 -0000 1.5
+++ sitemap.xmap 13 Jul 2002 16:28:03 -0000 1.5.2.1
@@ -187,6 +187,10 @@
<!-- sub-sitemap example pipeline -->
<map:pipeline>
+ <map:match pattern="">
+ <map:redirect-to uri="welcome"/>
+ </map:match>
+
<map:match pattern="images/*.gif">
<map:read src="images/{1}.gif" mime-type="image/gif">
<map:parameter name="expires" value="60000"/>
1.2.2.1 +6 -3 xml-cocoon2/src/webapp/search/Attic/statistic-index.xsp
Index: statistic-index.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/search/Attic/statistic-index.xsp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- statistic-index.xsp 28 Feb 2002 15:11:28 -0000 1.2
+++ statistic-index.xsp 13 Jul 2002 16:28:04 -0000 1.2.2.1
@@ -118,14 +118,17 @@
<title>Index Statistics</title>
<content>
<para>
- Statistics:
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a>
+ </small>
</para>
<para>
Total Count Of Documents
<xsp:expr>String.valueOf(numDocs())</xsp:expr>
</para>
<para>
- <table>
+ <table border="1">
<tr>
<td>Count Of Terms</td><td>Fieldname/Fieldvalue</td>
</tr>
@@ -149,7 +152,7 @@
All Terms
</para>
<para>
- <table>
+ <table border="1">
<tr>
<td>Count Of Terms</td><td>Term</td>
</tr>
No revision
No revision
1.1.2.1 +5 -4 xml-cocoon2/src/webapp/search/stylesheets/Attic/search2html.xsl
Index: search2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/search/stylesheets/Attic/search2html.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- search2html.xsl 3 Jan 2002 12:31:44 -0000 1.1
+++ search2html.xsl 13 Jul 2002 16:28:04 -0000 1.1.2.1
@@ -18,10 +18,11 @@
<h1>IndexSearch</h1>
<p>
- <font size="-1">
- <a target="_blank" href="statistic">Index Statistic</a> |
- <a href="welcome">Welcome</a>
- </font>
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a> |
+ <a href="statistic">Index Statistic</a>
+ </small>
</p>
<form action="findIt">
1.2 +18 -3 xml-cocoon2/src/webapp/samples/search/create-index.xsp
Index: create-index.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/search/create-index.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create-index.xsp 1 Jul 2002 10:04:17 -0000 1.1
+++ create-index.xsp 13 Jul 2002 16:28:04 -0000 1.2
@@ -52,12 +52,12 @@
lcii = null;
}
}
-
</xsp:logic>
<page>
<xsp:logic>
boolean create;
+ boolean created = false;
String createParam = <xsp-request:get-parameter name="create" />;
if (createParam == null) {
create = false;
@@ -67,8 +67,10 @@
String baseURL = <xsp-request:get-parameter name="baseURL" />;
if (baseURL != null && baseURL.length() > 0) {
- createIndex(baseURL, create );
+ createIndex(baseURL, create);
+ created = true;
}
+
if (baseURL == null || baseURL.length() < 1) {
baseURL =
"http://"; +
@@ -77,8 +79,15 @@
<xsp-request:get-context-path/> + "/" + "documents/index.html";
}
</xsp:logic>
+ <title>Create a Lucene search index</title>
<content>
- <h1>Create a Lucene search index</h1>
+ <para>
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a> |
+ <a href="statistic">Index Statistics</a>
+ </small>
+ </para>
<para>
This process might take some time (follow the tail of your logfiles
to see the indexer in progress).
@@ -97,6 +106,12 @@
<li>get-sitemap-uri <xsp-request:get-sitemap-uri/>
</li>
</ul>
+
+ <xsp:logic>
+ if (created) {
+ <strong>Index has been created</strong>
+ }
+ </xsp:logic>
<form action="create">
<table>
1.2 +5 -4 xml-cocoon2/src/webapp/samples/search/search-index.xsp
Index: search-index.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/search/search-index.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search-index.xsp 1 Jul 2002 10:04:17 -0000 1.1
+++ search-index.xsp 13 Jul 2002 16:28:04 -0000 1.2
@@ -100,10 +100,11 @@
<content>
<a href="http://jakarta.apache.org/lucene/";><img border="0" alt="Lucene Logo"
src="images/lucene_green_300.gif"/></a>
<para>
- <font size="-1">
- <a target="_blank" href="statistic">Index Statistics</a> |
- <a href="welcome">Welcome</a>
- </font>
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a> |
+ <a href="statistic">Index Statistics</a>
+ </small>
</para>
<para>
<form action="search">
1.3 +4 -0 xml-cocoon2/src/webapp/samples/search/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/search/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 4 Jul 2002 05:20:44 -0000 1.2
+++ sitemap.xmap 13 Jul 2002 16:28:04 -0000 1.3
@@ -187,6 +187,10 @@
<!-- sub-sitemap example pipeline -->
<map:pipeline>
+ <map:match pattern="">
+ <map:redirect-to uri="welcome"/>
+ </map:match>
+
<map:match pattern="images/*.gif">
<map:read src="images/{1}.gif" mime-type="image/gif">
<map:parameter name="expires" value="60000"/>
1.2 +6 -3 xml-cocoon2/src/webapp/samples/search/statistic-index.xsp
Index: statistic-index.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/search/statistic-index.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- statistic-index.xsp 1 Jul 2002 10:04:17 -0000 1.1
+++ statistic-index.xsp 13 Jul 2002 16:28:04 -0000 1.2
@@ -118,14 +118,17 @@
<title>Index Statistics</title>
<content>
<para>
- Statistics:
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a>
+ </small>
</para>
<para>
Total Count Of Documents
<xsp:expr>String.valueOf(numDocs())</xsp:expr>
</para>
<para>
- <table>
+ <table border="1">
<tr>
<td>Count Of Terms</td><td>Fieldname/Fieldvalue</td>
</tr>
@@ -149,7 +152,7 @@
All Terms
</para>
<para>
- <table>
+ <table border="1">
<tr>
<td>Count Of Terms</td><td>Term</td>
</tr>
1.2 +5 -4
xml-cocoon2/src/webapp/samples/search/stylesheets/search2html.xsl
Index: search2html.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/samples/search/stylesheets/search2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search2html.xsl 1 Jul 2002 10:04:17 -0000 1.1
+++ search2html.xsl 13 Jul 2002 16:28:04 -0000 1.2
@@ -18,10 +18,11 @@
<h1>IndexSearch</h1>
<p>
- <font size="-1">
- <a target="_blank" href="statistic">Index Statistic</a> |
- <a href="welcome">Welcome</a>
- </font>
+ <small>
+ <a href="../">Welcome</a> |
+ <a href="./">Search</a> |
+ <a href="statistic">Index Statistic</a>
+ </small>
</p>
<form action="findIt">
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
