summaryrefslogtreecommitdiff
path: root/scripts/textanalysis.js
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/textanalysis.js')
-rw-r--r--scripts/textanalysis.js13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/textanalysis.js b/scripts/textanalysis.js
index ecebdbeb..c1b02b38 100644
--- a/scripts/textanalysis.js
+++ b/scripts/textanalysis.js
@@ -76,7 +76,7 @@ var textAnalyser2 = function (newtext, finalize) {
ret.nodes.push({'id':id, 'type':type, 'state':state});
}
function addLink(src, dst, name, state) {
- ret.links.push({'sourceId':src, 'targetId':dst, 'name':name, 'state':state});
+ ret.links.push({'sourceId':src, 'targetId':dst, 'name':name ? name.trim() : "", 'state':state});
}
//Sentence Sequencing
@@ -138,7 +138,7 @@ var textAnalyser2 = function (newtext, finalize) {
}
}
if (newnodes.length === 0) {
- prefix += sentence[m];
+ prefix += (prefix.length > 0 ? ' ' : '') + sentence[m];
}
break;
}
@@ -146,7 +146,11 @@ var textAnalyser2 = function (newtext, finalize) {
//PREFIX not null case - put complete sentence in first link.
if (prefix) {
- newlinks[1] = prefix + " " + newnodes[0] + " " + newlinks[1] + newnodes[1];
+ newlinks[1] = prefix + " " + newnodes[0] +
+ (newlinks[1] !== undefined || newnodes[1] !== undefined ?
+ " " : "")
+ + (newlinks[1] !== undefined ? newlinks[1] : "")
+ + (newnodes[1] !== undefined ? newnodes[1] : "");
}
//WRITE COMPLETE SENTENCE
@@ -203,7 +207,8 @@ var textAnalyser2 = function (newtext, finalize) {
case "NODE":
addNode(newnodes[nodeindex], typeStack[nodeindex], typesetter);
if (!abnormalGraph) {
- addLink(newnodes[nodeindex - 1], newnodes[nodeindex], newlinks[linkindex], typesetter);
+ addLink(newnodes[nodeindex - 1], newnodes[nodeindex],
+ newlinks[linkindex], typesetter);
}
nodeindex++;
break;