Merge pull request #54 from hannah-gaudet/RCB-444

RCB 444

Author: cp2boston

README.md

@@ -44,6 +44,7 @@ api.rosette(endpoint, function(err, res){
 | targetScheme                        | name translation          | No |
 | options              | relationships        | No |
 | accuracyMode              | relationships        | Yes |
+| linked (deprecated)             | entities        | No |
 | linkEntities              | entities        | No |
 | explain              | sentiment        | No |
 | morphology             | morphology        | Yes |

examples/entities_linked.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var Api = require("../lib/Api");
+var ArgumentParser = require("argparse").ArgumentParser;
+
+var parser = new ArgumentParser({
+  addHelp: true,
+  description: "Get linked entities from a piece of text"
+});
+parser.addArgument(["--key"], {help: "Rosette API key", required: true});
+parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
+var args = parser.parseArgs();
+var api = new Api(args.key, args.url);
+var endpoint  = "entities";
+
+api.parameters.content = "Last month director Paul Feig announced the movie will have an all-star female cast including Kristen Wiig, Melissa McCarthy, Leslie Jones and Kate McKinnon.";
+// this parameter is deprecated
+api.parameters.linked = true;
+api.parameters.genre = "social-media";
+
+api.rosette(endpoint, function(err, res){
+	if(err){
+		console.log(err);
+	} else {
+		console.log(JSON.stringify(res, null, 2));
+	}
+});

lib/entities.js

@@ -39,7 +39,14 @@ function entities() {
 entities.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
 
     if (parameters.documentFile != null) {
-        parameters.loadFile(parameters.documentFile, parameters, userKey, serviceURL, "entities", callback);
+        if (parameters.loadParams().linked == true) {
+            console.warn("entities/linked endpoint has been combined with /entities. Do not specify the linked parameter.");
+            parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities/linked", callback);
+        } else {
+            parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities", callback);
+        }
+        
+
 
     } else {
 
@@ -50,10 +57,17 @@ entities.prototype.getResults = function(parameters, userKey, serviceURL, callba
             return callback(new RosetteException("badArgument", "Cannot supply both Content and ContentUri", "bad arguments"));
         } else {
             // configure URL
-            var urlParts = URL.parse(serviceURL + "entities");
+            if (parameters.loadParams().linked == true) {
+                console.warn("entities/linked endpoint is deprecated and has been combined with entities. No need to specify linked parameter.");
+                var urlParts = URL.parse(serviceURL + "entities/linked");
+            } else {
+                urlParts = URL.parse(serviceURL + "entities");
+            }
+
 
             var req = new rosetteRequest();
             req.makeRequest('POST', userKey, urlParts, parameters, callback);
+            
         }
     }
 

lib/parameters.js

@@ -63,6 +63,9 @@ function parameters() {
     this.options = null;
     this.accuracyMode = null;
 
+    //entities parameters
+    this.linked = null;
+
     //sentiment parameters
     this.explain = null;
     this.shortString = null;

tests/unittests.js

@@ -711,4 +711,3 @@ describe("Error 409 Incompatible Binding Check", function() {
     });
 
 });
-