X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fws%2FHttpClientUtils.java;h=229fa4ee9712e18cb8370a388f81708374ebcd2d;hb=0d972c388b6e0f25e0725531000fbf72eb032f53;hp=01892e739077f02173eeddbd9b7d41096a986f27;hpb=3e7ebcfda0bc54b3b91905e21835142bfd1fe8a0;p=jalview.git

diff --git a/src/jalview/ws/HttpClientUtils.java b/src/jalview/ws/HttpClientUtils.java
index 01892e7..229fa4e 100644
--- a/src/jalview/ws/HttpClientUtils.java
+++ b/src/jalview/ws/HttpClientUtils.java
@@ -1,24 +1,29 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.ws;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 
@@ -29,12 +34,18 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.DefaultHttpClient;
 
 /**
  * Helpful procedures for working with services via HTTPClient
+ * 
  * @author jimp
- *
+ * 
  */
 public class HttpClientUtils
 {
@@ -72,4 +83,69 @@ public class HttpClientUtils
     }
   }
 
+  public static BufferedReader doHttpMpartFilePost(String postUrl,
+          List<NameValuePair> vals, String fparm, File file, String mtype)
+          throws ClientProtocolException, IOException
+  {
+    HttpClient httpclient = new DefaultHttpClient();
+    HttpPost httppost = new HttpPost(postUrl);
+    MultipartEntity mpe = new MultipartEntity(
+            HttpMultipartMode.BROWSER_COMPATIBLE);
+    for (NameValuePair nvp : vals)
+    {
+      mpe.addPart(nvp.getName(), new StringBody(nvp.getValue()));
+    }
+
+    FileBody fb = new FileBody(file, mtype != null ? mtype
+            : "application/octet-stream");
+    mpe.addPart(fparm, fb);
+    UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
+    httppost.setEntity(ue);
+    HttpResponse response = httpclient.execute(httppost);
+    HttpEntity resEntity = response.getEntity();
+
+    if (resEntity != null)
+    {
+      BufferedReader r = new BufferedReader(new InputStreamReader(
+              resEntity.getContent()));
+      return r;
+    }
+    else
+    {
+      return null;
+    }
+  }
+
+  public static BufferedReader doHttpMpartInputstreamPost(String postUrl,
+          List<NameValuePair> vals, String fparm, String fname,
+          InputStream is, String mtype) throws ClientProtocolException,
+          IOException
+  {
+    HttpClient httpclient = new DefaultHttpClient();
+    HttpPost httppost = new HttpPost(postUrl);
+    MultipartEntity mpe = new MultipartEntity(HttpMultipartMode.STRICT);
+    for (NameValuePair nvp : vals)
+    {
+      mpe.addPart(nvp.getName(), new StringBody(nvp.getValue()));
+    }
+
+    InputStreamBody fb = (mtype != null) ? new InputStreamBody(is, fname,
+            mtype) : new InputStreamBody(is, fname);
+    mpe.addPart(fparm, fb);
+    UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
+    httppost.setEntity(ue);
+    HttpResponse response = httpclient.execute(httppost);
+    HttpEntity resEntity = response.getEntity();
+
+    if (resEntity != null)
+    {
+      BufferedReader r = new BufferedReader(new InputStreamReader(
+              resEntity.getContent()));
+      return r;
+    }
+    else
+    {
+      return null;
+    }
+  }
 }