Changeset 21972 for gs3-extensions/mat

Timestamp:

2010-04-28T11:50:01+12:00 (14 years ago)

Author:

sjm84

Message:

MatServlet now uses the correct /mat/ rather than /greenstone/mat

File:

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

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

@@ -58 +58 @@
     out.println(h1String);
     out.println("<p>"+description+"</p>");
-    out.println("<div><form method=\"post\" action=\"http://"+hostName+":"+port_number+"/greenstone3/mat\">");
+    out.println("<div><form method=\"post\" action=\"http://"+hostName+":"+port_number+"/mat/analyse\">");
 
     out.println("<p>OAI URL: <input type=\"text\" name=\"oaiurl\" size=\"140\"></p>"); 
@@ -318 +318 @@
             
             out.println("<p>Choose one metadata prefix to use:</p>");
-            out.println("<form method=\"post\" action=\"http://"+hostName+":"+port_number+"/greenstone3/mat\">");
+            out.println("<form method=\"post\" action=\"http://"+hostName+":"+port_number+"/mat/analyse\">");
             out.println("<table rules =\"none\">");
             
@@ -426 +426 @@
     out.println("<p>Building collection...</p>");
     
-    String host = "http://"+hostName+":"+port_number+"/greenstone3/mat/";
+    String host = "http://"+hostName+":"+port_number+"/mat/";
     
     out.println("<form method=\"post\" name=\"aForm\">");
@@ -577 +577 @@
     }
     else{
-    matShell = "source "+ gsdl3Root + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "bin" + fileSeparator +"script" + fileSeparator + "mat-colbuild-download.bash "
+    matShell = gsdl3Root + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "bin" + fileSeparator +"script" + fileSeparator + "mat-colbuild-download.bash "
         + collName
         + " "
@@ -601 +601 @@
     out.flush();
     Process p = processShell(matShell, out);
-    
+
     if (p.exitValue() == 0){
         out.println("<p>Collection downloaded.</p>");
@@ -615 +615 @@
     String matShell2 = "";
 
-        matShell2 = "source "+ 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
         + " "
@@ -740 +740 @@
             String[] args = new String[]{"sh", "-c", command};
         Process p = Runtime.getRuntime().exec(args);
+
         BufferedReader stdInput = new BufferedReader(new InputStreamReader(p.getInputStream()));
         BufferedReader stdError = new BufferedReader(new InputStreamReader(p.getErrorStream()));        
         StringBuffer stdInputBuffer = new StringBuffer();
-            
+
         while ((s = stdInput.readLine()) != null) {
             stdInputBuffer.append(s+"\n");
-            if(s.indexOf("-->")!=-1){
+        if(s.indexOf("-->")!=-1){
             s = s.replaceAll("-->", "");
             out.println("<!-- " + s + " -->");
-            }
-            else{
+        }
+        else{
             out.println("<!-- " + s + " -->");
-            }
+        }
         out.flush();
         }
@@ -823 +824 @@
         if(status){
             
-            out.println("<script type=\"text/javascript\" language=\"JavaScript\"    src = \"http://"+hostName+":"+port_number+"/greenstone3/mat/script/getInfomation.js\">");
+            out.println("<script type=\"text/javascript\" language=\"JavaScript\"    src = \"http://"+hostName+":"+port_number+"/mat/script/getInfomation.js\">");
             out.println("reconfig();");
             out.println("</script>");
@@ -865 +866 @@
         titleString ="<title>"+ prop.getProperty("Servlet.Title")+"</title>";
         h1String ="<h2>"+ prop.getProperty("Servlet.Head")+"</h2>";
-        cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/greenstone3/mat/script/mat.css\" type=\"text/css\" >";
-        javaScript = "<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/greenstone3/mat/script/status3.js\"></script>";;
+        cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/mat/script/mat.css\" type=\"text/css\" >";
+        javaScript = "<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/mat/script/status3.js\"></script>";;
         headerString2 = "<head>" + titleString + "\n" +  javaScript + cssString+"</head>\n";
         headerString ="<head>" + titleString + "\n" + cssString + "</head>\n";