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-3829 attempt to fix my changes to follow the Jira issue
[jalview.git]
/
src
/
jalview
/
fts
/
service
/
threedbeacons
/
TDBeaconsFTSRestClient.java
diff --git
a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
index
655b960
..
7c06f05
100644
(file)
--- a/
src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
+++ b/
src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java
@@
-151,21
+151,19
@@
public class TDBeaconsFTSRestClient extends FTSRestClient
{
jsonObj = (Map<String, Object>) JSONUtils.parse(tdbJsonResponseString);
}
{
jsonObj = (Map<String, Object>) JSONUtils.parse(tdbJsonResponseString);
}
- //System.out.println(jsonObj);
Object uniprot_entry = jsonObj.get("uniprot_entry");
Object uniprot_entry = jsonObj.get("uniprot_entry");
- System.out.println(uniprot_entry);
-
Long seqLength = (Long) ((Map<String, Object>) jsonObj.get("uniprot_entry")).get("sequence_length");
Long seqLength = (Long) ((Map<String, Object>) jsonObj.get("uniprot_entry")).get("sequence_length");
- System.out.println("seqLenght :" + seqLength);
+ //System.out.println(uniprot_entry);
+ //System.out.println(jsonObj);
+ //System.out.println("seqLenght :" + seqLength);
- result = new ArrayList<>();
+ //Map<String, Object> tdbResponse = (Map<String, Object>) jsonObj.get("structures");
List<Object> structures = (List<Object>) jsonObj.get("structures");
List<Object> structures = (List<Object>) jsonObj.get("structures");
- //Map<String, Object> tdbResponse = (Map<String, Object>) jsonObj.get("structures");
+ result = new ArrayList<>();
int numFound = 0;
int numFound = 0;
- for (Iterator<Object> strucIter = structures.iterator(); strucIter
- .hasNext();)
+ for (Iterator<Object> strucIter = structures.iterator(); strucIter.hasNext();)
{
Map<String, Object> structure = (Map<String, Object>) strucIter.next();
result.add(getFTSData(structure, tdbRestRequest));
{
Map<String, Object> structure = (Map<String, Object>) strucIter.next();
result.add(getFTSData(structure, tdbRestRequest));
@@
-194,9
+192,12
@@
private static FTSData getFTSData(Map<String, Object> tdbJsonStructure,
Collection<FTSDataColumnI> displayFields = tdbRequest.getWantedFields();
int colCounter = 0;
summaryRowData = new Object[displayFields.size()];
Collection<FTSDataColumnI> displayFields = tdbRequest.getWantedFields();
int colCounter = 0;
summaryRowData = new Object[displayFields.size()];
+
for (FTSDataColumnI field : displayFields) {
for (FTSDataColumnI field : displayFields) {
+ System.out.println("Field " + field);
String fieldData = (tdbJsonStructure.get(field.getCode()) == null) ? " "
: tdbJsonStructure.get(field.getCode()).toString();
String fieldData = (tdbJsonStructure.get(field.getCode()) == null) ? " "
: tdbJsonStructure.get(field.getCode()).toString();
+ System.out.println("Field Data : " + fieldData);
if (field.isPrimaryKeyColumn())
{
primaryKey = fieldData;
if (field.isPrimaryKeyColumn())
{
primaryKey = fieldData;
@@
-219,7
+220,7
@@
private static FTSData getFTSData(Map<String, Object> tdbJsonStructure,
: fieldData;
} catch (Exception e)
{
: fieldData;
} catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
System.out.println("offending value:" + fieldData);
}
}
System.out.println("offending value:" + fieldData);
}
}