X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2FNER.java;h=2055cf1c27c82918aa24300bd606d67118246fdd;hb=6d94fd5a39e6f78a68201230bd57b9ceb95e125d;hp=f8238c1d7ce51869727304c65b9336fb5b08ca13;hpb=56c07f5de3319eb61182b7100855801644538e6f;p=pnews.git

diff --git a/war/src/main/java/pnews/NER.java b/war/src/main/java/pnews/NER.java
index f8238c1..2055cf1 100644
--- a/war/src/main/java/pnews/NER.java
+++ b/war/src/main/java/pnews/NER.java
@@ -6,41 +6,46 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import edu.stanford.nlp.ie.crf.CRFClassifier;
-import edu.stanford.nlp.ling.CoreAnnotations.AnswerAnnotation;
-import edu.stanford.nlp.ling.CoreLabel;
+import edu.stanford.nlp.util.CoreMap;
+import edu.stanford.nlp.util.Triple;
+import pnews.servlet.Config;
 
 /** https://stanfordnlp.github.io/CoreNLP/api.html */
 public class NER {
         private static final String CLASS_NAME = NER.class.getName();
-        private static final Logger LOG = Logger.getLogger(CLASS_NAME); 
+        private static final Logger LOG = Logger.getLogger(CLASS_NAME);
+        private static final CRFClassifier<CoreMap> classifier = CRFClassifier.getDefaultClassifier();
         
-        public static String[] classify(String str) throws ClassCastException, ClassNotFoundException, IOException {
-                CRFClassifier<CoreLabel> classifier;
-                List<List<CoreLabel>> out;
-                String cat, w;
-                List<String> entities;
-                final String FUNCTION_NAME = "classify";                
+        public static List<String> classify(String str, List<String> entities, Config config) throws ClassCastException, ClassNotFoundException, IOException {
                 
-                LOG.entering(CLASS_NAME, FUNCTION_NAME, str);
-                
-                classifier = CRFClassifier.getDefaultClassifier();
-                out = classifier.classify(str);
+                List<Triple<String, Integer, Integer>> triples;
+                String w;
+                final String FUNCTION_NAME = "classify";                       
                 
-                entities = new ArrayList<>();
-                for (List<CoreLabel> labels: out)
-                        for (CoreLabel l: labels) {
-                                cat = l.getString(AnswerAnnotation.class);
-                                w = l.word();
-                                if (!cat.equals("O") && !entities.contains(w))
-                                        entities.add(w);
-                        }
+                LOG.entering(CLASS_NAME, FUNCTION_NAME, str);
+
+                OpenNLP.classify(str, entities, config);
+                                
+                synchronized (classifier) {
+                        triples = classifier.classifyToCharacterOffsets(str);
+                }
+                 
+                for (Triple<String, Integer, Integer> t: triples) {
+                        w = str.substring(t.second, t.third);
+                        if (!config.isBlacklistedEntity(w) && !entities.contains(w))
+                                entities.add(w);
+                }
                 
                 LOG.exiting(CLASS_NAME, FUNCTION_NAME, entities);
                 
-                return entities.toArray(new String[0]);
+                return entities;
         }
         
         public static void main(String[] args) throws Exception {
-                classify("I live in Washington.");
+                List<String> lst;
+                
+                lst = classify("I live in Washington and New York in United States.", new ArrayList<>(), new Config());
+                for (String str: lst)
+                        System.out.println(str);
         }
 }
\ No newline at end of file