Merge pull request #855 from ohmage/ohmage-2.16

fixes #853

Author: stevenolen

db/sql/base/ohmage-ddl.sql

@@ -1,6 +1,6 @@
 -- MySQL DDL statements for the ohmage database
 
-CREATE DATABASE ohmage CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE DATABASE IF NOT EXISTS ohmage CHARACTER SET utf8 COLLATE utf8_general_ci;
 USE ohmage;
 
 -- --------------------------------------------------------------------

src/org/ohmage/request/document/DocumentReadContentsRequest.java

@@ -197,7 +197,7 @@ public void respond(HttpServletRequest httpRequest, HttpServletResponse httpResp
 				// Set the type and force the browser to download it as the 
 				// last step before beginning to stream the response.
 				httpResponse.setContentType("ohmage/document");
-				httpResponse.setHeader("Content-Disposition", "attachment; filename=" + documentName);
+				httpResponse.setHeader("Content-Disposition", "attachment; filename=\"" + documentName + "\"");
 
 				// If available, set the token.
 				if(getUser() != null) {