Changeset 18152

Timestamp:

2008-12-08T17:13:33+13:00 (15 years ago)

Author:

cc108

Message:

remove Jave 1.5 method

File:

• other-projects/trunk/greenstone3-extension/mat/src/org/greenstone/gsdl3_extension/mat/servlet/MatServlet.java (modified) (15 diffs)

other-projects/trunk/greenstone3-extension/mat/src/org/greenstone/gsdl3_extension/mat/servlet/MatServlet.java

@@ -256 +256 @@
         for (int i=0; i < identifyChildList.getLength(); i++) {
             if (identifyChildList.item(i).getNodeName() == "repositoryName" ) {
-            out.println("<tr><td><strong>Repository Name:</strong></td><td> " + identifyChildList.item(i).getTextContent() + "</td></tr>");
+            out.println("<tr><td><strong>Repository Name:</strong></td><td> " + identifyChildList.item(i).getNodeValue() + "</td></tr>");
             }
             if (identifyChildList.item(i).getNodeName() == "baseURL" ) {
-                String baseURL = identifyChildList.item(i).getTextContent();
+                
+                Node n = identifyChildList.item(i);
+                String baseURL = getTextContent(n);
+
+
                 
             if(baseURL.startsWith("http://")){
+
                 out.println("<tr><td><strong>Base URL:</strong></td><td><code><a href=\"" + baseURL + "\">" + baseURL + "</a></code></td></tr>");
                 }
                 else{
+
                 out.println("<tr><td><strong>Base URL:</strong></td><td><code><a href=\"" + oaiURLString + "\">" + oaiURLString + "</a></code></td></tr>");
             }
@@ -316 +322 @@
             out.println("<tr><td>");
             String id = "radioID" + i;
-            String prefix = prefixList.item(i).getTextContent();
+            
+            Node n = prefixList.item(i);
+            String prefix = getTextContent(n);
+            
+            //String prefix = prefixList.item(i).getNodeValue();
             
             if (prefix.equals("oai_dc")) {
@@ -410 +420 @@
     } // end doPost
     
+    
+    private static String getTextContent(Node node) {
+        Node child;
+        String sContent = node.getNodeValue() != null ? node.getNodeValue() : "";
+
+        NodeList nodes = node.getChildNodes();
+        for(int i = 0; i < nodes.getLength(); i++) {
+            child = nodes.item(i);
+            sContent += child.getNodeValue() != null ? child.getNodeValue() : "";
+            if(nodes.item(i).getChildNodes().getLength() > 0) {
+                sContent += getTextContent(nodes.item(i));
+            }
+        }
+
+        return sContent;
+    
+    }
     protected void buildCollection( PrintWriter out, String matShell2, String collName, String oaiURLString, String oaiPrefix)  throws ServletException, IOException{
     
@@ -429 +456 @@
     
     String os = "linux";
-    if(System.getProperty("os.name").toLowerCase().contains("windows")){
-        gsdl3Home = gsdl3Home.replace("\\", "/");
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
+        gsdl3Home = gsdl3Home.replaceAll("\\", "/");
         os = "windows";
     }
@@ -436 +463 @@
     
     if(os.equals("windows")){
-        gsdl3Root = gsdl3Root.replace("/","\\");
-        gsdl3Home = gsdl3Home.replace("/", "\\");
+        gsdl3Root = gsdl3Root.replaceAll("/","\\");
+        gsdl3Home = gsdl3Home.replaceAll("/", "\\");
     }
 
@@ -447 +474 @@
     String cacheDir = gsdl3Root +fileSeparator+"ext"+fileSeparator+"mat"+fileSeparator+"tmp"+fileSeparator + collName;
         
-    if(System.getProperty("os.name").toLowerCase().contains("windows")){
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
         File wd = new File(gsdl3Root + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "bin" + fileSeparator +"script");
 
@@ -501 +528 @@
 
     String os = "linux";
-    if(System.getProperty("os.name").toLowerCase().contains("windows")){
-        gsdl3Home = gsdl3Home.replace("\\", "/");
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
+        gsdl3Home = gsdl3Home.replaceAll("\\", "/");
         os = "windows";
     }
@@ -508 +535 @@
     
     if(os.equals("windows")){
-        gsdl3Root = gsdl3Root.replace("/","\\");
-        gsdl3Home = gsdl3Home.replace("/", "\\");
+        gsdl3Root = gsdl3Root.replaceAll("/","\\");
+        gsdl3Home = gsdl3Home.replaceAll("/", "\\");
     }
     String maxRecords = Records;
@@ -524 +551 @@
     String matShell  = "";
     
-    if(System.getProperty("os.name").toLowerCase().contains("windows")){
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
         
         File wd = new File(gsdl3Root + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "bin" + fileSeparator +"script");
@@ -653 +680 @@
             while ((s = stdInput.readLine()) != null) {
                 stdInputBuffer.append(s+"\n");
-                if(s.contains("-->")){
-                s = s.replace("-->", "");
+                if(s.indexOf("-->")!=-1){
+                s = s.replaceAll("-->", "");
                 out.println("<!-- " + s + " -->");
                 }
@@ -668 +695 @@
         stdErrorBuffer.append(s+"\n");
         
-        if(s.contains("-->")){
-        s = s.replace("-->", "");
+        if(s.indexOf("-->")!=-1){
+        s = s.replaceAll("-->", "");
         out.println("<!-- " + s + " -->");
         }
@@ -724 +751 @@
         while ((s = stdInput.readLine()) != null) {
             stdInputBuffer.append(s+"\n");
-            if(s.contains("-->")){
-            s = s.replace("-->", "");
+            if(s.indexOf("-->")!=-1){
+            s = s.replaceAll("-->", "");
             out.println("<!-- " + s + " -->");
             }
@@ -739 +766 @@
             stdErrorBuffer.append(s+"\n");
             
-            if(s.contains("-->")){
-            s = s.replace("-->", "");
+            if(s.indexOf("-->")!=-1){
+            s = s.replaceAll("-->", "");
             out.println("<!-- " + s + " -->");
             }
@@ -825 +852 @@
     
     String os = "linux";
-    if(System.getProperty("os.name").toLowerCase().contains("windows")){
-        gsdl3Home = gsdl3Home.replace("\\", "/");
+    if(System.getProperty("os.name").toLowerCase().indexOf("windows")!=-1){
+        gsdl3Home = gsdl3Home.replaceAll("\\", "/");
         os = "windows";
     }
@@ -832 +859 @@
     
     if(os.equals("windows")){
-        gsdl3Root = gsdl3Root.replace("/","\\");
-        gsdl3Home = gsdl3Home.replace("/", "\\");
+        gsdl3Root = gsdl3Root.replaceAll("/","\\");
+        gsdl3Home = gsdl3Home.replaceAll("/", "\\");
     }