Skip to content
This repository was archived by the owner on Oct 30, 2018. It is now read-only.

Commit 7ba8aca

Browse files
AlchemyAPIAlchemyAPI
committed
Merge pull request #2 from redorb8/return_string
changed return value of AlchemyAPI class memeber functions to String typ...
2 parents f371ad1 + 9d49bc2 commit 7ba8aca

19 files changed

Lines changed: 195 additions & 221 deletions

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
bin
2-
dist
2+
dist
3+
testdir/api_key.txt

‎src/com/alchemyapi/api/AlchemyAPI.java‎

Lines changed: 113 additions & 146 deletions
Large diffs are not rendered by default.

‎src/com/alchemyapi/api/AlchemyAPI_Params.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
public class AlchemyAPI_Params {
99
public static final String OUTPUT_XML = "xml";
1010
public static final String OUTPUT_RDF = "rdf";
11+
public static final String OUTPUT_JSON = "json";
1112

1213
private String url;
1314
private String html;
@@ -37,7 +38,7 @@ public String getOutputMode() {
3738
return outputMode;
3839
}
3940
public void setOutputMode(String outputMode) {
40-
if( !outputMode.equals(AlchemyAPI_Params.OUTPUT_XML) && !outputMode.equals(OUTPUT_RDF) )
41+
if( !outputMode.equals(AlchemyAPI_Params.OUTPUT_XML) && !outputMode.equals(AlchemyAPI_Params.OUTPUT_RDF) && !outputMode.equals(AlchemyAPI_Params.OUTPUT_JSON))
4142
{
4243
throw new RuntimeException("Invalid setting " + outputMode + " for parameter outputMode");
4344
}

‎src/com/alchemyapi/test/AuthorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public static void main(String[] args)
2727
// Load a HTML document to analyze.
2828
String htmlDoc = getFileContents("data/example.html");
2929

30-
Document doc = alchemyObj.URLGetAuthor("http://www.politico.com/blogs/media/2012/02/detroit-news-ed-upset-over-romney-edit-115247.html");
31-
System.out.println(getStringFromDocument(doc));
30+
String doc = alchemyObj.URLGetAuthor("http://www.politico.com/blogs/media/2012/02/detroit-news-ed-upset-over-romney-edit-115247.html");
31+
System.out.println(doc);
3232

3333
doc = alchemyObj.HTMLGetAuthor(htmlDoc, "http://www.test.com/");
34-
System.out.println(getStringFromDocument(doc));
34+
System.out.println(doc);
3535
}
3636

3737
// utility function

‎src/com/alchemyapi/test/CategoryTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ public static void main(String[] args)
2222
AlchemyAPI alchemyObj = AlchemyAPI.GetInstanceFromFile("api_key.txt");
2323

2424
// Categorize a web URL by topic.
25-
Document doc = alchemyObj.URLGetCategory("http://www.techcrunch.com/");
26-
System.out.println(getStringFromDocument(doc));
25+
String doc = alchemyObj.URLGetCategory("http://www.techcrunch.com/");
26+
System.out.println(doc);
2727

2828
// Categorize some text.
2929
doc = alchemyObj.TextGetCategory("Latest on the War in Iraq.");
30-
System.out.println(getStringFromDocument(doc));
30+
System.out.println(doc);
3131

3232
// Load a HTML document to analyze.
3333
String htmlDoc = getFileContents("data/example.html");
3434

3535
// Categorize a HTML document by topic.
3636
doc = alchemyObj.HTMLGetCategory(htmlDoc, "http://www.test.com/");
37-
System.out.println(getStringFromDocument(doc));
37+
System.out.println(doc);
3838

3939
AlchemyAPI_CategoryParams categoryParams = new AlchemyAPI_CategoryParams();
4040
categoryParams.setOutputMode(AlchemyAPI_Params.OUTPUT_RDF);
4141
doc = alchemyObj.HTMLGetCategory(htmlDoc, "http://www.test.com/", categoryParams);
42-
System.out.println(getStringFromDocument(doc));
42+
System.out.println(doc);
4343
}
4444

4545
// utility function

‎src/com/alchemyapi/test/CombinedTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ public static void main(String[] args)
2222
AlchemyAPI alchemyObj = AlchemyAPI.GetInstanceFromFile("api_key.txt");
2323

2424
// Extract combined data for a web URL.
25-
Document doc = alchemyObj.URLGetCombined("http://www.techcrunch.com/");
26-
System.out.println(getStringFromDocument(doc));
25+
String doc = alchemyObj.URLGetCombined("http://www.techcrunch.com/");
26+
System.out.println(doc);
2727

2828
// Extract combined data from a text string.
2929
doc = alchemyObj.TextGetCombined(
3030
"Hello there, my name is Bob Jones. I live in the United States of America. " +
3131
"Where do you live, Fred?");
32-
System.out.println(getStringFromDocument(doc));
32+
System.out.println(doc);
3333

3434
// Only extract entities & keywords
3535
AlchemyAPI_CombinedParams combinedParams = new AlchemyAPI_CombinedParams();
3636
combinedParams.setSentiment(true);
3737
combinedParams.setExtract("entity");
3838
combinedParams.setExtract("keyword");
3939
doc = alchemyObj.TextGetCombined("Madonna enjoys tasty Pepsi. I love her style.", combinedParams);
40-
System.out.println(getStringFromDocument(doc));
40+
System.out.println(doc);
4141
}
4242

