From 3e3d713363370f45a41e8cbd4dfb374129a86c54 Mon Sep 17 00:00:00 2001 From: arngucci Date: Mon, 7 Jun 2021 10:32:50 +0200 Subject: [PATCH] JAL-3829_spike minor changes --- src/jalview/ws/dbsources/TDBeacons.java | 4 ++++ test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/jalview/ws/dbsources/TDBeacons.java b/src/jalview/ws/dbsources/TDBeacons.java index 12fefea..b2fbc17 100644 --- a/src/jalview/ws/dbsources/TDBeacons.java +++ b/src/jalview/ws/dbsources/TDBeacons.java @@ -70,6 +70,8 @@ public class TDBeacons extends DbSourceProxyImpl private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org"; private static final String BAR_DELIMITER = "|"; + + private static final String DEFAULT_THREEDBEACONS_DOMAIN = "https://wwwdev.ebi.ac.uk/pdbe/pdbe-kb/3dbeacons-hub-api/uniprot/summary/"; /** * Constructor @@ -82,6 +84,7 @@ public class TDBeacons extends DbSourceProxyImpl private String getDomain() { return Cache.getDefault("UNIPROT_DOMAIN", DEFAULT_UNIPROT_DOMAIN); + //return Cache.getDefault("3DB_DOMAIN", DEFAULT_THREEDBEACONS_DOMAIN ); } /* @@ -145,6 +148,7 @@ public class TDBeacons extends DbSourceProxyImpl String downloadstring = getDomain() + "/uniprot/" + queries + ".xml"; +// String downloadstring = getDomain() + queries + ".json"; URL url = new URL(downloadstring); URLConnection urlconn = url.openConnection(); diff --git a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java index 539af37..0656d67 100644 --- a/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java +++ b/test/jalview/fts/threedbeacons/TDBeaconsFTSRestClientTest.java @@ -278,7 +278,7 @@ public class TDBeaconsFTSRestClientTest try { wantedFields.add(TDBeaconsFTSRestClient.getInstance() - .getDataColumnByNameOrCode("Model id")); + .getDataColumnByNameOrCode("Model_id")); wantedFields.add(TDBeaconsFTSRestClient.getInstance() .getDataColumnByNameOrCode("model_url")); wantedFields.add(TDBeaconsFTSRestClient.getInstance() -- 1.7.10.2