Merge pull request #61 from onursumer/hotfix

Minor fixes
cBioPortal · Nov 1, 2016 · 2b4ce6b · 2b4ce6b
2 parents 157ce91 + c790d11
commit 2b4ce6b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/build/mutationMapper.js b/build/mutationMapper.js
@@ -4554,9 +4554,10 @@ function MutationInputParser ()
 		var index = indexMap[column];
 		var value = undefined;
 
-		if (index != null)
+		if (index != null &&
+		    values[index] != null)
 		{
-			value = values[index] || undefined;
+			value = values[index].trim();
 		}
 
 		return value;
@@ -4575,7 +4576,7 @@ function MutationInputParser ()
 		var map = {};
 
 		_.each(columns, function(column, index) {
-			map[column.toLowerCase()] = index;
+			map[column.trim().toLowerCase()] = index;
 		});
 
 		return map;

diff --git a/build/mutationMapper.min.js b/build/mutationMapper.min.js
diff --git a/debug/debug.html b/debug/debug.html
@@ -177,7 +177,7 @@
         <td><input class="url-pdb-service"
                    size="70"
                    type="text"
-                   value="http://www.cbioportal.org/get3dPdb.json"></td>
+                   value="https://cbioportal.mskcc.org/pdb-annotation/pdb_annotation"></td>
     </tr>
     <tr>
         <td>PFAM Service URL:</td>

diff --git a/debug/main.js b/debug/main.js
@@ -70,7 +70,7 @@ $(document).ready(function() {
 				pdbProxy: {
 					options: {
 						servletName: $(".url-pdb-service").val() ||
-						             "http://www.cbioportal.org/get3dPdb.json",
+						             "https://cbioportal.mskcc.org/pdb-annotation/pdb_annotation",
 						initMode: "lazy"
 					}
 				},

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mutation-mapper",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "dependencies": {},
   "devDependencies": {
     "gulp": "^3.9.0",

diff --git a/src/js/util/MutationInputParser.js b/src/js/util/MutationInputParser.js
@@ -235,9 +235,10 @@ function MutationInputParser ()
 		var index = indexMap[column];
 		var value = undefined;
 
-		if (index != null)
+		if (index != null &&
+		    values[index] != null)
 		{
-			value = values[index] || undefined;
+			value = values[index].trim();
 		}
 
 		return value;
@@ -256,7 +257,7 @@ function MutationInputParser ()
 		var map = {};
 
 		_.each(columns, function(column, index) {
-			map[column.toLowerCase()] = index;
+			map[column.trim().toLowerCase()] = index;
 		});
 
 		return map;