carrot2-cvscommits Mailing List for Carrot2 (Page 402)
Brought to you by:
dawidweiss,
stachoo
Menu
▾
▴
carrot2-cvscommits — Commit notifications
This list is closed, nobody may subscribe to it.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(26) |
Nov
(58) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(16) |
Feb
(176) |
Mar
(2) |
Apr
(23) |
May
(854) |
Jun
(650) |
Jul
(248) |
Aug
(104) |
Sep
(58) |
Oct
(24) |
Nov
|
Dec
(27) |
| 2005 |
Jan
|
Feb
(186) |
Mar
(127) |
Apr
(54) |
May
(8) |
Jun
(103) |
Jul
(38) |
Aug
(75) |
Sep
(92) |
Oct
(110) |
Nov
(42) |
Dec
(146) |
| 2006 |
Jan
(733) |
Feb
(80) |
Mar
(23) |
Apr
(41) |
May
(31) |
Jun
(89) |
Jul
(137) |
Aug
(93) |
Sep
(96) |
Oct
(31) |
Nov
(36) |
Dec
(25) |
| 2007 |
Jan
(58) |
Feb
(25) |
Mar
(29) |
Apr
(68) |
May
(55) |
Jun
(43) |
Jul
(54) |
Aug
(104) |
Sep
(10) |
Oct
(24) |
Nov
(41) |
Dec
(32) |
| 2008 |
Jan
(80) |
Feb
(81) |
Mar
(141) |
Apr
(141) |
May
(94) |
Jun
(63) |
Jul
(141) |
Aug
(87) |
Sep
(66) |
Oct
(84) |
Nov
(110) |
Dec
(58) |
| 2009 |
Jan
(21) |
Feb
(56) |
Mar
(53) |
Apr
(67) |
May
(95) |
Jun
(10) |
Jul
(93) |
Aug
(41) |
Sep
(62) |
Oct
(54) |
Nov
(39) |
Dec
(40) |
| 2010 |
Jan
(81) |
Feb
(154) |
Mar
(123) |
Apr
(56) |
May
(38) |
Jun
(28) |
Jul
(53) |
Aug
(78) |
Sep
(64) |
Oct
(90) |
Nov
(12) |
Dec
(23) |
| 2011 |
Jan
(88) |
Feb
(24) |
Mar
(111) |
Apr
(59) |
May
(15) |
Jun
(8) |
Jul
(63) |
Aug
(37) |
Sep
(90) |
Oct
(7) |
Nov
(48) |
Dec
(39) |
| 2012 |
Jan
(7) |
Feb
(2) |
Mar
(16) |
Apr
(7) |
May
(35) |
Jun
(58) |
Jul
(17) |
Aug
(61) |
Sep
(18) |
Oct
(4) |
Nov
(25) |
Dec
(8) |
| 2013 |
Jan
(8) |
Feb
|
Mar
(13) |
Apr
(43) |
May
(26) |
Jun
(11) |
Jul
(16) |
Aug
(5) |
Sep
|
Oct
(43) |
Nov
(6) |
Dec
(10) |
| 2014 |
Jan
(22) |
Feb
(35) |
Mar
(5) |
Apr
(16) |
May
(8) |
Jun
(5) |
Jul
(12) |
Aug
(2) |
Sep
(4) |
Oct
|
Nov
(24) |
Dec
|
| 2015 |
Jan
(2) |
Feb
(31) |
Mar
(15) |
Apr
(3) |
May
(32) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(5) |
Oct
(27) |
Nov
(3) |
Dec
|
| 2016 |
Jan
|
Feb
(16) |
Mar
(3) |
Apr
|
May
(7) |
Jun
|
Jul
(7) |
Aug
(29) |
Sep
(10) |
Oct
(8) |
Nov
(12) |
Dec
|
| 2017 |
Jan
|
Feb
(4) |
Mar
(6) |
Apr
(3) |
May
(1) |
Jun
|
Jul
(10) |
Aug
(1) |
Sep
(4) |
Oct
|
Nov
(3) |
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
(13) |
Feb
(43) |
Mar
(31) |
Apr
(32) |
May
(30) |
Jun
(13) |
Jul
(6) |
Aug
(30) |
Sep
(43) |
Oct
(43) |
Nov
(28) |
Dec
(26) |
| 2020 |
Jan
(19) |
Feb
(16) |
Mar
(4) |
Apr
(5) |
May
(15) |
Jun
(14) |
Jul
(22) |
Aug
(1) |
Sep
(12) |
Oct
(16) |
Nov
(50) |
Dec
(79) |
| 2021 |
Jan
(52) |
Feb
(5) |
Mar
(50) |
Apr
(8) |
May
(4) |
Jun
(20) |
Jul
(15) |
Aug
(25) |
Sep
(3) |
Oct
|
Nov
(15) |
Dec
(19) |
| 2022 |
Jan
(8) |
Feb
(1) |
Mar
|
Apr
|
May
(10) |
Jun
(2) |
Jul
(9) |
Aug
(15) |
Sep
(1) |
Oct
(6) |
Nov
(12) |
Dec
(2) |
| 2023 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(22) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
(12) |
Nov
(24) |
Dec
|
|
From: <daw...@us...> - 2004-01-19 22:18:49
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2
In directory sc8-pr-cvs1:/tmp/cvs-serv16624/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2
Modified Files:
RequestHistory.java
Log Message:
[bugfix] fixed recent queries, hopefully.
[bugfix] a couple of build-related bug fixes.
Index: RequestHistory.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/RequestHistory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RequestHistory.java 19 Jan 2004 21:28:23 -0000 1.3
--- RequestHistory.java 19 Jan 2004 22:18:45 -0000 1.4
***************
*** 67,71 ****
! public int getHistory(int max, Query [] query, ProcessDefinition [] process)
{
final int localmax = this.max;
--- 67,71 ----
! public final int getHistory(int max, Query [] query, ProcessDefinition [] process)
{
final int localmax = this.max;
|
|
From: <daw...@us...> - 2004-01-19 22:18:49
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller
In directory sc8-pr-cvs1:/tmp/cvs-serv16624/components/controllers/carrot2-web-controller
Modified Files:
build.xml
Log Message:
[bugfix] fixed recent queries, hopefully.
[bugfix] a couple of build-related bug fixes.
Index: build.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml 23 Nov 2003 23:37:54 -0000 1.2
--- build.xml 19 Jan 2004 22:18:45 -0000 1.3
***************
*** 86,90 ****
<!-- copy web application's resources -->
<copy filtering="false" flatten="false" includeemptydirs="true" todir="${build.dir}">
! <fileset dir="${src.webapp.path}" />
</copy>
--- 86,94 ----
<!-- copy web application's resources -->
<copy filtering="false" flatten="false" includeemptydirs="true" todir="${build.dir}">
! <fileset dir="${src.webapp.path}">
! <exclude name="WEB-INF/classes/**" />
! <exclude name="WEB-INF/web.xml**" />
! <exclude name="WEB-INF/lib/**" />
! </fileset>
</copy>
|
|
From: <daw...@us...> - 2004-01-19 22:18:48
|
Update of /cvsroot/carrot2/carrot2
In directory sc8-pr-cvs1:/tmp/cvs-serv16624
Modified Files:
history.xml
Log Message:
[bugfix] fixed recent queries, hopefully.
[bugfix] a couple of build-related bug fixes.
Index: history.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/history.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** history.xml 27 Nov 2003 22:32:11 -0000 1.8
--- history.xml 19 Jan 2004 22:18:45 -0000 1.9
***************
*** 9,12 ****
--- 9,23 ----
<history>
<changelist>
+ <date>2004-01-19</date>
+ <committer>dawid</committer>
+ <change component="carrot2.controller.carrot2-web" type="bugfix">
+ Recent queries bug (order and not appearing queries) hopefully fixed.
+ </change>
+ <change component="global" type="bugfix">
+ A couple of build-system-related bug fixes.
+ </change>
+ </changelist>
+
+ <changelist>
<date>2003-11-27</date>
<committer>dawid</committer>
|
|
From: <daw...@us...> - 2004-01-19 21:30:38
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/services
In directory sc8-pr-cvs1:/tmp/cvs-serv1914/web/services
Modified Files:
google-cs.xml google-pl.xml google.xml
Log Message:
[refactor] removed some old sources from Pawel
Index: google-cs.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/services/google-cs.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** google-cs.xml 19 Sep 2003 10:20:41 -0000 1.1.1.1
--- google-cs.xml 19 Jan 2004 21:30:34 -0000 1.2
***************
*** 54,58 ****
<number-of-matched-documents>
<regexpression>
! <match><![CDATA[of about[^S]*S]]></match>
<replace regexp="[^0123456789]*" with="" />
</regexpression>
--- 54,58 ----
<number-of-matched-documents>
<regexpression>
! <match><![CDATA[of( about)?[^S]{0,20}Search]]></match>
<replace regexp="[^0123456789]*" with="" />
</regexpression>
Index: google-pl.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/services/google-pl.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** google-pl.xml 19 Sep 2003 10:20:41 -0000 1.1.1.1
--- google-pl.xml 19 Jan 2004 21:30:35 -0000 1.2
***************
*** 55,59 ****
<number-of-matched-documents>
<regexpression>
! <match><![CDATA[of about[^S]*S]]></match>
<replace regexp="[^0123456789]*" with="" />
</regexpression>
--- 55,59 ----
<number-of-matched-documents>
<regexpression>
! <match><![CDATA[of( about)?[^S]{0,20}Search]]></match>
<replace regexp="[^0123456789]*" with="" />
</regexpression>
Index: google.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/services/google.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** google.xml 19 Sep 2003 10:20:41 -0000 1.1.1.1
--- google.xml 19 Jan 2004 21:30:35 -0000 1.2
***************
*** 53,57 ****
<number-of-matched-documents>
<regexpression>
! <match><![CDATA[of about[^S]*S]]></match>
<replace regexp="[^0123456789]*" with="" />
</regexpression>
--- 53,57 ----
<number-of-matched-documents>
<regexpression>
! <match><![CDATA[of( about)?[^S]{0,20}Search]]></match>
<replace regexp="[^0123456789]*" with="" />
</regexpression>
|
|
From: <daw...@us...> - 2004-01-19 21:30:38
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv1914/web/WEB-INF
Modified Files:
web.xml
Log Message:
[refactor] removed some old sources from Pawel
Index: web.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/WEB-INF/web.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** web.xml 19 Sep 2003 10:20:41 -0000 1.1.1.1
--- web.xml 19 Jan 2004 21:30:34 -0000 1.2
***************
*** 18,30 ****
<load-on-startup>40</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>TreeSnippetReader</servlet-name>
- <servlet-class>com.paulodev.carrot.input.treeExtractor.SnippetReaderServlet</servlet-class>
- <init-param>
- <param-name>searchEngineDescriptors</param-name>
- <param-value>/searchEngines</param-value>
- </init-param>
- <load-on-startup>50</load-on-startup>
- </servlet>
<servlet-mapping>
<servlet-name>SnippetReader</servlet-name>
--- 18,21 ----
***************
*** 35,41 ****
<url-pattern>/fakeservice/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>TreeSnippetReader</servlet-name>
- <url-pattern>/treeExtractor/*</url-pattern>
- </servlet-mapping>
</web-app>
--- 26,28 ----
|
|
From: <daw...@us...> - 2004-01-19 21:30:38
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/web/searchEngines In directory sc8-pr-cvs1:/tmp/cvs-serv1914/web/searchEngines Removed Files: google-pl.xml google.xml szukacz-pl.xml Log Message: [refactor] removed some old sources from Pawel --- google-pl.xml DELETED --- --- google.xml DELETED --- --- szukacz-pl.xml DELETED --- |
|
From: <daw...@us...> - 2004-01-19 21:30:37
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/org/put/snippetreader/readers/HtmlMultipage
In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src/org/put/snippetreader/readers/HtmlMultipage
Modified Files:
HttpMultiPageReader.java
Log Message:
[refactor] removed some old sources from Pawel
Index: HttpMultiPageReader.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/org/put/snippetreader/readers/HtmlMultipage/HttpMultiPageReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HttpMultiPageReader.java 30 Sep 2003 11:35:47 -0000 1.2
--- HttpMultiPageReader.java 19 Jan 2004 21:30:34 -0000 1.3
***************
*** 55,58 ****
--- 55,83 ----
}
+ public byte [] getFirstResultsPage(String query, int resultsNeeded, String encoding, Element pageInfo) throws IOException
+ {
+ String inputEncoding = encoding;
+ String outputEncoding = encoding;
+
+ // load the first page of the results.
+ Map mappings = new HashMap();
+ mappings.put("query.string", query);
+ mappings.put("query.startFrom", "0");
+
+ InputStream pageInputStream = submitter.submit(
+ queryParameters, mappings, outputEncoding
+ );
+
+ if (pageInputStream == null)
+ {
+ throw new IOException("Null returned from the submitter (HTTP request failed)");
+ }
+
+ // load the page entirely.
+ byte [] pageBytes = FileHelper.readFully(pageInputStream);
+ return pageBytes;
+ }
+
+
public Enumeration getQueryResultsPages(
String query, int resultsNeeded, String encoding, Element pageInfo
***************
*** 140,144 ****
);
throw new Exception(
! "Snippet parser problems. Please notify system administrator."
);
}
--- 165,170 ----
);
throw new Exception(
! "Snippet parser problems (Neither results nor no-results tokens were found)."
! + " Please notify system administrator."
);
}
|
|
From: <daw...@us...> - 2004-01-19 21:30:37
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/org/put/snippetreader/readers
In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src/org/put/snippetreader/readers
Modified Files:
WebSnippetReader.java
Log Message:
[refactor] removed some old sources from Pawel
Index: WebSnippetReader.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/org/put/snippetreader/readers/WebSnippetReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WebSnippetReader.java 30 Sep 2003 11:35:47 -0000 1.2
--- WebSnippetReader.java 19 Jan 2004 21:30:34 -0000 1.3
***************
*** 341,345 ****
);
! final byte [] fullInput = FileHelper.readFullyAndCloseInput(is);
final String fullInputString = new String(
fullInput,
--- 341,353 ----
);
! byte [] fullInput;
!
! if (is == null) {
! fullInput = reader.getFirstResultsPage(query, 80, encoding, JDOMHelper.getElement(
! "/service/response/pageinfo", config));
! } else {
! fullInput = FileHelper.readFullyAndCloseInput(is);
! }
!
final String fullInputString = new String(
fullInput,
***************
*** 505,515 ****
}
! InputStream is = reader.getQueryResults(
! query, 80, encoding, JDOMHelper.getElement(
! "/service/response/pageinfo", config
! )
! );
! fullInput = FileHelper.readFullyAndCloseInput(is);
stream.append(
--- 513,536 ----
}
! InputStream is = null;
!
! try
! {
! is = reader.getQueryResults(
! query, 80, encoding, JDOMHelper.getElement(
! "/service/response/pageinfo", config
! )
! );
! }
! catch (Exception e1)
! {
! }
! if (is == null) {
! fullInput = reader.getFirstResultsPage(query, 80, encoding, JDOMHelper.getElement(
! "/service/response/pageinfo", config));
! } else {
! fullInput = FileHelper.readFullyAndCloseInput(is);
! }
stream.append(
|
|
From: <daw...@us...> - 2004-01-19 21:30:37
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/com/paulodev/carrot/input/treeExtractor/readers In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src/com/paulodev/carrot/input/treeExtractor/readers Removed Files: SnippetReader.java Log Message: [refactor] removed some old sources from Pawel --- SnippetReader.java DELETED --- |
|
From: <daw...@us...> - 2004-01-19 21:30:37
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/com/paulodev/carrot/input/treeExtractor/extractors/htmlParser In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src/com/paulodev/carrot/input/treeExtractor/extractors/htmlParser Removed Files: AttributeList.java HTMLNode.java HTMLTextNode.java HTMLTokenWriter.java HTMLTokenizer.java HTMLTree.java TagToken.java TextToken.java Log Message: [refactor] removed some old sources from Pawel --- AttributeList.java DELETED --- --- HTMLNode.java DELETED --- --- HTMLTextNode.java DELETED --- --- HTMLTokenWriter.java DELETED --- --- HTMLTokenizer.java DELETED --- --- HTMLTree.java DELETED --- --- TagToken.java DELETED --- --- TextToken.java DELETED --- |
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/com/paulodev/carrot/input/treeExtractor/extractors In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src/com/paulodev/carrot/input/treeExtractor/extractors Removed Files: AssertionException.java TreeExtractor.java Log Message: [refactor] removed some old sources from Pawel --- AssertionException.java DELETED --- --- TreeExtractor.java DELETED --- |
|
From: <daw...@us...> - 2004-01-19 21:30:36
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/src/com/paulodev/carrot/input/treeExtractor In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src/com/paulodev/carrot/input/treeExtractor Removed Files: SnippetReaderServlet.java Log Message: [refactor] removed some old sources from Pawel --- SnippetReaderServlet.java DELETED --- |
|
From: <daw...@us...> - 2004-01-19 21:28:27
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl
In directory sc8-pr-cvs1:/tmp/cvs-serv1190/web/jsp-tmpl
Modified Files:
recent-queries.txt
Log Message:
[bugfix] Recent queries now should show properly.
Index: recent-queries.txt
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl/recent-queries.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** recent-queries.txt 27 Nov 2003 22:30:31 -0000 1.3
--- recent-queries.txt 19 Jan 2004 21:28:23 -0000 1.4
***************
*** 16,20 ****
}
! for (int i=real-1;i>=0;i--) {
Query q = queries[i];
ProcessDefinition p = processes[i];
--- 16,20 ----
}
! for (int i=0;i<real;i++) {
Query q = queries[i];
ProcessDefinition p = processes[i];
|
|
From: <daw...@us...> - 2004-01-19 21:28:27
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2
In directory sc8-pr-cvs1:/tmp/cvs-serv1190/src/com/dawidweiss/carrot/controller/carrot2
Modified Files:
RequestHistory.java
Log Message:
[bugfix] Recent queries now should show properly.
Index: RequestHistory.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/RequestHistory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RequestHistory.java 27 Nov 2003 22:30:31 -0000 1.2
--- RequestHistory.java 19 Jan 2004 21:28:23 -0000 1.3
***************
*** 48,55 ****
final int localmax = this.max;
synchronized (this) {
! int from = last;
int k = 0;
! while (from != position && max > 0) {
query[k] = this.queries[from];
process[k] = this.processes[from];
--- 48,58 ----
final int localmax = this.max;
synchronized (this) {
! int from = position;
int k = 0;
! while (from != last && max > 0) {
! from = from - 1;
! if (from == -1) from = this.max-1;
!
query[k] = this.queries[from];
process[k] = this.processes[from];
***************
*** 58,62 ****
max--;
k++;
- from = (from + 1) % localmax;
}
return k;
--- 61,64 ----
***************
*** 69,76 ****
final int localmax = this.max;
synchronized (this) {
! int from = last;
int k = 0;
! while (from != position && max > 0) {
query[k] = this.queries[from];
process[k] = this.processes[from];
--- 71,81 ----
final int localmax = this.max;
synchronized (this) {
! int from = position;
int k = 0;
! while (from != last && max > 0) {
! from = from - 1;
! if (from == -1) from = this.max-1;
!
query[k] = this.queries[from];
process[k] = this.processes[from];
***************
*** 78,82 ****
max--;
k++;
- from = (from + 1) % localmax;
}
return k;
--- 83,86 ----
|
|
From: <daw...@us...> - 2003-12-04 15:58:56
|
Update of /cvsroot/carrot2/website/site
In directory sc8-pr-cvs1:/tmp/cvs-serv6749
Modified Files:
download.xml
Log Message:
broken url fixed.
Index: download.xml
===================================================================
RCS file: /cvsroot/carrot2/website/site/download.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** download.xml 6 Oct 2003 17:13:30 -0000 1.2
--- download.xml 4 Dec 2003 15:58:53 -0000 1.3
***************
*** 49,53 ****
</p>
<p>
! <a href="http://carrot2.sourceforge.net/download/carrot2-cvs-nightly.tar.gz">http://carrot2.sourceforge.net/download/tomcat-carrot-runtime.tgz</a>
</p>
</chapter>
--- 49,53 ----
</p>
<p>
! <a href="http://carrot2.sourceforge.net/download/tomcat-carrot-runtime.tgz">http://carrot2.sourceforge.net/download/tomcat-carrot-runtime.tgz</a>
</p>
</chapter>
|
Update of /cvsroot/carrot2/carrot2/descriptors/processes-stable
In directory sc8-pr-cvs1:/tmp/cvs-serv27399/descriptors/processes-stable
Modified Files:
carrot2.process.lingo-alltheweb.xml
carrot2.process.lingo-google-cs-only.xml
carrot2.process.lingo-google-pl.xml
carrot2.process.lingo-google.xml
Log Message:
default ordering for lingo-based processes is now documents declaration order (not score).
Index: carrot2.process.lingo-alltheweb.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/descriptors/processes-stable/carrot2.process.lingo-alltheweb.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** carrot2.process.lingo-alltheweb.xml 19 Sep 2003 10:20:43 -0000 1.1.1.1
--- carrot2.process.lingo-alltheweb.xml 30 Nov 2003 11:39:53 -0000 1.2
***************
*** 28,32 ****
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_SCORE_ATTRIBUTE");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
--- 28,32 ----
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_DOCUMENTS_ORDER");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
Index: carrot2.process.lingo-google-cs-only.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/descriptors/processes-stable/carrot2.process.lingo-google-cs-only.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** carrot2.process.lingo-google-cs-only.xml 19 Sep 2003 10:20:43 -0000 1.1.1.1
--- carrot2.process.lingo-google-cs-only.xml 30 Nov 2003 11:39:53 -0000 1.2
***************
*** 25,29 ****
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_SCORE_ATTRIBUTE");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
--- 25,29 ----
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_DOCUMENTS_ORDER");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
Index: carrot2.process.lingo-google-pl.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/descriptors/processes-stable/carrot2.process.lingo-google-pl.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** carrot2.process.lingo-google-pl.xml 19 Sep 2003 10:20:43 -0000 1.1.1.1
--- carrot2.process.lingo-google-pl.xml 30 Nov 2003 11:39:53 -0000 1.2
***************
*** 25,29 ****
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_SCORE_ATTRIBUTE");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
--- 25,29 ----
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_DOCUMENTS_ORDER");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
Index: carrot2.process.lingo-google.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/descriptors/processes-stable/carrot2.process.lingo-google.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** carrot2.process.lingo-google.xml 19 Sep 2003 10:20:43 -0000 1.1.1.1
--- carrot2.process.lingo-google.xml 30 Nov 2003 11:39:53 -0000 1.2
***************
*** 28,32 ****
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_SCORE_ATTRIBUTE");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
--- 28,32 ----
dtreeOptions.put("param.max.subgroup.snippets.included", "3" );
dtreeOptions.put("param.no.terminal.groups.expansion", "true" );
! dtreeOptions.put("param.snippets.sorting.type", "ORDER_DOCUMENTS_ORDER");
is = controller.invokeOutputComponent( "carrot2.output.xslt-renderer.dynamic-tree", is, dtreeOptions );
|
|
From: <daw...@us...> - 2003-11-27 22:32:14
|
Update of /cvsroot/carrot2/carrot2
In directory sc8-pr-cvs1:/tmp/cvs-serv2036
Modified Files:
history.xml
Log Message:
log update.
Index: history.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/history.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** history.xml 26 Nov 2003 22:24:37 -0000 1.7
--- history.xml 27 Nov 2003 22:32:11 -0000 1.8
***************
*** 9,12 ****
--- 9,20 ----
<history>
<changelist>
+ <date>2003-11-27</date>
+ <committer>dawid</committer>
+ <change component="carrot2.controller.carrot2-web" type="new">
+ Recent queries now contains dates. Queries limited to 200 snippets.
+ </change>
+ </changelist>
+
+ <changelist>
<date>2003-11-26</date>
<committer>dawid</committer>
|
|
From: <daw...@us...> - 2003-11-27 22:30:35
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl
In directory sc8-pr-cvs1:/tmp/cvs-serv1807/web/jsp-tmpl
Modified Files:
recent-queries.txt
Log Message:
[new] Recent queries now contain dates. Size of the queries limited to 200 snippets.
Index: recent-queries.txt
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl/recent-queries.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** recent-queries.txt 27 Nov 2003 08:11:35 -0000 1.2
--- recent-queries.txt 27 Nov 2003 22:30:31 -0000 1.3
***************
*** 4,14 ****
if (history != null) {
- int num = 20;
Query [] queries = new Query [num];
ProcessDefinition [] processes = new ProcessDefinition [num];
! int real = history.getHistory(num, queries, processes);
if (real == 0) {%>
! <span style="color: red;">Lucky you! No previous queries!</span>
<%
}
--- 4,16 ----
if (history != null) {
Query [] queries = new Query [num];
ProcessDefinition [] processes = new ProcessDefinition [num];
! long [] tstamps = new long [num];
! int real = history.getHistory(num, queries, processes, tstamps);
!
! java.text.SimpleDateFormat dformat = new java.text.SimpleDateFormat("HH:mm:ss");
if (real == 0) {%>
! <span style="color: red;"><bean:message key="blocks.recent-queries.empty"/></span>
<%
}
***************
*** 17,21 ****
Query q = queries[i];
ProcessDefinition p = processes[i];
!
%><nobr>
<a href="<%= response.encodeURL(
--- 19,23 ----
Query q = queries[i];
ProcessDefinition p = processes[i];
!
%><nobr>
<a href="<%= response.encodeURL(
***************
*** 27,30 ****
--- 29,33 ----
</a></nobr>
<div style="margin-bottom: 0.5em; font-size: 9px; color: #a0a0a0;">
+ <b><%= dformat.format( new java.util.Date(tstamps[i])) %></b>
(<%= q.getRequestedResults() %>, <%= StrutsHelpers.getMessageOrDefault(pageContext, p.getId(), p.getDefaultDescription()) %>)
</div>
|
|
From: <daw...@us...> - 2003-11-27 22:30:35
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/admin In directory sc8-pr-cvs1:/tmp/cvs-serv1807/web/admin Modified Files: recent.jsp Log Message: [new] Recent queries now contain dates. Size of the queries limited to 200 snippets. Index: recent.jsp =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/admin/recent.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** recent.jsp 26 Nov 2003 22:24:38 -0000 1.1 --- recent.jsp 27 Nov 2003 22:30:31 -0000 1.2 *************** *** 10,13 **** --- 10,16 ---- <div style="margin-left: 2em;"> + <% + int num = 20; + %> <%@include file="../jsp-tmpl/recent-queries.txt" %> </div> |
|
From: <daw...@us...> - 2003-11-27 22:30:35
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web
In directory sc8-pr-cvs1:/tmp/cvs-serv1807/web
Modified Files:
largeInputSearch.jsp search.jsp welcome.jsp
Log Message:
[new] Recent queries now contain dates. Size of the queries limited to 200 snippets.
Index: largeInputSearch.jsp
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/largeInputSearch.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** largeInputSearch.jsp 26 Nov 2003 18:49:44 -0000 1.3
--- largeInputSearch.jsp 27 Nov 2003 22:30:31 -0000 1.4
***************
*** 75,79 ****
<%
int j = queryBean.getResultsRequested();
! for (int i=50;i<=400;i+=50) {
boolean selected = (j>=i && j<i+50);
%><option value="<%= i %>" <%= selected ? "SELECTED" : "" %> ><%= i %></option><%
--- 75,79 ----
<%
int j = queryBean.getResultsRequested();
! for (int i=50;i<=200;i+=50) {
boolean selected = (j>=i && j<i+50);
%><option value="<%= i %>" <%= selected ? "SELECTED" : "" %> ><%= i %></option><%
Index: search.jsp
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/search.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** search.jsp 26 Nov 2003 18:49:44 -0000 1.3
--- search.jsp 27 Nov 2003 22:30:31 -0000 1.4
***************
*** 81,85 ****
<%
int j = queryBean.getResultsRequested();
! for (int i=50;i<=400;i+=50) {
boolean selected = (j>=i && j<i+50);
%><option value="<%= i %>" <%= selected ? "SELECTED" : "" %> ><%= i %></option><%
--- 81,85 ----
<%
int j = queryBean.getResultsRequested();
! for (int i=50;i<=200;i+=50) {
boolean selected = (j>=i && j<i+50);
%><option value="<%= i %>" <%= selected ? "SELECTED" : "" %> ><%= i %></option><%
Index: welcome.jsp
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/welcome.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** welcome.jsp 26 Nov 2003 22:24:37 -0000 1.1
--- welcome.jsp 27 Nov 2003 22:30:31 -0000 1.2
***************
*** 27,30 ****
--- 27,33 ----
<!-- Recent queries block -->
+ <%
+ int num = 12;
+ %>
<%@include file="jsp-tmpl/recent-queries.txt" %>
|
|
From: <daw...@us...> - 2003-11-27 22:30:34
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2
In directory sc8-pr-cvs1:/tmp/cvs-serv1807/src/com/dawidweiss/carrot/controller/carrot2
Modified Files:
RequestHistory.java
Log Message:
[new] Recent queries now contain dates. Size of the queries limited to 200 snippets.
Index: RequestHistory.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/RequestHistory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestHistory.java 26 Nov 2003 22:24:37 -0000 1.1
--- RequestHistory.java 27 Nov 2003 22:30:31 -0000 1.2
***************
*** 12,15 ****
--- 12,16 ----
private final Query [] queries;
private final ProcessDefinition [] processes;
+ private final long [] tstamp;
private final int max;
private int position;
***************
*** 26,29 ****
--- 27,31 ----
queries = new Query [ length + 1 ];
processes = new ProcessDefinition [ length + 1 ];
+ tstamp = new long [ length + 1 ];
max = length + 1;
}
***************
*** 32,35 ****
--- 34,38 ----
{
synchronized (this) {
+ tstamp[position] = System.currentTimeMillis();
queries[position] = query;
processes[position] = process;
***************
*** 41,44 ****
--- 44,68 ----
}
+ public final int getHistory(int max, Query [] query, ProcessDefinition [] process, long [] tstamps)
+ {
+ final int localmax = this.max;
+ synchronized (this) {
+ int from = last;
+ int k = 0;
+
+ while (from != position && max > 0) {
+ query[k] = this.queries[from];
+ process[k] = this.processes[from];
+ tstamps[k] = this.tstamp[from];
+
+ max--;
+ k++;
+ from = (from + 1) % localmax;
+ }
+ return k;
+ }
+ }
+
+
public int getHistory(int max, Query [] query, ProcessDefinition [] process)
{
***************
*** 50,54 ****
while (from != position && max > 0) {
query[k] = this.queries[from];
! process[k] = this.processes[from];
max--;
--- 74,78 ----
while (from != position && max > 0) {
query[k] = this.queries[from];
! process[k] = this.processes[from];
max--;
|
|
From: <daw...@us...> - 2003-11-27 22:30:34
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n
In directory sc8-pr-cvs1:/tmp/cvs-serv1807/src/i18n
Modified Files:
carrot2-strings.xml
Log Message:
[new] Recent queries now contain dates. Size of the queries limited to 200 snippets.
Index: carrot2-strings.xml
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n/carrot2-strings.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** carrot2-strings.xml 26 Nov 2003 22:24:37 -0000 1.5
--- carrot2-strings.xml 27 Nov 2003 22:30:31 -0000 1.6
***************
*** 43,48 ****
</search>
<process-chain>
! <lang:en>Process query using</lang:en>
! <lang:pl>Przetwarzaj przy pomocy</lang:pl>
</process-chain>
<requested-results>
--- 43,48 ----
</search>
<process-chain>
! <lang:en>Process</lang:en>
! <lang:pl>Proces</lang:pl>
</process-chain>
<requested-results>
***************
*** 139,145 ****
--- 139,147 ----
<lang:en>
<head>Recent queries</head>
+ <empty>Lucky you! No previous queries!</empty>
</lang:en>
<lang:pl>
<head>Ostatnio wydane zapytania</head>
+ <empty>SzczÄÅciarz! Nie byÅo poprzednich zapytaÅ!</empty>
</lang:pl>
</recent-queries>
|
|
From: <daw...@us...> - 2003-11-27 08:11:38
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl
In directory sc8-pr-cvs1:/tmp/cvs-serv10950
Modified Files:
recent-queries.txt
Log Message:
invert recent queries list.
Index: recent-queries.txt
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl/recent-queries.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** recent-queries.txt 26 Nov 2003 22:24:38 -0000 1.1
--- recent-queries.txt 27 Nov 2003 08:11:35 -0000 1.2
***************
*** 14,18 ****
}
! for (int i=0;i<real;i++) {
Query q = queries[i];
ProcessDefinition p = processes[i];
--- 14,18 ----
}
! for (int i=real-1;i>=0;i--) {
Query q = queries[i];
ProcessDefinition p = processes[i];
|
|
From: <daw...@us...> - 2003-11-26 22:24:41
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl
In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/web/jsp-tmpl
Added Files:
recent-queries.txt
Log Message:
[new], component: carrot2.controller.carrot2-web
Recent queries list added (queries history).
[new], component: carrot2.controller.carrot2-web
Short help added to the welcome page.
--- NEW FILE: recent-queries.txt ---
<%
QueryProcessor loader = (QueryProcessor) application.getAttribute(Carrot2InitServlet.CARROT_PROCESSOR_KEY);
RequestHistory history = loader.getRequestHistory();
if (history != null) {
int num = 20;
Query [] queries = new Query [num];
ProcessDefinition [] processes = new ProcessDefinition [num];
int real = history.getHistory(num, queries, processes);
if (real == 0) {%>
<span style="color: red;">Lucky you! No previous queries!</span>
<%
}
for (int i=0;i<real;i++) {
Query q = queries[i];
ProcessDefinition p = processes[i];
%><nobr>
<a href="<%= response.encodeURL(
request.getContextPath() + "/index.jsp?"
+ "query=" + org.put.util.net.URLEncoding.encode(q.getContent(), "UTF-8")
+ "&processingChain=" + org.put.util.net.URLEncoding.encode(p.getId(), "UTF-8")
+ "&resultsRequested=" + (q.hasRequestedResults() ? q.getRequestedResults() : 0)) %>" target="_top">
<%= org.put.util.text.HtmlHelper.escapeHtmlTags(q.getContent()) %>
</a></nobr>
<div style="margin-bottom: 0.5em; font-size: 9px; color: #a0a0a0;">
(<%= q.getRequestedResults() %>, <%= StrutsHelpers.getMessageOrDefault(pageContext, p.getId(), p.getDefaultDescription()) %>)
</div>
<%
}
} else {
%>
<span style="color: red;">History not enabled.</span>
<%
}
%>
|
|
From: <daw...@us...> - 2003-11-26 22:24:41
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/gfx In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/web/gfx Added Files: scr-groups.gif scr-process.gif Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. --- NEW FILE: scr-groups.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: scr-process.gif --- (This appears to be a binary file; contents omitted.) |
63 messages has been excluded from this view by a project administrator.