git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2446 FeatureStore with NCList - work in progress
[jalview.git]
/
src
/
jalview
/
ws
/
ebi
/
EBIFetchClient.java
diff --git
a/src/jalview/ws/ebi/EBIFetchClient.java
b/src/jalview/ws/ebi/EBIFetchClient.java
index
5531512
..
3e8c55e
100644
(file)
--- a/
src/jalview/ws/ebi/EBIFetchClient.java
+++ b/
src/jalview/ws/ebi/EBIFetchClient.java
@@
-91,7
+91,7
@@
public class EBIFetchClient
* @param format
* the format wanted
* @param extension
* @param format
* the format wanted
* @param extension
- * for the temporary file to hold response
+ * for the temporary file to hold response (without separator)
* @return the file holding the response
* @throws OutOfMemoryError
*/
* @return the file holding the response
* @throws OutOfMemoryError
*/
@@
-102,7
+102,7
@@
public class EBIFetchClient
File outFile = null;
try
{
File outFile = null;
try
{
- outFile = File.createTempFile("jalview", ext);
+ outFile = File.createTempFile("jalview", "." + ext);
outFile.deleteOnExit();
fetchData(ids, format, outFile);
if (outFile.length() == 0)
outFile.deleteOnExit();
fetchData(ids, format, outFile);
if (outFile.length() == 0)
@@
-139,7
+139,8
@@
public class EBIFetchClient
}
// note: outFile is currently always specified, so return value is null
}
// note: outFile is currently always specified, so return value is null
- String[] rslt = fetchBatch(querystring.toString(), database, format, outFile);
+ String[] rslt = fetchBatch(querystring.toString(), database, format,
+ outFile);
return (rslt != null && rslt.length > 0 ? rslt : null);
}
return (rslt != null && rslt.length > 0 ? rslt : null);
}
@@
-208,7
+209,6
@@
public class EBIFetchClient
if (outFile != null)
{
FileOutputStream fio = new FileOutputStream(outFile);
if (outFile != null)
{
FileOutputStream fio = new FileOutputStream(outFile);
- // fio.write("<?xml version='1.0' encoding='UTF-8'?>\n".getBytes());
byte[] bb = new byte[32 * 1024];
int l;
while ((l = is.read(bb)) > 0)
byte[] bb = new byte[32 * 1024];
int l;
while ((l = is.read(bb)) > 0)
@@
-242,8
+242,7
@@
public class EBIFetchClient
return null;
}
System.err.println("Unexpected exception when retrieving from "
return null;
}
System.err.println("Unexpected exception when retrieving from "
- + database
- + "\nQuery was : '" + ids + "'");
+ + database + "\nQuery was : '" + ids + "'");
ex.printStackTrace(System.err);
return null;
} finally
ex.printStackTrace(System.err);
return null;
} finally