Author: schor Date: Fri Jun 4 16:13:21 2010 New Revision: 951473 URL: http://svn.apache.org/viewvc?rev=951473&view=rev Log: [UIMA-1795] remove csv option from help text - not supported
Modified: uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java Modified: uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java?rev=951473&r1=951472&r2=951473&view=diff ============================================================================== --- uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java (original) +++ uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/ResultMerger.java Fri Jun 4 16:13:21 2010 @@ -94,12 +94,15 @@ public class ResultMerger extends Simple + "<li/><b>text</b> - the value of this parameter is the text to analyze. Expected " + "encoding is UTF-8. This parameter must always be set." + "<li/><b>mode</b> - the value of this parameter is either " - + ""<b>xml</b>", "<b>inline</b>" or "<b>csv</b>". " + + ""<b>xml</b>" or "<b>inline</b>"." +// + " or "<b>csv</b>". " // Jira 1795 + "This parameter allows you to define, which view of the result should be returned. " - + ""<b>xml</b>" means to output the result as a XML-document containing a list of found entities, " + + ""<b>xml</b>" means to output the result as a XML-document containing a list of found entities, and" + ""<b>inline</b>" returns inline-xml containing the analyzed text in which all found entities are" - + " represented by tags, and "<b>csv</b>" returns the found entities" - + " in a comma-separated list. If this parameter is not set, xml output will be produced." + + " represented by tags." +// + ", and "<b>csv</b>" returns the found entities" //Jira 1795 +// + " in a comma-separated list. " + + "If this parameter is not set, xml output will be produced." + "" + "<li/><b>url1</b>, <b>url2</b>, <b>url3</b>, etc. - the values of these parameters are the " + "URLs of other simple UIMA services which are to be invoked." Modified: uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java?rev=951473&r1=951472&r2=951473&view=diff ============================================================================== --- uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java (original) +++ uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java Fri Jun 4 16:13:21 2010 @@ -120,7 +120,7 @@ public class SimpleServerServlet extends + "containing a list of found entities"); options.put("inline", "returns inline-xml containing the analyzed " + "text in which all found entities are represented by tags"); - options.put("csv", "returns the found entities in a comma-separated list"); +// options.put("csv", "returns the found entities in a comma-separated list"); // Jira 1795 this.servletPOSTParamOptions.put(MODE_PARAMETER, options); this.servletPOSTParameters.put("lang", "This parameter sets the language "