[Archive-access-cvs] SF.net SVN: archive-access:[3218] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex

[<bra...@us...>]

Revision: 3218
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3218&view=rev
Author:   bradtofel
Date:     2010-08-10 19:52:40 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
removed getTextContent() methods...

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java	2010-08-10 19:00:31 UTC (rev 3217)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java	2010-08-10 19:52:40 UTC (rev 3218)
@@ -49,6 +49,7 @@
 import org.archive.wayback.util.Timestamp;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
@@ -215,7 +216,7 @@
 			results = new ArrayList<CaptureSearchResult>();
 		
 			for(int i = 0; i < numDates; i++) {
-				String captureDate = nodes.item(i).getTextContent();
+				String captureDate = getNodeTextValue(nodes.item(i));
 				CaptureSearchResult result = new CaptureSearchResult();
 				result.setFile(fileName);
 				result.setCaptureTimestamp(captureDate);
@@ -313,7 +314,7 @@
        NodeList nodes = e.getElementsByTagNameNS(NUTCH_NS, key);
        String result = null;
        if (nodes != null && nodes.getLength() > 0) {
-           result = nodes.item(0).getTextContent();
+           result = getNodeTextValue(nodes.item(0));
        }
        return (result == null || result.length() == 0)? null: result;
    }
@@ -323,10 +324,18 @@
        NodeList nodes = e.getElementsByTagName(key);
        String result = null;
        if (nodes != null && nodes.getLength() > 0) {
-           result = nodes.item(0).getTextContent();
+           result = getNodeTextValue(nodes.item(0));
        }
        return (result == null || result.length() == 0)? null: result;
    }
+	private String getNodeTextValue(Node n) {
+		if(n.hasChildNodes()) {
+			if(n.getFirstChild().getNodeName().equals("#text")) {
+				return n.getFirstChild().getNodeValue();
+			}
+		}
+		return "";
+	}
 
    // do an HTTP request, plus parse the result into an XML DOM
    protected synchronized Document getHttpDocument(String url) 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java	2010-08-10 19:00:31 UTC (rev 3217)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java	2010-08-10 19:52:40 UTC (rev 3218)
@@ -190,11 +190,19 @@
 		NodeList list = document.getElementsByTagName(
 				SearchResults.RESULTS_TYPE);
 		if(list.getLength() == 1) {
-			return list.item(0).getTextContent();
+			return getNodeTextValue(list.item(0));
 		} else {
 			return SearchResults.RESULTS_TYPE_CAPTURE;
 		}
 	}
+	private String getNodeTextValue(Node n) {
+		if(n.hasChildNodes()) {
+			if(n.getFirstChild().getNodeName().equals("#text")) {
+				return n.getFirstChild().getNodeValue();
+			}
+		}
+		return "";
+	}
 	
 	protected ObjectFilter<CaptureSearchResult> getSearchResultFilters(
 			WaybackRequest wbRequest) {
@@ -224,7 +232,7 @@
 		}
 		for(int i = 0; i < filters.getLength(); i++) {
 			String key = filters.item(i).getNodeName();
-			String value = filters.item(i).getTextContent();
+			String value = getNodeTextValue(filters.item(i));
 			if(!key.equals("#text")) {
 				results.putFilter(key,value);
 			}
@@ -288,7 +296,7 @@
 		NodeList chitlens = e.getChildNodes();
 		for(int i = 0; i < chitlens.getLength(); i++) {
 			String key = chitlens.item(i).getNodeName();
-			String value = chitlens.item(i).getTextContent();
+			String value = getNodeTextValue(chitlens.item(i));
 			if(!key.equals("#text")) {
 				result.put(key,value);
 			}
@@ -330,7 +338,7 @@
 		NodeList nodes = e.getElementsByTagName(key);
 		String result = null;
 		if (nodes != null && nodes.getLength() > 0) {
-			result = nodes.item(0).getTextContent();
+			result = getNodeTextValue(nodes.item(0));
 		}
 		return (result == null || result.length() == 0) ? null : result;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.