Skip to content

Commit 7a0dccb

Browse files
SamHausmannSamHausmann
committed
bug fix
1 parent d159694 commit 7a0dccb

File tree

13 files changed

+19
-14
lines changed

13 files changed

+19
-14
lines changed

‎examples/relationships.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var args = parser.parseArgs();
1414
var api = new Api(args.key, args.url);
1515
var endpoint = "relationships";
1616

17-
var relationships_text_data = "Bill Murray is in the new Ghostbusters film!";
17+
var relationships_text_data = "The Ghostbusters movie was filmed in Boston.";
1818
var content = relationships_text_data;
1919

2020
api.parameters.content = content;

‎examples/sentiment.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
1313
var args = parser.parseArgs();
1414

1515
var file = new tmp.File();
16-
var sentiment_file_data = "<html><head><title>New Ghostbusters Film</title></head><body><p>Original Ghostbuster Dan Aykroyd, who also co-wrote the 1984 Ghostbusters film, couldn’t be more pleased with the new all-female Ghostbusters cast, telling The Hollywood Reporter, The Aykroyd family is delighted by this inheritance of the Ghostbusters torch by these most magnificent women in comedy.</p></body></html>";
16+
var sentiment_file_data = "<html><head><title>New Ghostbusters Film</title></head><body><p>Original Ghostbuster Dan Aykroyd, who also co-wrote the 1984 Ghostbusters film, couldn’t be more pleased with the new all-female Ghostbusters cast, telling The Hollywood Reporter, “The Aykroyd family is delighted by this inheritance of the Ghostbusters torch by these most magnificent women in comedy.”</p></body></html>";
1717
var fileContents = sentiment_file_data;
1818

1919
file.writeFileSync(fileContents);

‎lib/categories.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function categories() {
4848
categories.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949

5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "categories", callback);
5252
} else {
5353

5454
// validate parameters

‎lib/entities.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ function entities() {
4848
entities.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949

5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
if (parameters.loadParams().linked == true) {
52+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities/linked", callback);
53+
} else {
54+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities", callback);
55+
}
56+
5257
} else {
5358

5459
// validate parameters

‎lib/language.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function language() {
4848
language.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949

5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "language", callback);
5252
} else {
5353

5454
// validate parameters

‎lib/morphology.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function morphology() {
4848
morphology.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949
//console.log(parameters)
5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "morphology" + "/" + parameters.loadParams().morphology, callback);
5252
} else {
5353

5454
// validate parameters

‎lib/nameSimilarity.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function nameSimilarity() {
4848
nameSimilarity.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949

5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "name-similarity", callback);
5252
} else {
5353

5454
// validate parameters

‎lib/nameTranslation.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function nameTranslation() {
4848
nameTranslation.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949

5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "name-translation", callback);
5252
} else {
5353

5454
// validate parameters

‎lib/parameters.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ parameters.prototype.loadParams = function() {
115115
* Reads a file and sets the content, and unit parameters accordingly
116116
*@param {file} filePath - The file path from which the desired file will be loaded
117117
*/
118-
parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, serviceURL, callback) {
118+
parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, serviceURL, endpoint, callback) {
119119
var str = fs.readFileSync(filePath, "utf8");
120120
var mp = new Multipart()
121121

@@ -140,7 +140,7 @@ parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, se
140140
data += d
141141
}).on('end', function() {
142142

143-
var urlParts = URL.parse(serviceURL + "sentiment");
143+
var urlParts = URL.parse(serviceURL + endpoint);
144144
var protocol = https;
145145
if (urlParts.protocol === "http:") {
146146
protocol = http;

‎lib/relationships.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function relationships() {
4848
relationships.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
4949

5050
if (parameters.loadParams().documentFile != null) {
51-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, callback);
51+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "relationships", callback);
5252
} else {
5353

5454
// validate parameters

0 commit comments

Comments
 (0)