adding annotations was getting tripped up by spaces after protein ids…

… in annotatino CSV file
colin-combe · Mar 24, 2016 · ab2aacd · ab2aacd
1 parent 1098103
commit ab2aacd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/controller/Init.js b/src/controller/Init.js
@@ -392,6 +392,7 @@ xiNET.Controller.prototype.addMatches = function(matches) {
 // add annotation, 'HUMAN' RESIDUE NUMBERING - STARTS AT ONE
 //TODO: make start and end res last args
 xiNET.Controller.prototype.addAnnotation = function(protId, annotName, startRes, endRes, colour) {
+    protId = protId.toString().trim();
     var protein = this.proteins.get(protId);
     if (protein) {
 		//lets just check a few things here...

diff --git a/src/controller/ReadCSV.js b/src/controller/ReadCSV.js
@@ -169,7 +169,7 @@ xiNET.Controller.prototype.readCSV = function(csv, fasta, annotations) {
             for (var i = 0; i < accArray.length; i++) {
 				var id = accArray[i].trim();
 				if (id.trim() !== '-' && id.trim() !== 'n/a'){
-					var acc, name;
+					var acc = "", name = "";
 					if (accArray[i].indexOf('|') === -1) {
 						acc = accArray[i].trim();
 					}