Changeset 22203


Ignore:
Timestamp:
2010-05-31T17:05:04+12:00 (13 years ago)
Author:
sjm84
Message:

These files now use the original /greenstone3/mat rather than /mat

Location:
gs3-extensions/mat/trunk/src/org/greenstone/mat/servlet
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r22171 r22203  
    5858    out.println(h1String);
    5959    out.println("<p>"+description+"</p>");
    60     out.println("<div><form method=\"post\" action=\"http://"+hostName+":"+port_number+"/mat/analyse\">");
     60    out.println("<div><form method=\"post\" action=\"http://"+hostName+":"+port_number+"/greenstone3/mat\">");
    6161
    6262    out.println("<p>OAI URL: <input type=\"text\" name=\"oaiurl\" size=\"140\"></p>");
    … …  
    318318           
    319319            out.println("<p>Choose one metadata prefix to use:</p>");
    320             out.println("<form method=\"post\" action=\"http://"+hostName+":"+port_number+"/mat/analyse\">");
     320            out.println("<form method=\"post\" action=\"http://"+hostName+":"+port_number+"/greenstone3/mat\">");
    321321            out.println("<table rules =\"none\">");
    322322           
    … …  
    426426    out.println("<p>Building collection...</p>");
    427427   
    428     String host = "http://"+hostName+":"+port_number+"/mat/";
     428    String host = "http://"+hostName+":"+port_number+"/greenstone3/mat/";
    429429   
    430430    out.println("<form method=\"post\" name=\"aForm\">");
    … …  
    819819        if(status){
    820820           
    821             out.println("<script type=\"text/javascript\" language=\"JavaScript\"    src = \"http://"+hostName+":"+port_number+"/mat/script/getInfomation.js\">");
     821            out.println("<script type=\"text/javascript\" language=\"JavaScript\"    src = \"http://"+hostName+":"+port_number+"/greenstone3/mat/script/getInfomation.js\">");
    822822            out.println("reconfig();");
    823823            out.println("</script>");
    … …  
    861861        titleString ="<title>"+ prop.getProperty("Servlet.Title")+"</title>";
    862862        h1String ="<h2>"+ prop.getProperty("Servlet.Head")+"</h2>";
    863         cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/mat/script/mat.css\" type=\"text/css\" >";
    864         javaScript = "<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/mat/script/status3.js\"></script>";;
     863        cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/greenstone3/mat/script/mat.css\" type=\"text/css\" >";
     864        javaScript = "<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/greenstone3/mat/script/status3.js\"></script>";;
    865865        headerString2 = "<head>" + titleString + "\n" +  javaScript + cssString+"</head>\n";
    866866        headerString ="<head>" + titleString + "\n" + cssString + "</head>\n";

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

    r22171 r22203  
    9696        pw = out;
    9797
    98     destination = globalProperty.getGSDL3Home() + fileSeparator + ".." + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "web" + fileSeparator + collection + fileSeparator;
     98    destination = globalProperty.getGSDL3Home() + fileSeparator + "mat" + fileSeparator + collection + fileSeparator;
    9999    HTMLDirectory = destination;
    100100        StatsDirectory = HTMLDirectory+"metadataStats"+fileSeparator;

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

    r22171 r22203  
    7777    }
    7878   
    79     cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/mat/script/mat.css\" type=\"text/css\" >";
     79    cssString = "<link rel=\"stylesheet\" href=\"http://"+hostName+":"+port_number+"/greenstone3/mat/script/mat.css\" type=\"text/css\" >";
    8080    }
    8181   
    … …  
    907907            out.write("</head>\r\n");
    908908        out.write("<body>\r\n");
    909             out.write ("<td> <div style=\"float:left;\"> <a href=\"http://"+hostName+":"+port_number+"/mat\">Mat Home</a></div>");
     909            out.write ("<td> <div style=\"float:left;\"> <a href=\"http://"+hostName+":"+port_number+"/greenstone3/mat\">Mat Home</a></div>");
    910910            out.write("<div style=\"float:right;\"><a href=\"http://chnm.gmu.edu/tools/surveys/4386/\">Please send feedback about the Mat tool</a></div></td><br>");
    911911            out.write("<h3 align=\"center\">Summary</h3>\r\n");
    … …  
    11211121            out.write("body{font-family: Arial;}\r\n");
    11221122            out.write("</style>\r\n");
    1123             out.write("<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/mat/script/status3.js\"></script>");
     1123            out.write("<script type=\"text/javascript\" src=\"http://"+hostName+":"+port_number+"/greenstone3/mat/script/status3.js\"></script>");
    11241124            out.write("</head>\r\n");
    11251125        out.write("<body>\r\n");
    … …  
    21282128    private void setupMetadataLink(String fileName){
    21292129       
    2130         String destination = globalProperty.getGSDL3Home() + fileSeparator + ".." + fileSeparator + "ext" + fileSeparator + "mat" + fileSeparator + "web" + fileSeparator + "script" + fileSeparator+fileName + ".xml";
    2131           
     2130    String destination = globalProperty.getGSDL3Home() + fileSeparator + "mat" + fileSeparator + "script" + fileSeparator + fileName + ".xml";
     2131 
    21322132        try{
    21332133        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
Note: See TracChangeset for help on using the changeset viewer.