You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2010/10/29 17:03:21 UTC
svn commit: r1028792 - in /incubator/oodt/branches/0.1-incubating:
CHANGES.txt
pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
Author: mattmann
Date: Fri Oct 29 15:03:21 2010
New Revision: 1028792
URL: http://svn.apache.org/viewvc?rev=1028792&view=rev
Log:
Merge r1028790 and OODT-55 fix into 0.1-incubating branch.
Modified:
incubator/oodt/branches/0.1-incubating/CHANGES.txt
incubator/oodt/branches/0.1-incubating/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
Modified: incubator/oodt/branches/0.1-incubating/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/branches/0.1-incubating/CHANGES.txt?rev=1028792&r1=1028791&r2=1028792&view=diff
==============================================================================
--- incubator/oodt/branches/0.1-incubating/CHANGES.txt (original)
+++ incubator/oodt/branches/0.1-incubating/CHANGES.txt Fri Oct 29 15:03:21 2010
@@ -4,7 +4,9 @@ Apache OODT Change Log
Release 0.1-incubating
--------------------------------------------
-Release Date: 0ct 21, 2010
+Release Date: 0ct 29, 2010
+
+* OODT-55 Latest Tika 0.8-SNAPSHOT broke pushpull (mattmann)
* OODT-51 Workflow unit test fails due to hsql not parsing the apache header correctly (woollard)
Modified: incubator/oodt/branches/0.1-incubating/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/branches/0.1-incubating/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java?rev=1028792&r1=1028791&r2=1028792&view=diff
==============================================================================
--- incubator/oodt/branches/0.1-incubating/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java (original)
+++ incubator/oodt/branches/0.1-incubating/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java Fri Oct 29 15:03:21 2010
@@ -27,6 +27,7 @@ import org.apache.oodt.cas.metadata.util
//TIKA imports
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.html.HtmlParser;
+import org.apache.tika.sax.Link;
import org.apache.tika.sax.LinkContentHandler;
//JDK imports
@@ -221,10 +222,11 @@ public class HttpClient extends Protocol
parser.parse(new ByteArrayInputStream(sb.toString().getBytes()),
handler, met);
- Map<String, String> links = handler.getLinks();
+ List<Link> links = handler.getLinks();
children = new LinkedList<ProtocolFile>();
- for (String href : links.keySet()) {
- String linkName = links.get(href);
+ for (Link link : links) {
+ String href = link.getUri();
+ String linkName = link.getTitle();
String curPath = this.pwd().getProtocolPath().getPathString();
String linkPath = curPath + (curPath.endsWith("/") ? "" : "/")
+ linkName;