git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7271c53
)
JAL-2102 right justify 'Mass' in uniprot FTS, and 'Max Observed Residue' in PDB FTS...
author
tcofoegbu
<tcnofoegbu@dundee.ac.uk>
Tue, 14 Jun 2016 16:47:55 +0000
(17:47 +0100)
committer
tcofoegbu
<tcnofoegbu@dundee.ac.uk>
Tue, 14 Jun 2016 16:47:55 +0000
(17:47 +0100)
resources/fts/pdb_data_columns.txt
patch
|
blob
|
history
resources/fts/uniprot_data_columns.txt
patch
|
blob
|
history
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
patch
|
blob
|
history
diff --git
a/resources/fts/pdb_data_columns.txt
b/resources/fts/pdb_data_columns.txt
index
1827a85
..
5ac50bb
100644
(file)
--- a/
resources/fts/pdb_data_columns.txt
+++ b/
resources/fts/pdb_data_columns.txt
@@
-29,7
+29,7
@@
g2;Cross References;2
g3;Names & Taxonomy;3
g4;Procedures & Software;4
g5;Date Of;5
g3;Names & Taxonomy;3
g4;Procedures & Software;4
g5;Date Of;5
-g6;Miscellenous;6
+g6;Miscellaneous;6
#
_data_column.primary_key;pdb_id
_data_column.default_response_page_size;100
#
_data_column.primary_key;pdb_id
_data_column.default_response_page_size;100
@@
-82,7
+82,7
@@
Status;status;String;g6;50;400;95;false;false
Model Quality;model_quality;Double|T|2;g1;50;150;85;false;false
Pivot Resolution;pivot_resolution;Double|T|3;g1;50;150;85;false;false
Data reduction software;data_reduction_software;String;g4;50;400;95;false;false
Model Quality;model_quality;Double|T|2;g1;50;150;85;false;false
Pivot Resolution;pivot_resolution;Double|T|3;g1;50;150;85;false;false
Data reduction software;data_reduction_software;String;g4;50;400;95;false;false
-Max observed residues;max_observed_residues;String;g6;50;400;95;false;false
+Max observed residues;max_observed_residues;Integer|F;g6;50;400;95;false;false
Organism scientific name;organism_scientific_name;String;g3;50;400;95;false;false
Super kingdom;superkingdom;String;g3;50;400;95;false;false
Rank;rank;String;g3;50;400;95;false;false
Organism scientific name;organism_scientific_name;String;g3;50;400;95;false;false
Super kingdom;superkingdom;String;g3;50;400;95;false;false
Rank;rank;String;g3;50;400;95;false;false
diff --git
a/resources/fts/uniprot_data_columns.txt
b/resources/fts/uniprot_data_columns.txt
index
723e86d
..
fccf3bb
100644
(file)
--- a/
resources/fts/uniprot_data_columns.txt
+++ b/
resources/fts/uniprot_data_columns.txt
@@
-29,7
+29,7
@@
g2;Cross References;2
g3;Names & Taxonomy;1
g4;Procedures & Softwares;4
g5;Date Of;5
g3;Names & Taxonomy;1
g4;Procedures & Softwares;4
g5;Date Of;5
-g6;Miscellenous;6
+g6;Miscellaneous;6
g7;Sequences;7
g8;Function;8
g9;Interaction;9
g7;Sequences;7
g8;Function;8
g9;Interaction;9
@@
-77,7
+77,7
@@
RNA editing;comment(RNA EDITING);String;g7;50;1000;95;false;false
Sequence caution;comment(SEQUENCE CAUTION);String;g7;50;1000;95;false;false
Status;reviewed;String;g6;50;100;95;true;true
Length;length;int|T|0;g7;50;100;65;true;true
Sequence caution;comment(SEQUENCE CAUTION);String;g7;50;1000;95;false;false
Status;reviewed;String;g6;50;100;95;true;true
Length;length;int|T|0;g7;50;100;65;true;true
-Mass;mass;String;g7;50;100;80;false;true
+Mass;mass;int|T|0;g7;50;100;80;false;true
Sequence;sequence;String;g7;50;1000;95;false;false
Alternative sequence;feature(ALTERNATIVE SEQUENCE);String;g7;50;1000;95;false;false
Natural variant;feature(NATURAL VARIANT);String;g7;50;1000;95;false;false
Sequence;sequence;String;g7;50;1000;95;false;false
Alternative sequence;feature(ALTERNATIVE SEQUENCE);String;g7;50;1000;95;false;false
Natural variant;feature(NATURAL VARIANT);String;g7;50;1000;95;false;false
diff --git
a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index
dfdf715
..
5ee518b
100644
(file)
--- a/
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@
-240,7
+240,7
@@
public class UniProtFTSRestClient extends FTSRestClient
{
summaryRowData[colCounter++] = (field.getDataType()
.getDataTypeClass() == Integer.class) ? Integer
{
summaryRowData[colCounter++] = (field.getDataType()
.getDataTypeClass() == Integer.class) ? Integer
- .valueOf(fieldData)
+ .valueOf(fieldData.replace(",", ""))
: (field.getDataType()
.getDataTypeClass() == Double.class) ? Double
.valueOf(fieldData) : fieldData;
: (field.getDataType()
.getDataTypeClass() == Double.class) ? Double
.valueOf(fieldData) : fieldData;