changes

src/edu/stanford/nlp/patterns/SPIEDServlet.java

@@ -98,7 +98,7 @@ public static String quote(String string) {
    * @param out The writer to write the output to.
    * @param q The query string.
    */
-  private void run(PrintWriter out, String q, String seedWords, boolean test, String model) throws Exception{
+  private void run(PrintWriter out, String q, String seedWords, boolean testmode, String model) throws Exception{
     // Clean the string a bit
     q = q.trim();
     if (q.length() == 0) {
@@ -116,8 +116,9 @@ private void run(PrintWriter out, String q, String seedWords, boolean test, Stri
     annotate.processText(jsonObject, false, false);
 
     String suggestions;
+    logger.info("Testmode is " + testmode);
     // Collect results
-    if(test)
+    if(testmode)
       suggestions = annotate.suggestPhrasesTest();
     else
       suggestions = annotate.suggestPhrases();
@@ -140,12 +141,15 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
     try {
       String raw = request.getParameter("q");
       String seedwords = request.getParameter("seedwords");
-      boolean testmode = Boolean.parseBoolean(request.getParameter("testmode"));
-      String model = request.getParameter("model");
+      String test = request.getParameter("testmode");
+      boolean testmode = false;
+      if(test != null)
+        testmode = Boolean.parseBoolean(test);
+      //String model = request.getParameter("model");
       if (raw == null || "".equals(raw)) {
         out.print("{\"okay\":false,\"reason\":\"No data provided\"}");
       } else {
-        run(out, raw, seedwords, testmode, model);
+        run(out, raw, seedwords, testmode, "");
       }
     } catch (Throwable t) {
       writeError(t, out, request.toString());

src/edu/stanford/nlp/patterns/TextAnnotationPatterns.java

@@ -9,12 +9,14 @@
 
 import javax.json.*;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
+import java.util.logging.Logger;
 
 /**
  * Created by sonalg on 3/10/15.
@@ -29,6 +31,16 @@ public class TextAnnotationPatterns {
   Map<String, Set<CandidatePhrase>> seedWords = new HashMap<String, Set<CandidatePhrase>>();
   private String backgroundSymbol ="O";
 
+  Properties testProps = new Properties();
+  Logger logger = Logger.getAnonymousLogger();
+
+  public TextAnnotationPatterns(){
+    try{
+    testProps.load(new FileReader("test.properties"));
+    }catch(IOException e){
+      logger.info("COULD NOT LOAD FILE test.properties");
+    }
+  }
 
   public String getAllAnnotations() {
     JsonObjectBuilder obj = Json.createObjectBuilder();
@@ -85,8 +97,9 @@ public String suggestPhrases() throws IOException, ClassNotFoundException, Illeg
   }
 
   public String suggestPhrasesTest() throws IllegalAccessException, InterruptedException, ExecutionException, IOException, InstantiationException, NoSuchMethodException, InvocationTargetException, ClassNotFoundException {
-    GetPatternsFromDataMultiClass<SurfacePattern> model = new GetPatternsFromDataMultiClass<SurfacePattern>(props, Data.sents, seedWords, false, machineAnswerClasses);
-    model.constVars.numIterationsForPatterns = 2;
+    Properties runProps = new Properties(props);
+    runProps.putAll(testProps);
+    GetPatternsFromDataMultiClass<SurfacePattern> model = new GetPatternsFromDataMultiClass<SurfacePattern>(runProps, Data.sents, seedWords, false, machineAnswerClasses);
     model.iterateExtractApply();
     return model.constVars.getLearnedWordsAsJsonLastIteration();
   }

src/edu/stanford/nlp/patterns/demo/frontend/index.html

@@ -31,7 +31,8 @@
                         <input id="seedwords" type="text" name="seedwords" class="form-control input-lg"
                                placeholder="seed words should be written here delimited by comma"
                                autofocus="true"autocomplete="off" />
-                        <div id="query-button" class="input-group-addon" title="Run"><span class="glyphicon glyphicon-search"></span></div>
+			       <input id="testmode" type="text" name="testmode" class="form-control input-lg" placeholder="true or false" autofocus="true" autocomplete="true" />       
+			<div id="query-button" class="input-group-addon" title="Run"><span class="glyphicon glyphicon-search"></span></div>
                     </div>
                 </form>
             </div>