Changeset 21995 for gs3-extensions/mat/trunk/src/org
- Timestamp:
- 2010-04-29T16:30:36+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/mat/trunk/src/org/greenstone/mat/servlet/MatServlet.java
r21972 r21995 461 461 462 462 463 String[] arrays = new String[1 3];463 String[] arrays = new String[15]; 464 464 arrays[0] = "cmd"; 465 465 arrays[1] = "/c"; … … 475 475 arrays[11] = collectDir; 476 476 arrays[12] = logFile; 477 arrays[13] = hostName; 478 arrays[14] = "" + port_number; 477 479 478 480 Process p2 = processBatch(arrays,out,wd); … … 615 617 String matShell2 = ""; 616 618 617 619 matShell2 = gsdl3Root + fileSeparator + "ext" + fileSeparator +"mat"+ fileSeparator +"bin" + fileSeparator + "script" + fileSeparator + "mat-colbuild.bash " 618 620 + collName 619 621 + " " … … 630 632 + collectDir 631 633 + " " 632 + logFile; 633 634 + logFile 635 + " " 636 + hostName + ":" + port_number; 634 637 635 638 out.println("<form method=\"post\" name=\"collectionForm\">"); … … 674 677 StringBuffer stdInputBuffer = new StringBuffer(); 675 678 while ((s = stdInput.readLine()) != null) { 676 677 679 stdInputBuffer.append(s+"\n"); 680 if(s.indexOf("-->")!=-1){ 678 681 s = s.replaceAll("-->", ""); 679 out.println("<!-- " + s + " -->");680 681 682 out.println("<!-- " + s + " -->");683 682 //out.println("<!-- " + s + " -->"); 683 } 684 else{ 685 //out.println("<!-- " + s + " -->"); 686 } 684 687 out.flush(); 685 688 } … … 749 752 if(s.indexOf("-->")!=-1){ 750 753 s = s.replaceAll("-->", ""); 751 out.println("<!-- " + s + " -->");754 //out.println("<!-- " + s + " -->"); 752 755 } 753 756 else{ 754 out.println("<!-- " + s + " -->");757 //out.println("<!-- " + s + " -->"); 755 758 } 756 759 out.flush();
Note:
See TracChangeset
for help on using the changeset viewer.