X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FEBIFetchClient.java;h=9dd3d96b77acd5165713fd4f6e706e50ede58190;hb=292a54416608154f37e53241c9f6edcd05e62f5d;hp=2c829ffc1d9b76f2bdb69d107fe17c8060a81598;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/io/EBIFetchClient.java b/src/jalview/io/EBIFetchClient.java
index 2c829ff..9dd3d96 100755
--- a/src/jalview/io/EBIFetchClient.java
+++ b/src/jalview/io/EBIFetchClient.java
@@ -18,15 +18,10 @@
 */
 package jalview.io;
 
-import org.apache.axis.AxisFault;
-import org.apache.axis.client.*;
-import org.apache.axis.encoding.XMLType;
-import org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory;
-import org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory;
-
 import java.io.*;
 
-import javax.activation.DataHandler;
+import org.apache.axis.client.*;
+import org.apache.axis.encoding.XMLType;
 
 import javax.xml.namespace.QName;
 import javax.xml.rpc.ParameterMode;
@@ -120,6 +115,46 @@ public class EBIFetchClient
         }
     }
 
+    public static void main (String [] args)
+    {
+      EBIFetchClient ebi = new EBIFetchClient();
+      String[] result = ebi.fetchData("uniprot:25KD_SARPE;G6PD_HUMAN",
+                           "xml", null);
+
+     try{
+       java.io.PrintWriter out = new java.io.PrintWriter(
+      new java.io.FileWriter("out.xml"));
+
+
+       for(int i=0; i<result.length; i++)
+       {
+         out.println(result[i]);
+       }
+       out.close();
+     }catch(Exception ex){ex.printStackTrace();}
+
+    }
+
+
+    public File fetchDataAsFile(String ids, String f, String s)
+    {
+      String [] data = fetchData(ids, f, s);
+      File outFile = null;
+      try{
+        outFile = File.createTempFile("jalview", ".xml");
+        outFile.deleteOnExit();
+        PrintWriter out = new PrintWriter(new FileOutputStream(outFile));
+        int index=0;
+        while( index < data.length )
+        {
+          out.println(data[index]);
+          index++;
+        }
+        out.close();
+      }catch(Exception ex){}
+      return outFile;
+    }
+
     /**
      * DOCUMENT ME!
      *
@@ -158,98 +193,4 @@ public class EBIFetchClient
             return null;
         }
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param arg DOCUMENT ME!
-     * @param f DOCUMENT ME!
-     * @param s DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public String fetchDataFile(String arg, String f, String s)
-    {
-        if (f != null)
-        {
-            format = f;
-        }
-
-        if (s != null)
-        {
-            style = s;
-        }
-
-        call.setOperationName(new QName("urn:Dbfetch", "fetchDataFile"));
-        call.addParameter("query", XMLType.XSD_STRING, ParameterMode.IN);
-        call.addParameter("format", XMLType.XSD_STRING, ParameterMode.IN);
-        call.addParameter("style", XMLType.XSD_STRING, ParameterMode.IN);
-
-        QName qnameAttachment = new QName("urn:Dbfetch", "DataHandler");
-        call.registerTypeMapping(javax.activation.DataSource.class,
-            qnameAttachment, JAFDataHandlerSerializerFactory.class,
-            JAFDataHandlerDeserializerFactory.class);
-
-        call.setReturnType(qnameAttachment);
-
-        try
-        {
-            Object ret = call.invoke(new Object[] { arg, format, style });
-
-            if (null == ret)
-            {
-                System.err.println("Received null ");
-                throw new AxisFault("", "Received null", null, null);
-            }
-
-            if (ret instanceof String)
-            {
-                System.err.println("Received problem response from server: " +
-                    ret);
-                throw new AxisFault("", (String) ret, null, null);
-            }
-
-            if (!(ret instanceof DataHandler))
-            {
-                //The wrong type of object that what was expected.
-                System.err.println("Received problem response from server:" +
-                    ret.getClass().getName());
-                throw new AxisFault("",
-                    "Received problem response from server:" +
-                    ret.getClass().getName(), null, null);
-            }
-
-            //Still here, so far so good.
-            DataHandler rdh = (DataHandler) ret;
-
-            //From here we'll just treat the data resource as file.
-            String receivedfileName = rdh.getName(); //Get the filename.
-
-            if (receivedfileName == null)
-            {
-                System.err.println("Could not get the file name.");
-                throw new AxisFault("", "Could not get the file name.", null,
-                    null);
-            }
-
-            if (arg.equalsIgnoreCase("medline"))
-            {
-                return receivedfileName;
-            }
-            else if (arg.equalsIgnoreCase("interpro"))
-            {
-                return receivedfileName;
-            }
-            else
-            {
-                System.err.println(receivedfileName);
-            }
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-        return "ERROR";
-    }
 }