Merge pull request #52 from cp2boston/RCB-436_1.2_fixes

Rcb 436 1.2 fixes

Author: fhasanaj

lib/categories.js

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

lib/entities.js

@@ -38,8 +38,8 @@ function entities() {
  */
 entities.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
-    if (parameters.loadParams().documentFile != null) {
-        parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities", callback);
+    if (parameters.documentFile != null) {
+        parameters.loadFile(parameters.documentFile, parameters, userKey, serviceURL, "entities", callback);
 
     } else {
 

lib/language.js

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

lib/morphology.js

@@ -38,20 +38,20 @@ 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, "morphology" + "/" + parameters.loadParams().morphology, callback);
+    if (parameters.documentFile != null) {
+        parameters.loadFile(parameters.documentFile, parameters, userKey, serviceURL, "morphology" + "/" + parameters.morphology, callback);
     } else {
 
         // validate parameters
         if (parameters.loadParams().content == null && parameters.loadParams().contentUri == null) {
             return callback(new RosetteException("badArgument", "Must supply one of Content or ContentUri", "bad arguments"));
         } else if (parameters.loadParams().content != null && parameters.loadParams().contentUri != null) {
             return callback(new RosetteException("badArgument", "Cannot supply both Content and ContentUri", "bad arguments"));
-        } else if (parameters.loadParams().morphology == null) {
+        } else if (parameters.morphology == null) {
             return callback(new RosetteException("badArgument", "Must supply type of morphology", "bad arguments"));
         } else {
             // configure URL
-            var urlParts = URL.parse(serviceURL + "morphology" + "/" + parameters.loadParams().morphology);
+            var urlParts = URL.parse(serviceURL + "morphology" + "/" + parameters.morphology);
             var req = new rosetteRequest();
             req.makeRequest('POST', userKey, urlParts, parameters, callback);
         }

lib/nameSimilarity.js

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

lib/nameTranslation.js

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

lib/parameters.js

@@ -85,7 +85,6 @@ parameters.prototype.loadParams = function() {
         "content": this.content,
         "contentUri": this.contentUri,
         "language": this.language,
-        "documentFile": this.documentFile,
         "genre": this.genre,
         "name1": this.name1,
         "name2": this.name2,
@@ -100,7 +99,6 @@ parameters.prototype.loadParams = function() {
         "options": this.options,
         "explain": this.explain,
         "short-string": this.shortString,
-        "morphology": this.morphology,
         "_maxRetries": this.maxRetries,
         "_msInterval": this.msInterval,
         "_customHeaders": this.customHeaders

lib/relationships.js

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

lib/sentences.js

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

lib/sentiment.js

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