git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1954 formatting
[jalview.git]
/
src
/
jalview
/
ws
/
uimodel
/
PDBRestRequest.java
diff --git
a/src/jalview/ws/uimodel/PDBRestRequest.java
b/src/jalview/ws/uimodel/PDBRestRequest.java
index
7826fbd
..
24f38d1
100644
(file)
--- a/
src/jalview/ws/uimodel/PDBRestRequest.java
+++ b/
src/jalview/ws/uimodel/PDBRestRequest.java
@@
-21,6
+21,7
@@
package jalview.ws.uimodel;
package jalview.ws.uimodel;
+import jalview.bin.Cache;
import jalview.datamodel.SequenceI;
import jalview.ws.dbsources.PDBRestClient.PDBDocField;
import jalview.datamodel.SequenceI;
import jalview.ws.dbsources.PDBRestClient.PDBDocField;
@@
-44,12
+45,14
@@
public class PDBRestRequest
private boolean allowEmptySequence;
private boolean allowEmptySequence;
+ private boolean allowUnpublishedEntries = Cache.getDefault(
+ "ALLOW_UNPUBLISHED_PDB_QUERYING", false);
+
private int responseSize;
private boolean isSortAscending;
private int responseSize;
private boolean isSortAscending;
- private Collection<PDBDocField> wantedFields;// = new
- // Collection<PDBDocField>();
+ private Collection<PDBDocField> wantedFields;
public String getFieldToSearchBy()
{
public String getFieldToSearchBy()
{
@@
-130,7
+133,8
@@
public class PDBRestRequest
public String getQuery()
{
return fieldToSearchBy + searchTerm
public String getQuery()
{
return fieldToSearchBy + searchTerm
- + (isAllowEmptySeq() ? "" : " AND molecule_sequence:['' TO *]");
+ + (isAllowEmptySeq() ? "" : " AND molecule_sequence:['' TO *]")
+ + (isAllowUnpublishedEntries() ? "" : " AND status:REL");
}
public String toString()
}
public String toString()
@@
-139,4
+143,14
@@
public class PDBRestRequest
+ " isAsc: " + isAscending() + " Associated Seq : "
+ associatedSequence;
}
+ " isAsc: " + isAscending() + " Associated Seq : "
+ associatedSequence;
}
+
+ public boolean isAllowUnpublishedEntries()
+ {
+ return allowUnpublishedEntries;
+ }
+
+ public void setAllowUnpublishedEntries(boolean allowUnpublishedEntries)
+ {
+ this.allowUnpublishedEntries = allowUnpublishedEntries;
+ }
}
}