From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 24 Apr 2015 15:05:24 +0000 (+0100)
Subject: JAL-1710, JAL-1711 Bug fix for exception thrown when a request containing a colon... 
X-Git-Tag: Jalview_2_9~46^2~1^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=bc98852ff1a926cf7b11a92db96ff8fe308ceae0

JAL-1710, JAL-1711 Bug fix for exception thrown when a request containing a colon (:) is sent to the PDB Rest API and Implementation to allow selection of a specific PDB chain
---

diff --git a/src/jalview/gui/PDBSearchPanel.java b/src/jalview/gui/PDBSearchPanel.java
index 2d46714..5a8407a 100644
--- a/src/jalview/gui/PDBSearchPanel.java
+++ b/src/jalview/gui/PDBSearchPanel.java
@@ -74,11 +74,17 @@ public class PDBSearchPanel extends GPDBSearchPanel
       wantedFields = PDBDocFieldPreferences
               .getSearchSummaryFields();
 
+      String searchTerm = txt_search.getText();
+      if (searchTerm.contains(":"))
+      {
+        searchTerm = searchTerm.split(":")[0];
+      }
+
       PDBRestRequest request = new PDBRestRequest();
       request.setAllowEmptySeq(allowEmptySequence);
       request.setResponseSize(100);
       request.setFieldToSearchBy(searchTarget + ":");
-      request.setSearchTerm(txt_search.getText());
+      request.setSearchTerm(searchTerm);
       request.setWantedFields(wantedFields);
 
       PDBRestClient pdbRestCleint = new PDBRestClient();
@@ -131,7 +137,17 @@ public class PDBSearchPanel extends GPDBSearchPanel
     {
       String pdbIdStr = tbl_summary.getValueAt(summaryRow, pdbIdCol)
               .toString();
-      selectedIds.append(";").append(pdbIdStr);
+
+      String searchTerm = txt_search.getText();
+      if (searchTerm.contains(":"))
+      {
+        selectedIds.append(";").append(pdbIdStr).append(":")
+                .append(searchTerm.split(":")[1].toUpperCase());
+      }
+      else
+      {
+        selectedIds.append(";").append(pdbIdStr);
+      }
     }
 
     String ids = selectedIds.deleteCharAt(0).toString();