X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2Fstructurechooser%2FThreeDBStructureChooserQuerySource.java;h=76ef85f85f16d2f3e11b21e76fbeeea499daab8f;hb=f6d1305378fa256a42caf7d284b13d5a084bc471;hp=8b4258f9ab07328a67a5ea9a5a7e2994a42c3423;hpb=07fa97ae1c269df7345e50c31aca1aa0aaa40d91;p=jalview.git diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java index 8b4258f..76ef85f 100644 --- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java +++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java @@ -310,7 +310,7 @@ public class ThreeDBStructureChooserQuerySource && tdBeaconsFilters.contains(fieldToFilterBy); } - private String remove_prefix(String fieldToFilterBy) + protected String remove_prefix(String fieldToFilterBy) { if (tdBeaconsFilters != null && tdBeaconsFilters.contains(fieldToFilterBy) @@ -453,7 +453,10 @@ public class ThreeDBStructureChooserQuerySource pdbEntry.setRetrievalUrl(urlStr); } pdbEntry.setProvider(typeColumn); - pdbEntry.setProviderPage(modelPage); + if (modelPage != null) + { + pdbEntry.setProviderPage(modelPage); + } selectedSeq.getDatasetSequence().addPDBId(pdbEntry); } pdbEntriesToView[count++] = pdbEntry; @@ -546,6 +549,11 @@ public class ThreeDBStructureChooserQuerySource try { resultList = pdbquery.executePDBFTSRestRequest(pdbRequest); + if (resultList.getNumberOfItemsFound() == 0) + { + Console.info("Unexpectedly returned no results for pdbe query: " + + pdb_Query); + } results.add(resultList); lastPdbRequest = pdbRequest; } catch (Exception ex) @@ -579,7 +587,7 @@ public class ThreeDBStructureChooserQuerySource { if (!hasPdbResp) { - System.out.println( + jalview.bin.Console.outPrintln( "Warning: seems like we couldn't get to the PDBe search interface."); } else