comparison src/HumanEchoServlet.java @ 28:52adafab20c1

The Servlet now sends the audio file to the browser;

 /*
- * HumanEchoServlet 
+ * HumanEchoServlet
  *
  * Version information
  *
  * 3 December 2013
  *

  */
 
 import java.util.Properties;
 import java.io.IOException;
 
+import java.io.FileInputStream;
+import java.io.BufferedInputStream;
+import java.io.File;
+
 import org.apache.log4j.Logger;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import javax.servlet.ServletConfig;
-import javax.servlet.RequestDispatcher;
+import javax.servlet.*;
+import javax.servlet.http.*;
 
 import com.mathworks.toolbox.javabuilder.MWJavaObjectRef;
 import com.mathworks.toolbox.javabuilder.MWNumericArray;
 import com.mathworks.toolbox.javabuilder.MWStructArray;
 import com.mathworks.toolbox.javabuilder.MWException;

 
 import uk.ac.soton.isvr.*;
 
 public class HumanEchoServlet extends HttpServlet {
     private HumanEcho echo;
+    private static Logger logger = Logger.getLogger(HumanEchoServlet.class);
 
-    private static Logger logger = Logger.getLogger(HumanEchoServlet.class);
+    private String tempdir = "";
+    private String wavdir = "";
 
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
 
         // reading properties file
         try {
             Properties properties = new Properties();
             properties.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("myapp.properties"));
 
             //get the property value and print it out
-            System.out.println(properties.getProperty("tmpdir"));
-            System.out.println(properties.getProperty("outdir"));
+            tempdir = properties.getProperty("tmpdir");
+            wavdir = properties.getProperty("outdir");
 
         } catch (IOException e) {
             e.printStackTrace();
         }
 

         // todo: validate/normalise distance
         int dist = Integer.parseInt(request.getParameter("dist"));
         MWStructArray Input = null;
         HumanEcho echo;
 
+        String outputfname = new String();
+
         try {
             echo = new HumanEcho();
 
             logger.error("We are logging!");
+            logger.warn(System.getProperty("catalina.base"));
+
 
             // Matlab structure:
             // Input = struct('dist', 0.9, 'azim', 0, 'orient', 'horz', 'dirweight', 0.2, 'outputfname', 'foo.wav')
 
             String[] InputStructFields = {"dist", "azim", "orient", "dirweight", "outputfname"};

             // the ofname should depend on the parameters
             StringBuilder sb = new StringBuilder();
             sb.append("e_d");
             sb.append(dist);
             sb.append(".wav");
-            String outputfname = sb.toString();
+            outputfname = sb.toString();
 
             Input.set("outputfname", 1, outputfname);
 
             // todo: before calling should test if wav already exists..
             Object[] result = echo.simulateBinauralSignals(Input);
         }
         catch(MWException e) {
             e.printStackTrace();
         }
 
+        // Creating the stream
+        ServletOutputStream stream = null;
+        BufferedInputStream buf = null;
+
+        try{
+            stream = response.getOutputStream();
+            File wavfile = new File(outputfname);
+
+            //set response headers
+            response.setContentType("audio/wav");
+            response.addHeader("Content-Disposition","attachment; filename=" + outputfname );
+            response.setContentLength( (int) wavfile.length( ) );
+
+            FileInputStream input = new FileInputStream(wavfile);
+            buf = new BufferedInputStream(input);
+            int readBytes = 0;
+
+            //read from the file; write to the ServletOutputStream
+            while((readBytes = buf.read( )) != -1)
+                stream.write(readBytes);
+
+        } catch (IOException ioe){
+            throw new ServletException(ioe.getMessage( ));
+        } finally {
+            //close the input/output streams
+            if(stream != null)
+                stream.close( );
+
+            if(buf != null)
+                buf.close( );
+          }
+
         System.out.println("MCRROOT: " + System.getenv("MCRROOT"));
         System.out.println("PATH: " + System.getenv("PATH"));
         System.out.println(MCRConfiguration.isInstalledMCR());
 
-
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("<BR>");
-        buffer.append("<BR>");
-
-        buffer.append("worked, ?");
-
-        buffer.append("<BR>");
-        buffer.append("<BR>");
-
-/*
-        buffer.append("<TABLE >");
-        for (double[] row : square)
-        {
-            buffer.append("<TR>");
-            for (double value : row)
-            {
-                buffer.append("<TH>");
-                buffer.append(new Double(value).intValue());
-            }
-        }
-        buffer.append("</TABLE>");
-        buffer.append("<BR>");
-        response.getOutputStream().print(buffer.toString());
-*/
+        logger.warn("tmpdir " + tempdir);
     }
 }