Changeset 21995

Timestamp:

2010-04-29T16:30:36+12:00 (14 years ago)

Author:

sjm84

Message:

MatServlet.java now gives its host name and port number to the mat-colbuild.bash script

File:

• gs3-extensions/mat/trunk/src/org/greenstone/mat/servlet/MatServlet.java (modified) (6 diffs)

gs3-extensions/mat/trunk/src/org/greenstone/mat/servlet/MatServlet.java

@@ -461 +461 @@
     
         
-        String[] arrays = new String[13];
+        String[] arrays = new String[15];
         arrays[0] = "cmd";
         arrays[1] = "/c";
@@ -475 +475 @@
         arrays[11] = collectDir;
         arrays[12] = logFile;
+        arrays[13] = hostName;
+        arrays[14] = "" + port_number;
         
         Process p2 = processBatch(arrays,out,wd);
@@ -615 +617 @@
     String matShell2 = "";
 
-        matShell2 = gsdl3Root + fileSeparator + "ext" + fileSeparator +"mat"+ fileSeparator +"bin" + fileSeparator + "script" + fileSeparator + "mat-colbuild.bash "
+    matShell2 = gsdl3Root + fileSeparator + "ext" + fileSeparator +"mat"+ fileSeparator +"bin" + fileSeparator + "script" + fileSeparator + "mat-colbuild.bash "
         + collName
         + " "
@@ -630 +632 @@
         + collectDir
         + " " 
-        + logFile;
-
+        + logFile
+        + " "
+        + hostName + ":" + port_number;
         
     out.println("<form method=\"post\" name=\"collectionForm\">");
@@ -674 +677 @@
             StringBuffer stdInputBuffer = new StringBuffer();
             while ((s = stdInput.readLine()) != null) {
-                stdInputBuffer.append(s+"\n");
-                if(s.indexOf("-->")!=-1){
+        stdInputBuffer.append(s+"\n");
+        if(s.indexOf("-->")!=-1){
                 s = s.replaceAll("-->", "");
-                out.println("<!-- " + s + " -->");
-                }
-                else{
-                out.println("<!-- " + s + " -->");
-                }
+                //out.println("<!-- " + s + " -->");
+        }
+        else{
+                //out.println("<!-- " + s + " -->");
+        }
             out.flush();
             }
@@ -749 +752 @@
         if(s.indexOf("-->")!=-1){
             s = s.replaceAll("-->", "");
-            out.println("<!-- " + s + " -->");
+            //out.println("<!-- " + s + " -->");
         }
         else{
-            out.println("<!-- " + s + " -->");
+            //out.println("<!-- " + s + " -->");
         }
         out.flush();