Author: ssanjamt
Date: 2008-02-04 15:40:33 +0100 (Mon, 04 Feb 2008)
New Revision: 6082
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/AbstractXmlSearchCommand.java
branches/2.16/httpclient-api/src/main/java/no/sesat/search/http/HTTPClient.java
Log:
SEARCH-4188 Add functionality for reading HTML with different encodings from
SearchCommands
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/AbstractXmlSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/AbstractXmlSearchCommand.java
2008-02-04 11:06:32 UTC (rev 6081)
+++
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/AbstractXmlSearchCommand.java
2008-02-04 14:40:33 UTC (rev 6082)
@@ -19,6 +19,7 @@
package no.sesat.search.mode.command;
import java.io.IOException;
+import java.io.BufferedReader;
import no.sesat.search.http.HTTPClient;
import no.sesat.search.mode.config.AbstractXmlSearchConfiguration;
@@ -102,6 +103,18 @@
return client.getXmlDocument(url);
}
+ /**
+ *
+ * @return
+ * @throws java.io.IOException
+ */
+ protected final BufferedReader getHttpReader(final String encoding) throws
IOException {
+ final String url = createRequestURL();
+ DUMP.info("Using " + url);
+ return client.getBufferedReader(url, encoding);
+ }
+
+
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified:
branches/2.16/httpclient-api/src/main/java/no/sesat/search/http/HTTPClient.java
===================================================================
---
branches/2.16/httpclient-api/src/main/java/no/sesat/search/http/HTTPClient.java
2008-02-04 11:06:32 UTC (rev 6081)
+++
branches/2.16/httpclient-api/src/main/java/no/sesat/search/http/HTTPClient.java
2008-02-04 14:40:33 UTC (rev 6082)
@@ -259,9 +259,34 @@
/**
* @param path
+ * @param encoding
* @return
* @throws java.io.IOException
*/
+ public BufferedReader getBufferedReader(final String path, final String
encoding) throws IOException {
+
+ loadUrlConnection(path);
+
+ try {
+ final long start = System.nanoTime();
+
+ final BufferedReader result = new BufferedReader(new
InputStreamReader(urlConn.getInputStream(), encoding));
+
+ Statistic.getStatistic(this.id).addInvocation(System.nanoTime() -
start);
+
+ return result;
+
+ } catch (IOException e) {
+ throw interceptIOException(e);
+
+ }
+ }
+
+ /**
+ * @param path
+ * @return
+ * @throws java.io.IOException
+ */
public long getLastModified(final String path) throws IOException {
try {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
