Changeset 21972 for gs3-extensions/mat/trunk/src
- Timestamp:
- 2010-04-28T11:50:01+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/mat/trunk/src/org/greenstone/mat/servlet/MatServlet.java
r21927 r21972 58 58 out.println(h1String); 59 59 out.println("<p>"+description+"</p>"); 60 out.println("<div><form method=\"post\" action=\"http://"+hostName+":"+port_number+"/ greenstone3/mat\">");60 out.println("<div><form method=\"post\" action=\"http://"+hostName+":"+port_number+"/mat/analyse\">"); 61 61 62 62 out.println("<p>OAI URL: <input type=\"text\" name=\"oaiurl\" size=\"140\"></p>"); … … 318 318 319 319 out.println("<p>Choose one metadata prefix to use:</p>"); 320 out.println("<form method=\"post\" action=\"http://"+hostName+":"+port_number+"/ greenstone3/mat\">");320 out.println("<form method=\"post\" action=\"http://"+hostName+":"+port_number+"/mat/analyse\">"); 321 321 out.println("<table rules =\"none\">"); 322 322 … … 426 426 out.println("<p>Building collection...</p>"); 427 427 428 String host = "http://"+hostName+":"+port_number+"/ greenstone3/mat/";428 String host = "http://"+hostName+":"+port_number+"/mat/"; 429 429 430 430 out.println("<form method=\"post\" name=\"aForm\">"); … … 577 577 } 578 578 else{ 579 matShell = "source "+gsdl3Root + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "bin" + fileSeparator +"script" + fileSeparator + "mat-colbuild-download.bash "579 matShell = gsdl3Root + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "bin" + fileSeparator +"script" + fileSeparator + "mat-colbuild-download.bash " 580 580 + collName 581 581 + " " … … 601 601 out.flush(); 602 602 Process p = processShell(matShell, out); 603 603 604 604 if (p.exitValue() == 0){ 605 605 out.println("<p>Collection downloaded.</p>"); … … 615 615 String matShell2 = ""; 616 616 617 matShell2 = "source "+gsdl3Root + fileSeparator + "ext" + fileSeparator +"mat"+ fileSeparator +"bin" + fileSeparator + "script" + fileSeparator + "mat-colbuild.bash "617 matShell2 = gsdl3Root + fileSeparator + "ext" + fileSeparator +"mat"+ fileSeparator +"bin" + fileSeparator + "script" + fileSeparator + "mat-colbuild.bash " 618 618 + collName 619 619 + " " … … 740 740 String[] args = new String[]{"sh", "-c", command}; 741 741 Process p = Runtime.getRuntime().exec(args); 742 742 743 BufferedReader stdInput = new BufferedReader(new InputStreamReader(p.getInputStream())); 743 744 BufferedReader stdError = new BufferedReader(new InputStreamReader(p.getErrorStream())); 744 745 StringBuffer stdInputBuffer = new StringBuffer(); 745 746 746 747 while ((s = stdInput.readLine()) != null) { 747 748 stdInputBuffer.append(s+"\n"); 748 749 if(s.indexOf("-->")!=-1){ 749 750 s = s.replaceAll("-->", ""); 750 751 out.println("<!-- " + s + " -->"); 751 752 752 } 753 else{ 753 754 out.println("<!-- " + s + " -->"); 754 755 } 755 756 out.flush(); 756 757 } … … 823 824 if(status){ 824 825 825 out.println("<script type=\"text/javascript\" language=\"JavaScript\" src = \"http://"+hostName+":"+port_number+"/ greenstone3/mat/script/getInfomation.js\">");826 out.println("<script type=\"text/javascript\" language=\"JavaScript\" src = \"http://"+hostName+":"+port_number+"/mat/script/getInfomation.js\">"); 826 827 out.println("reconfig();"); 827 828 out.println("</script>"); … … 865 866 titleString ="<title>"+ prop.getProperty("Servlet.Title")+"</title>"; 866 867 h1String ="<h2>"+ prop.getProperty("Servlet.Head")+"</h2>"; 867 cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/ greenstone3/mat/script/mat.css\" type=\"text/css\" >";868 javaScript = "<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/ greenstone3/mat/script/status3.js\"></script>";;868 cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/mat/script/mat.css\" type=\"text/css\" >"; 869 javaScript = "<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/mat/script/status3.js\"></script>";; 869 870 headerString2 = "<head>" + titleString + "\n" + javaScript + cssString+"</head>\n"; 870 871 headerString ="<head>" + titleString + "\n" + cssString + "</head>\n";
Note:
See TracChangeset
for help on using the changeset viewer.