From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 14 Mar 2012 23:47:20 +0000 (-0700)
Subject: CSPACE-4866: Changed MIME type expected by multipart form upload path in Imports... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a4aaebe3bb5bf4dfe9455eb778806f603d19684b;p=tmp%2Fjakarta-migration.git

CSPACE-4866: Changed MIME type expected by multipart form upload path in Imports service to 'application/xml' from 'text/xml'.
---

diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
index aeee9f205..5e96b150b 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
@@ -58,6 +58,7 @@ import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
+import javax.ws.rs.core.MediaType;
 
 // The modified Nuxeo ImportCommand from nuxeo's shell:
 
@@ -285,33 +286,33 @@ public class ImportsResource extends ResourceBase {
     		Map<String, List<InputPart>> partsMap = partFormData.getFormDataMap();
     		List<InputPart> fileParts = partsMap.get("file");
     		for (InputPart part : fileParts){
-                String mediaType = part.getMediaType().toString();
-                System.out.println("Media type is:" + mediaType);
-                if (mediaType.equalsIgnoreCase("text/xml")){
-                    InputSource inputSource = new InputSource(part.getBody(InputStream.class, null));
-                    String result = createFromInputSource(inputSource);
-                    resultBuf.append(result);
-                    continue;
-                }
-    			if (mediaType.equalsIgnoreCase("application/zip")){
-                    fileStream = part.getBody(InputStream.class, null);
+                    String mediaType = part.getMediaType().toString();
+                    System.out.println("Media type is:" + mediaType);
+                    if (mediaType.equalsIgnoreCase(MediaType.APPLICATION_XML)){
+                        InputSource inputSource = new InputSource(part.getBody(InputStream.class, null));
+                        String result = createFromInputSource(inputSource);
+                        resultBuf.append(result);
+                        continue;
+                    }
+                    if (mediaType.equalsIgnoreCase("application/zip")){
+                        fileStream = part.getBody(InputStream.class, null);
 
-                    File zipfile = FileUtils.createTmpFile(fileStream, getServiceName() + "_");
-                    String zipfileName = zipfile.getCanonicalPath();
-                    System.out.println("Imports zip file saved to:" + zipfileName);
+                        File zipfile = FileUtils.createTmpFile(fileStream, getServiceName() + "_");
+                        String zipfileName = zipfile.getCanonicalPath();
+                        System.out.println("Imports zip file saved to:" + zipfileName);
 
-                    String baseOutputDir = FileTools.createTmpDir("imports-").getCanonicalPath();
-                    File indir = new File(baseOutputDir+"/in");
-                    indir.mkdir();
-                    ZipTools.unzip(zipfileName, indir.getCanonicalPath());
-                    String result = "\r\n<zipResult>Zipfile " + zipfileName + "extracted to: " + indir.getCanonicalPath()+"</zipResult>";
-                    System.out.println(result);
+                        String baseOutputDir = FileTools.createTmpDir("imports-").getCanonicalPath();
+                        File indir = new File(baseOutputDir+"/in");
+                        indir.mkdir();
+                        ZipTools.unzip(zipfileName, indir.getCanonicalPath());
+                        String result = "\r\n<zipResult>Zipfile " + zipfileName + "extracted to: " + indir.getCanonicalPath()+"</zipResult>";
+                        System.out.println(result);
 
-                    long start = System.currentTimeMillis();
-                    //TODO: now call import service...
-                    resultBuf.append(result);
-                    continue;
-                }
+                        long start = System.currentTimeMillis();
+                        //TODO: now call import service...
+                        resultBuf.append(result);
+                        continue;
+                    }
     		}
 	    	javax.ws.rs.core.Response.ResponseBuilder rb = javax.ws.rs.core.Response.ok();
 	    	rb.entity(resultBuf.toString());