You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2012/03/05 15:04:31 UTC

svn commit: r1297061 - /opennlp/sandbox/corpus-server/src/main/java/org/apache/opennlp/corpus_server/CorporaResource.java

Author: joern
Date: Mon Mar  5 14:04:31 2012
New Revision: 1297061

URL: http://svn.apache.org/viewvc?rev=1297061&view=rev
Log:
OPENNLP-458 getCorpus now return null if corpus does not exist.

Modified:
    opennlp/sandbox/corpus-server/src/main/java/org/apache/opennlp/corpus_server/CorporaResource.java

Modified: opennlp/sandbox/corpus-server/src/main/java/org/apache/opennlp/corpus_server/CorporaResource.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/corpus-server/src/main/java/org/apache/opennlp/corpus_server/CorporaResource.java?rev=1297061&r1=1297060&r2=1297061&view=diff
==============================================================================
--- opennlp/sandbox/corpus-server/src/main/java/org/apache/opennlp/corpus_server/CorporaResource.java (original)
+++ opennlp/sandbox/corpus-server/src/main/java/org/apache/opennlp/corpus_server/CorporaResource.java Mon Mar  5 14:04:31 2012
@@ -27,6 +27,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.opennlp.corpus_server.store.CorporaStore;
+import org.apache.opennlp.corpus_server.store.CorpusStore;
 import org.codehaus.jettison.json.JSONArray;
 
 @Path("/corpora")
@@ -58,11 +59,18 @@ public class CorporaResource {
 
   @Path("{corpus}")
 	public CorpusResource getCorpus(
-			@PathParam("corpus") String corpus) throws IOException {
+			@PathParam("corpus") String corpusId) throws IOException {
     
       CorpusServer corpusServer = CorpusServer.getInstance();
       CorporaStore store = corpusServer.getStore();
     
-      return new CorpusResource(store.getCorpus(corpus), corpusServer.getSearchService());
+      CorpusStore corpus = store.getCorpus(corpusId);
+      
+      if (corpus != null) {
+        return new CorpusResource(corpus, corpusServer.getSearchService());
+      }
+      else {
+        return null;
+      }
 	}
 }