4343
// utility function

‎src/com/alchemyapi/test/ConceptTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ public static void main(String[] args) throws IOException, SAXException,
2020
AlchemyAPI alchemyObj = AlchemyAPI.GetInstanceFromFile("api_key.txt");
2121

2222
// Extract concept tags for a web URL.
23-
Document doc = alchemyObj.URLGetRankedConcepts("http://www.techcrunch.com/");
24-
System.out.println(getStringFromDocument(doc));
23+
String doc = alchemyObj.URLGetRankedConcepts("http://www.techcrunch.com/");
24+
System.out.println(doc);
2525

2626
// Extract concept tags for a text string.
2727
doc = alchemyObj.TextGetRankedConcepts(
2828
"This thing has a steering wheel, tires, and an engine. Do you know what it is?");
29-
System.out.println(getStringFromDocument(doc));
29+
System.out.println(doc);
3030

3131
// Load a HTML document to analyze.
3232
String htmlDoc = getFileContents("data/example.html");
3333

3434
// Extract concept tags for a HTML document.
3535
doc = alchemyObj.HTMLGetRankedConcepts(htmlDoc, "http://www.test.com/");
36-
System.out.println(getStringFromDocument(doc));
36+
System.out.println(doc);
3737
}
3838

3939
// utility function

‎src/com/alchemyapi/test/ConstraintQueryTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public static void main(String[] args)
2222
AlchemyAPI alchemyObj = AlchemyAPI.GetInstanceFromFile("api_key.txt");
2323

2424
// Extract first link from an URL.
25-
Document doc = alchemyObj.URLGetConstraintQuery("http://microformats.org/wiki/hcard",
25+
String doc = alchemyObj.URLGetConstraintQuery("http://microformats.org/wiki/hcard",
2626
"1st link");
27-
System.out.println(getStringFromDocument(doc));
27+
System.out.println(doc);
2828

2929
// Extract first link from a HTML.
3030
String htmlDoc = getFileContents("data/example.html");
3131
doc = alchemyObj.HTMLGetConstraintQuery(htmlDoc, "http://www.test.com/", "1st link");
32-
System.out.println(getStringFromDocument(doc));
32+
System.out.println(doc);
3333
}
3434

3535
// utility function

‎src/com/alchemyapi/test/EntityTest.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.alchemyapi.test;
22

33
import com.alchemyapi.api.AlchemyAPI;
4+
import com.alchemyapi.api.AlchemyAPI_NamedEntityParams;
5+
import com.alchemyapi.api.AlchemyAPI_Params;
46

57
import org.xml.sax.SAXException;
68
import org.w3c.dom.Document;
@@ -21,22 +23,25 @@ public static void main(String[] args)
2123
// Create an AlchemyAPI object.
2224
AlchemyAPI alchemyObj = AlchemyAPI.GetInstanceFromFile("api_key.txt");
2325

26+
AlchemyAPI_NamedEntityParams entityParams = new AlchemyAPI_NamedEntityParams();
27+
entityParams.setOutputMode(AlchemyAPI_Params.OUTPUT_JSON);
28+
2429
// Extract a ranked list of named entities for a web URL.
25-
Document doc = alchemyObj.URLGetRankedNamedEntities("http://www.techcrunch.com/");
26-
System.out.println(getStringFromDocument(doc));
30+
String doc = alchemyObj.URLGetRankedNamedEntities("http://www.techcrunch.com/",entityParams);
31+
System.out.println(doc);
2732

2833
// Extract a ranked list of named entities from a text string.
2934
doc = alchemyObj.TextGetRankedNamedEntities(
3035
"Hello there, my name is Bob Jones. I live in the United States of America. " +
31-
"Where do you live, Fred?");
32-
System.out.println(getStringFromDocument(doc));
36+
"Where do you live, Fred?",entityParams);
37+
System.out.println(doc);
3338

3439
// Load a HTML document to analyze.
3540
String htmlDoc = getFileContents("data/example.html");
3641

3742
// Extract a ranked list of named entities from a HTML document.
38-
doc = alchemyObj.HTMLGetRankedNamedEntities(htmlDoc, "http://www.test.com/");
39-
System.out.println(getStringFromDocument(doc));
43+
doc = alchemyObj.HTMLGetRankedNamedEntities(htmlDoc, "http://www.test.com/",entityParams);
44+
System.out.println(doc);
4045
}
4146

4247
// utility function

‎src/com/alchemyapi/test/FeedLinksTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ public static void main(String[] args)
2222
AlchemyAPI alchemyObj = AlchemyAPI.GetInstanceFromFile("api_key.txt");
2323

2424
// Extract RSS / ATOM feed links from a web URL.
25-
Document doc = alchemyObj.URLGetFeedLinks("http://www.techcrunch.com/");
26-
System.out.println(getStringFromDocument(doc));
25+
String doc = alchemyObj.URLGetFeedLinks("http://www.techcrunch.com/");
26+
System.out.println(doc);
2727

2828
// Load a HTML document to analyze.
2929
String htmlDoc = getFileContents("data/example.html");
3030

3131
// Extract RSS / ATOM feed links from a HTML document.
3232
doc = alchemyObj.HTMLGetFeedLinks(htmlDoc, "http://www.test.com/");
33-
System.out.println(getStringFromDocument(doc));
33+
System.out.println(doc);
3434
}
3535

3636
// utility function

0 commit comments

Comments
 (0)