Skip to content

GitLab

M
morpheus.js
Commit 962d2c09 authored by jgould's avatar jgould
Browse files
Options

copy strings to avoid memory links

parent a7aab923
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 20 deletions
js/morpheus-latest.min.js
View file @ 962d2c09
This source diff could not be displayed because it is too large. You can view the blob instead.
src/io/gct_reader.js
View file @ 962d2c09
......@@ -100,7 +100,7 @@ morpheus.GctReader.prototype = {
var index = j + numRowAnnotations + 1;
var columnName = index < columnNamesArray.length ? columnNamesArray[index]
: null;
columnMetadata[0].push(String(columnName));
columnMetadata[0].push(morpheus.Util.copyString(columnName));
}
for (var j = 0; j < numRowAnnotations; j++) {
......@@ -119,7 +119,7 @@ morpheus.GctReader.prototype = {
columnMetadata.push(v);
columnMetadataNames.push(metadataName);
for (var j = 0; j < ncols; j++) {
v.push(String(tokens[j + dataColumnStart]));
v.push(morpheus.Util.copyString(tokens[j + dataColumnStart]));
}
} else { // data lines
if (tokens[0] !== '') {
......@@ -130,7 +130,7 @@ morpheus.GctReader.prototype = {
for (var rowAnnotationIndex = 0; rowAnnotationIndex <= numRowAnnotations; rowAnnotationIndex++) {
var rowMetadataValue = tokens[rowAnnotationIndex];
rowMetadata[rowAnnotationIndex].push(
String(rowMetadataValue));
morpheus.Util.copyString(rowMetadataValue));
}
......@@ -256,7 +256,7 @@ morpheus.GctReader.prototype = {
var index = j + numRowAnnotations + 1;
var columnName = index < columnNamesArray.length ? columnNamesArray[index]
: null;
columnMetadata[0].push(String(columnName));
columnMetadata[0].push(morpheus.Util.copyString(columnName));
}
for (var j = 0; j < numRowAnnotations; j++) {
......@@ -278,7 +278,7 @@ morpheus.GctReader.prototype = {
columnMetadata.push(v);
columnMetadataNames.push(metadataName);
for (var j = 0; j < ncols; j++) {
v.push(String(tokens[j + dataColumnStart]));
v.push(morpheus.Util.copyString(tokens[j + dataColumnStart]));
}
}
}
......@@ -296,7 +296,7 @@ morpheus.GctReader.prototype = {
for (var rowAnnotationIndex = 0; rowAnnotationIndex < numRowAnnotationsPlusOne; rowAnnotationIndex++) {
var rowMetadataValue = tokens[rowAnnotationIndex];
rowMetadata[rowAnnotationIndex].push(
String(rowMetadataValue));
morpheus.Util.copyString(rowMetadataValue));
}
......@@ -339,13 +339,13 @@ morpheus.GctReader.prototype = {
var index = j + numRowAnnotations + 1;
var columnName = index < columnNamesArray.length ? columnNamesArray[index]
: null;
columnIds.setValue(j, String(columnName));
columnIds.setValue(j, morpheus.Util.copyString(columnName));
}
} else {
for (var j = 0; j < ncols; j++) {
var columnName = columnNamesArray[j + numRowAnnotations + 1];
columnIds.setValue(j, String(columnName));
columnIds.setValue(j, morpheus.Util.copyString(columnName));
}
}
......@@ -373,7 +373,7 @@ morpheus.GctReader.prototype = {
var metadataName = tokens[0];
var v = dataset.getColumnMetadata().add(metadataName);
for (var j = 0; j < ncols; j++) {
v.setValue(j, String(tokens[j + dataColumnStart]));
v.setValue(j, morpheus.Util.copyString(tokens[j + dataColumnStart]));
}
}
}
......@@ -388,19 +388,19 @@ morpheus.GctReader.prototype = {
}
var tokens = s.split(tab);
if (version === 2) {
rowAnnotationVectors[0].setValue(rowIndex, String(tokens[0]));
rowAnnotationVectors[0].setValue(rowIndex, morpheus.Util.copyString(tokens[0]));
var desc = tokens[1];
if (!nonEmptyDescriptionFound) {
nonEmptyDescriptionFound = desc !== '';
}
rowAnnotationVectors[1].setValue(rowIndex, String(desc));
rowAnnotationVectors[1].setValue(rowIndex, morpheus.Util.copyString(desc));
} else {
// we iterate to numRowAnnotations + 1 to include id row
// metadata field
for (var rowAnnotationIndex = 0; rowAnnotationIndex < numRowAnnotationsPlusOne; rowAnnotationIndex++) {
var rowMetadataValue = tokens[rowAnnotationIndex];
rowAnnotationVectors[rowAnnotationIndex].setValue(rowIndex,
String(rowMetadataValue));
morpheus.Util.copyString(rowMetadataValue));
}
}
......
src/util/util.js
View file @ 962d2c09
......@@ -142,6 +142,13 @@ morpheus.Util.getWindowSearchObject = function () {
return _.extend(hashObject, searchObject);
};
morpheus.Util.copyString = function (s) {
var copy = '';
for (var i = 0, end = s.length; i < end; i++) {
copy += s[i];
}
return copy;
};
morpheus.Util.getQueryParams = function (s) {
var params = {};
if (!s) {
......@@ -198,11 +205,7 @@ morpheus.Util.getFileName = function (fileOrUrl) {
return fileOrUrl.name;
}
var name = '' + fileOrUrl;
var slash = name.lastIndexOf('/');
if (slash !== -1 && slash < name.length - 1) {
// https://s3.amazonaws.com/data.clue.io/icv/dosval/BRD-K45711268_10_UM_24_H/pcl_cell.gct?AWSAccessKeyId=AKIAJZQISWLUKFS3VUKA&Expires=1455761050&Signature=HVle9MvXV3OGRZHOngdm2frqER8%3D
name = name.substring(slash + 1); // get stuff after slash
}
var question = name.indexOf('?');
if (question !== -1) {
var params = name.substring(question + 1);
......@@ -216,6 +219,12 @@ morpheus.Util.getFileName = function (fileOrUrl) {
break;
}
}
} else {
var slash = name.lastIndexOf('/');
if (slash !== -1 && slash < name.length - 1) {
// https://s3.amazonaws.com/data.clue.io/icv/dosval/BRD-K45711268_10_UM_24_H/pcl_cell.gct?AWSAccessKeyId=AKIAJZQISWLUKFS3VUKA&Expires=1455761050&Signature=HVle9MvXV3OGRZHOngdm2frqER8%3D
name = name.substring(slash + 1); // get stuff after slash
}
}
return name;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment