X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2Fstructurechooser%2FThreeDBStructureChooserQuerySource.java;h=8b4258f9ab07328a67a5ea9a5a7e2994a42c3423;hb=07fa97ae1c269df7345e50c31aca1aa0aaa40d91;hp=23b96c9d25d73e7f0a1f8e55ed8ef39047e6f511;hpb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;p=jalview.git

diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
index 23b96c9..8b4258f 100644
--- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
+++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui.structurechooser;
 
 import java.util.ArrayList;
@@ -72,6 +92,7 @@ public class ThreeDBStructureChooserQuerySource
    * @return the built query string
    */
 
+  @Override
   public String buildQuery(SequenceI seq)
   {
     List<DBRefEntry> refs = seq.getDBRefs();
@@ -161,6 +182,7 @@ public class ThreeDBStructureChooserQuerySource
    * @return
    * @throws Exception
    */
+  @Override
   public FTSRestResponse fetchStructuresMetaData(SequenceI seq,
           Collection<FTSDataColumnI> wantedFields,
           FilterOption selectedFilterOpt, boolean b) throws Exception
@@ -175,7 +197,7 @@ public class ThreeDBStructureChooserQuerySource
       lastTdbRequest = tdbRequest;
       if (resultList != null)
       { // Query the PDB and add additional metadata
-        FTSRestResponse pdbResponse = fetchStructuresMetaDataFor(
+        List<FTSRestResponse> pdbResponse = fetchStructuresMetaDataFor(
                 getPDBQuerySource(), resultList);
 
         resultList = joinResponses(resultList, pdbResponse);
@@ -246,7 +268,7 @@ public class ThreeDBStructureChooserQuerySource
       {
         // tdb returns custom object
         TDB_FTSData row = (TDB_FTSData) _row;
-        String provider = (String) row.getProvider();
+        String provider = row.getProvider();
         FilterOption providerOpt = new FilterOption(
                 "3DB Provider - " + provider,
                 FILTER_SOURCE_PREFIX + provider, VIEWS_FILTER, false, this);
@@ -325,6 +347,7 @@ public class ThreeDBStructureChooserQuerySource
    * @return
    * @throws Exception
    */
+  @Override
   public FTSRestResponse selectFirstRankedQuery(SequenceI seq,
           Collection<FTSData> collectedResults,
           Collection<FTSDataColumnI> wantedFields, String fieldToFilterBy,
@@ -415,6 +438,7 @@ public class ThreeDBStructureChooserQuerySource
       {
         pdbEntry = new PDBEntry();
         pdbEntry.setId(pdbIdStr);
+        pdbEntry.setAuthoritative(true);
         try
         {
           pdbEntry.setType(PDBEntry.Type.valueOf(strucFormat));
@@ -451,8 +475,9 @@ public class ThreeDBStructureChooserQuerySource
    * @return
    */
 
-  public String buildPDBFTSQueryFor(FTSRestResponse upResponse)
+  public List<String> buildPDBFTSQueryFor(FTSRestResponse upResponse)
   {
+    List<String> ftsQueries = new ArrayList<String>();
     Set<String> pdbIds = new HashSet<String>();
     int idx_modelId = getLastFTSRequest().getFieldIndex("Model id");
     int idx_provider = getLastFTSRequest().getFieldIndex("Provider");
@@ -465,7 +490,25 @@ public class ThreeDBStructureChooserQuerySource
         pdbIds.add(id);
       }
     }
-    return String.join(" OR ", pdbIds).toString();
+    StringBuilder sb = new StringBuilder();
+    for (String pdbId : pdbIds)
+    {
+      if (sb.length() > 2500)
+      {
+        ftsQueries.add(sb.toString());
+        sb.setLength(0);
+      }
+      if (sb.length() > 0)
+      {
+        sb.append(" OR ");
+      }
+      sb.append(pdbId);
+    }
+    if (sb.length() > 0)
+    {
+      ftsQueries.add(sb.toString());
+    }
+    return ftsQueries;
   }
 
   /**
@@ -475,34 +518,48 @@ public class ThreeDBStructureChooserQuerySource
    * @param upResponse
    * @return FTSRestResponse via PDBStructureChooserQuerySource
    */
-  public FTSRestResponse fetchStructuresMetaDataFor(
+  public List<FTSRestResponse> fetchStructuresMetaDataFor(
           PDBStructureChooserQuerySource pdbquery,
           FTSRestResponse upResponse) throws Exception
   {
-
-    String pdb_Query = buildPDBFTSQueryFor(upResponse);
-    if (pdb_Query.length() == 0)
+    List<String> pdb_Queries = buildPDBFTSQueryFor(upResponse);
+    if (pdb_Queries.size() == 0)
     {
       return null;
     }
-    FTSRestResponse resultList;
-    FTSRestRequest pdbRequest = new FTSRestRequest();
-    pdbRequest.setAllowEmptySeq(false);
-    pdbRequest.setResponseSize(500);
-    pdbRequest.setFieldToSearchBy("(");
-    // pdbRequest.setFieldToSortBy("pdb_id");
-    pdbRequest.setWantedFields(
-            pdbquery.getDocFieldPrefs().getStructureSummaryFields());
-    pdbRequest.setSearchTerm(pdb_Query + ")");
+    List<FTSRestResponse> results = new ArrayList<FTSRestResponse>();
 
-    resultList = pdbquery.executePDBFTSRestRequest(pdbRequest);
+    for (String pdb_Query : pdb_Queries)
+    {
+      FTSRestResponse resultList;
+      FTSRestRequest pdbRequest = new FTSRestRequest();
+      pdbRequest.setAllowEmptySeq(false);
+      pdbRequest.setResponseSize(500);
+      pdbRequest.setFieldToSearchBy("(");
+      // pdbRequest.setFieldToSortBy("pdb_id");
+      pdbRequest.setWantedFields(
+              pdbquery.getDocFieldPrefs().getStructureSummaryFields());
+      pdbRequest.setSearchTerm(pdb_Query + ")");
+
+      // handle exceptions like server errors here - means the threedbeacons
+      // discovery isn't broken by issues to do with the PDBe SOLR api
+      try
+      {
+        resultList = pdbquery.executePDBFTSRestRequest(pdbRequest);
+        results.add(resultList);
+        lastPdbRequest = pdbRequest;
+      } catch (Exception ex)
+      {
+        Console.error("PDBFTSQuery failed", ex);
+      }
 
-    lastPdbRequest = pdbRequest;
-    return resultList;
+    }
+
+    return results;
   }
 
   public FTSRestResponse joinResponses(FTSRestResponse upResponse,
-          FTSRestResponse pdbResponse)
+          List<FTSRestResponse> pdbResponses)
   {
     boolean hasPdbResp = lastPdbRequest != null;
 
@@ -527,13 +584,16 @@ public class ThreeDBStructureChooserQuerySource
         }
         else
         {
-          for (final FTSData pdbrow : pdbResponse.getSearchSummary())
+          for (final FTSRestResponse pdbResponse : pdbResponses)
           {
-            String pdbid = (String) pdbrow.getSummaryData()[pdbIdx];
-            if (id.equalsIgnoreCase(pdbid))
+            for (final FTSData pdbrow : pdbResponse.getSearchSummary())
             {
-              row.getSummaryData()[tdbTitle_idx] = pdbrow
-                      .getSummaryData()[pdbTitle_idx];
+              String pdbid = (String) pdbrow.getSummaryData()[pdbIdx];
+              if (id.equalsIgnoreCase(pdbid))
+              {
+                row.getSummaryData()[tdbTitle_idx] = pdbrow
+                        .getSummaryData()[pdbTitle_idx];
+              }
             }
           }
         }