X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Fpdb%2FPDBFTSRestClient.java;h=5619075dfb43d3d30cd59b75d18cb09751491931;hb=f0bba4cb65260c4e7f79c30cd442123aeb1b312f;hp=963778c40b2356c1de9643398552bbd70aa97ef9;hpb=6d03a7bc7ca503f0e845dcbc568e44a39c842612;p=jalview.git diff --git a/src/jalview/fts/service/pdb/PDBFTSRestClient.java b/src/jalview/fts/service/pdb/PDBFTSRestClient.java index 963778c..5619075 100644 --- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java +++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java @@ -20,7 +20,11 @@ */ package jalview.fts.service.pdb; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; import java.net.URI; +import java.nio.CharBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -41,6 +45,9 @@ import jalview.datamodel.SequenceI; import jalview.fts.api.FTSData; import jalview.fts.api.FTSDataColumnI; import jalview.fts.api.FTSRestClientI; +import jalview.fts.api.StructureFTSRestClientI; +import jalview.fts.core.FTSDataColumnPreferences; +import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; import jalview.fts.core.FTSRestClient; import jalview.fts.core.FTSRestRequest; import jalview.fts.core.FTSRestResponse; @@ -55,6 +62,7 @@ import jalview.util.Platform; * @author tcnofoegbu */ public class PDBFTSRestClient extends FTSRestClient + implements StructureFTSRestClientI { private static FTSRestClientI instance = null; @@ -122,8 +130,9 @@ public class PDBFTSRestClient extends FTSRestClient // Build request parameters for the REST Request - // BH 2018 the trick here is to coerce the classes in Javascript to be - // different from the ones in Java yet still allow this to be correct for Java + // BH 2018 the trick here is to coerce the classes in Javascript to be + // different from the ones in Java yet still allow this to be correct for + // Java Client client; Class clientResponseClass; if (Platform.isJS()) @@ -166,35 +175,61 @@ public class PDBFTSRestClient extends FTSRestClient URI uri = webResource.getURI(); - // System.out.println(uri); - - // Execute the REST request - ClientResponse clientResponse = webResource - .accept(MediaType.APPLICATION_JSON).get(clientResponseClass ); - + jalview.bin.Console.outPrintln(uri); + ClientResponse clientResponse = null; + int responseStatus = -1; // Get the JSON string from the response object or directly from the // client (JavaScript) Map jsonObj = null; String responseString = null; - // System.out.println("query >>>>>>> " + pdbRestRequest.toString()); + jalview.bin.Console.outPrintln("query >>>>>>> " + pdbRestRequest.toString()); + + if (!isMocked()) + { + // Execute the REST request + clientResponse = webResource.accept(MediaType.APPLICATION_JSON) + .get(clientResponseClass); + responseStatus = clientResponse.getStatus(); + } + else + { + // mock response + if (mockQueries.containsKey(uri.toString())) + { + responseStatus = 200; + } + else + { + // FIXME - may cause unexpected exceptions for callers when mocked + responseStatus = 400; + } + } // Check the response status and report exception if one occurs - int responseStatus = clientResponse.getStatus(); switch (responseStatus) { case 200: - if (Platform.isJS()) + + if (isMocked()) { - jsonObj = clientResponse.getEntity(Map.class); + responseString = mockQueries.get(uri.toString()); } else { - responseString = clientResponse.getEntity(String.class); + if (Platform.isJS()) + { + jsonObj = clientResponse.getEntity(Map.class); + } + else + { + responseString = clientResponse.getEntity(String.class); + } } break; case 400: - throw new Exception(parseJsonExceptionString(responseString)); + throw new Exception(isMocked() ? "400 response (Mocked)" + : parseJsonExceptionString(responseString)); default: throw new Exception( getMessageByHTTPStatusCode(responseStatus, "PDB")); @@ -204,6 +239,10 @@ public class PDBFTSRestClient extends FTSRestClient return parsePDBJsonResponse(responseString, jsonObj, pdbRestRequest); } catch (Exception e) { + if (e.getMessage() == null) + { + throw (e); + } String exceptionMsg = e.getMessage(); if (exceptionMsg.contains("SocketException")) { @@ -232,39 +271,42 @@ public class PDBFTSRestClient extends FTSRestClient * @return the processed error message from the JSON string */ @SuppressWarnings("unchecked") -public static String parseJsonExceptionString(String jsonErrorResponse) + public static String parseJsonExceptionString(String jsonErrorResponse) { StringBuilder errorMessage = new StringBuilder( "\n============= PDB Rest Client RunTime error =============\n"); - -// { -// "responseHeader":{ -// "status":0, -// "QTime":0, -// "params":{ -// "q":"(text:q93xj9_soltu) AND molecule_sequence:['' TO *] AND status:REL", -// "fl":"pdb_id,title,experimental_method,resolution", -// "start":"0", -// "sort":"overall_quality desc", -// "rows":"500", -// "wt":"json"}}, -// "response":{"numFound":1,"start":0,"docs":[ -// { -// "experimental_method":["X-ray diffraction"], -// "pdb_id":"4zhp", -// "resolution":2.46, -// "title":"The crystal structure of Potato ferredoxin I with 2Fe-2S cluster"}] -// }} -// + // { + // "responseHeader":{ + // "status":0, + // "QTime":0, + // "params":{ + // "q":"(text:q93xj9_soltu) AND molecule_sequence:['' TO *] AND status:REL", + // "fl":"pdb_id,title,experimental_method,resolution", + // "start":"0", + // "sort":"overall_quality desc", + // "rows":"500", + // "wt":"json"}}, + // "response":{"numFound":1,"start":0,"docs":[ + // { + // "experimental_method":["X-ray diffraction"], + // "pdb_id":"4zhp", + // "resolution":2.46, + // "title":"The crystal structure of Potato ferredoxin I with 2Fe-2S + // cluster"}] + // }} + // try { - Map jsonObj = (Map) JSONUtils.parse(jsonErrorResponse); - Map errorResponse = (Map) jsonObj.get("error"); + Map jsonObj = (Map) JSONUtils + .parse(jsonErrorResponse); + Map errorResponse = (Map) jsonObj + .get("error"); Map responseHeader = (Map) jsonObj .get("responseHeader"); - Map paramsObj = (Map) responseHeader.get("params"); + Map paramsObj = (Map) responseHeader + .get("params"); String status = responseHeader.get("status").toString(); String message = errorResponse.get("msg").toString(); String query = paramsObj.get("q").toString(); @@ -312,27 +354,30 @@ public static String parseJsonExceptionString(String jsonErrorResponse) { if (jsonObj == null) { - jsonObj = (Map) JSONUtils.parse(pdbJsonResponseString); + jsonObj = (Map) JSONUtils + .parse(pdbJsonResponseString); } - Map pdbResponse = (Map) jsonObj.get("response"); - String queryTime = ((Map) jsonObj.get("responseHeader")) - .get("QTime").toString(); + Map pdbResponse = (Map) jsonObj + .get("response"); + String queryTime = ((Map) jsonObj + .get("responseHeader")).get("QTime").toString(); int numFound = Integer .valueOf(pdbResponse.get("numFound").toString()); List docs = (List) pdbResponse.get("docs"); - // add in any alphafold bits at the top - result = AlphafoldRestClient.getFTSData(pdbRestRequest); + + result = new ArrayList(); if (numFound > 0) { - for (Iterator docIter = docs.iterator(); docIter - .hasNext();) + for (Iterator docIter = docs.iterator(); docIter.hasNext();) { Map doc = (Map) docIter.next(); result.add(getFTSData(doc, pdbRestRequest)); } } - searchResult.setNumberOfItemsFound(result.size()); + // this is the total number found by the query, + // rather than the set returned in SearchSummary + searchResult.setNumberOfItemsFound(numFound); searchResult.setResponseTime(queryTime); searchResult.setSearchSummary(result); @@ -368,8 +413,10 @@ public static String parseJsonExceptionString(String jsonErrorResponse) for (FTSDataColumnI field : diplayFields) { + // jalview.bin.Console.outPrintln("Field " + field); String fieldData = (pdbJsonDoc.get(field.getCode()) == null) ? "" : pdbJsonDoc.get(field.getCode()).toString(); + // jalview.bin.Console.outPrintln("Field Data : " + fieldData); if (field.isPrimaryKeyColumn()) { primaryKey = fieldData; @@ -393,7 +440,7 @@ public static String parseJsonExceptionString(String jsonErrorResponse) } catch (Exception e) { e.printStackTrace(); - System.out.println("offending value:" + fieldData); + jalview.bin.Console.outPrintln("offending value:" + fieldData); } } } @@ -473,6 +520,7 @@ public static String parseJsonExceptionString(String jsonErrorResponse) private Collection allDefaultDisplayedStructureDataColumns; + @Override public Collection getAllDefaultDisplayedStructureDataColumns() { if (allDefaultDisplayedStructureDataColumns == null @@ -484,6 +532,26 @@ public static String parseJsonExceptionString(String jsonErrorResponse) } return allDefaultDisplayedStructureDataColumns; } - - + + @Override + public String[] getPreferencesColumnsFor(PreferenceSource source) + { + String[] columnNames = null; + switch (source) + { + case SEARCH_SUMMARY: + columnNames = new String[] { "", "Display", "Group" }; + break; + case STRUCTURE_CHOOSER: + columnNames = new String[] { "", "Display", "Group" }; + break; + case PREFERENCES: + columnNames = new String[] { "PDB Field", "Show in search summary", + "Show in structure summary" }; + break; + default: + break; + } + return columnNames; + } }