incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattm...@apache.org
Subject svn commit: r1028790 - in /incubator/oodt/trunk: CHANGES.txt pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
Date Fri, 29 Oct 2010 15:00:58 GMT
Author: mattmann
Date: Fri Oct 29 15:00:58 2010
New Revision: 1028790

URL: http://svn.apache.org/viewvc?rev=1028790&view=rev
Log:
- fix for OODT-55 Latest Tika 0.8-SNAPSHOT broke pushpull 

Modified:
    incubator/oodt/trunk/CHANGES.txt
    incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java

Modified: incubator/oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/CHANGES.txt?rev=1028790&r1=1028789&r2=1028790&view=diff
==============================================================================
--- incubator/oodt/trunk/CHANGES.txt (original)
+++ incubator/oodt/trunk/CHANGES.txt Fri Oct 29 15:00:58 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/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java?rev=1028790&r1=1028789&r2=1028790&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
(original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/http/HttpClient.java
Fri Oct 29 15:00:58 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;



Mime
View raw message