Merge pull request #36 from SamHausmann/RCB-387

bug fix

Author: SamHausmann

lib/categories.js

@@ -48,7 +48,7 @@ function categories() {
 categories.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "categories", callback);
     } else {
 
     // validate parameters

lib/entities.js

@@ -48,7 +48,12 @@ function entities() {
 entities.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        if (parameters.loadParams().linked == true) {
+                parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities/linked", callback);
+            } else {
+                parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities", callback);
+            }
+        
     } else {
 
     // validate parameters

lib/language.js

@@ -48,7 +48,7 @@ function language() {
 language.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "language", callback);
     } else {
 
         // validate parameters

lib/morphology.js

@@ -48,7 +48,7 @@ function morphology() {
 morphology.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
     //console.log(parameters)
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "morphology" + "/" + parameters.loadParams().morphology, callback);
     } else {
 
         // validate parameters

lib/nameSimilarity.js

@@ -48,7 +48,7 @@ function nameSimilarity() {
 nameSimilarity.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "name-similarity", callback);
     } else {
 
         // validate parameters

lib/nameTranslation.js

@@ -48,7 +48,7 @@ function nameTranslation() {
 nameTranslation.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "name-translation", callback);
     } else {
 
         // validate parameters

lib/parameters.js

@@ -115,7 +115,7 @@ parameters.prototype.loadParams = function() {
  * Reads a file and sets the content, and unit parameters accordingly
  *@param {file} filePath - The file path from which the desired file will be loaded
  */
-parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, serviceURL, callback) {
+parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, serviceURL, endpoint, callback) {
     var str = fs.readFileSync(filePath, "utf8");
     var mp = new Multipart()
 
@@ -140,7 +140,7 @@ parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, se
         data += d
     }).on('end', function() {
 
-        var urlParts = URL.parse(serviceURL + "sentiment");
+        var urlParts = URL.parse(serviceURL + endpoint);
         var protocol = https;
         if (urlParts.protocol === "http:") {
             protocol = http;

lib/relationships.js

@@ -48,7 +48,7 @@ function relationships() {
 relationships.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "relationships", callback);
     } else {
 
         // validate parameters

lib/sentences.js

@@ -48,7 +48,7 @@ function sentences() {
 sentences.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "sentences", callback);
     } else {
 
         // validate parameters

lib/sentiment.js

@@ -48,7 +48,7 @@ function sentiment() {
 sentiment.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
+        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "sentiment", callback);
     } else {
 
         // validate parameters