From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 30 Sep 2015 13:20:22 +0000 (+0100)
Subject: JAL-1852 disable querying of unpublished PDB entries by default
X-Git-Tag: Release_2_10_0~381
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=87760dd4df98bfeeee86027c6e44a3a3838244fe;p=jalview.git

JAL-1852 disable querying of unpublished PDB entries by default
---

diff --git a/src/jalview/ws/uimodel/PDBRestRequest.java b/src/jalview/ws/uimodel/PDBRestRequest.java
index 7826fbd..5442b65 100644
--- a/src/jalview/ws/uimodel/PDBRestRequest.java
+++ b/src/jalview/ws/uimodel/PDBRestRequest.java
@@ -44,6 +44,8 @@ public class PDBRestRequest
 
   private boolean allowEmptySequence;
 
+  private boolean allowUnpublishedEntries;
+
   private int responseSize;
 
   private boolean isSortAscending;
@@ -130,7 +132,8 @@ public class PDBRestRequest
   public String getQuery()
   {
     return fieldToSearchBy + searchTerm
-            + (isAllowEmptySeq() ? "" : " AND molecule_sequence:['' TO *]");
+            + (isAllowEmptySeq() ? "" : " AND molecule_sequence:['' TO *]")
+            + (isAllowUnpublishedEntries() ? "" : " AND status:REL");
   }
 
   public String toString()
@@ -139,4 +142,14 @@ public class PDBRestRequest
             + " isAsc: " + isAscending() + " Associated Seq : "
             + associatedSequence;
   }
+
+  public boolean isAllowUnpublishedEntries()
+  {
+    return allowUnpublishedEntries;
+  }
+
+  public void setAllowUnpublishedEntries(boolean allowUnpublishedEntries)
+  {
+    this.allowUnpublishedEntries = allowUnpublishedEntries;
+  }
 }