W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2009

2006/unicorn/src/org/w3c/unicorn UnicornClient.java,1.2,1.3

From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 23 Sep 2009 18:07:10 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MqWFC-0000R8-BH@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn
In directory hutz:/tmp/cvs-serv1629/src/org/w3c/unicorn

Modified Files:
	UnicornClient.java 
Log Message:
Updated command line client

Index: UnicornClient.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/UnicornClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UnicornClient.java	23 Sep 2009 09:59:21 -0000	1.2
+++ UnicornClient.java	23 Sep 2009 18:07:08 -0000	1.3
@@ -4,16 +4,24 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.fileupload.FileItem;
 import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.UnicornCall;
+import org.w3c.unicorn.action.Action;
 import org.w3c.unicorn.input.DirectInputParameter;
 import org.w3c.unicorn.input.URIInputParameter;
+import org.w3c.unicorn.input.UploadInputParameter;
 import org.w3c.unicorn.output.OutputFactory;
 import org.w3c.unicorn.output.OutputFormater;
 import org.w3c.unicorn.output.OutputModule;
+import org.w3c.unicorn.util.Message;
+import org.w3c.unicorn.util.Property;
 
 public class UnicornClient {
 
@@ -22,7 +30,7 @@
 	 * 
 	 */
 	public static void print_help() {
-		System.out.println("[Usage] UnicornClient task inputType=[mimetype=]pageToValid templateLanguage outputTemplate [otherParameters]");
+		System.out.println("[Usage] UnicornClient ucn_task=TASK ucn_uri=URI ucn_format=FORMAT ucn_output=OUTPUT ...");
 		System.out.println("");
 		System.out.println("* tasks = one of task in tasklist.xml (eg: markup, css...)");
 		System.out.println("* inputType       : uri|file");
@@ -42,99 +50,120 @@
 	 */
 	public static void main(String[] args) {
 
-		if (args.length == 0) {
-			print_help();
-		} else if (args.length == 1 && args[0].equals("help")) {
+		if (args.length == 0 || (args.length == 1 && args[0].equals("help"))) {
 			print_help();
-		} else {
-			// read parameters
-			String task = args[0];
-			String pageToValid = args[1];
-			String language = args[2];
-			String outputTemplate = args[3];
-			String pParams = "";
-			if (args.length > 4) { // this argument is optional
-				pParams = args[4];
-			}
-			
-			Framework.init();
-			
-			if (!Framework.isUcnInitialized) {
-				System.err.println(">> Unicorn is not properly initialized.");
-				return;
-			}
-			
-			UnicornCall aUnicornCall = new UnicornCall();
+			return;
+		}
 
-			// parse other parameters: "x2=on,toto=titi" to a
-			// map<String,String[]>
-			if (pParams.length() != 0) {
-				Map<String, String[]> mapOfParameter = new LinkedHashMap<String, String[]>();
-				String[] couples = pParams.split(",");
-				for (int i = 0; i < couples.length; i++) {
-					String[] couple = couples[i].split("=");
-					if (couple.length == 2) {
-						String[] tmp = { couple[1] };
-						mapOfParameter.put(couple[0], tmp);
-					} else {
-						System.err.println("Error parameter!");
-					}
-				}
-				aUnicornCall.setMapOfStringParameter(mapOfParameter);
-			}
+		Framework.init();
 
-			// parse input type: "uri=http://flyingman.sophia.w3.org/test" or
-			// "file=text/css=./style/base.css"
-			String[] pInput = pageToValid.split("=");
-			if (pInput[0].equals("uri")) {
-				aUnicornCall.setInputParameter(new URIInputParameter(pInput[1]));
-			} else { // direct input
-				try {
-					BufferedReader bfr = new BufferedReader(new FileReader(pInput[2]));
-					String content = "";
-					String line;
-					while ((line = bfr.readLine()) != null) {
-						content = content + line + "\n";
-					}
-					bfr.close();
+		if (!Framework.isUcnInitialized) {
+			System.err.println(">> Unicorn is not properly initialized.");
+			return;
+		}
+		UnicornCall aUnicornCall = new UnicornCall();
+		
+		List<String> outputParams = new ArrayList<String>();
+		outputParams.add("output");
+		outputParams.add("format");
+		outputParams.add("charset");
+		outputParams.add("mimetype");
+		outputParams.add("lang");
+		
+		Map<String, Object> mapOfStringObject = new LinkedHashMap<String, Object>();
+		Map<String, String> specificParameters = new Hashtable<String, String>();
+		Map<String, String> outputParameters   = new Hashtable<String, String>();
+		ArrayList<Message> messages = new ArrayList<Message>();
 
-					// Ajouter mime type dans map of parameter
-					// TODO check if this is necessary (mime-type is added to DirectInputParameter object)
-					/*Map<String, String[]> mapOfParameter = aUnicornCall
-							.getMapOfStringParameter();
-					if (mapOfParameter == null) {
-						mapOfParameter = new LinkedHashMap<String, String[]>();
-						aUnicornCall.setMapOfStringParameter(mapOfParameter);
+		// Retrieve parameter prefixes from unicorn.properties
+		String paramPrefix = Property.get("UNICORN_PARAMETER_PREFIX");
+		String optParamPrefix = Property.get("UNICORN_PARAMETER_OUTPUT_PREFIX");
+		
+		outputParameters.put("output", "simple");
+		outputParameters.put("format", "xhtml10");
+		outputParameters.put("charset", "UTF-8");
+		outputParameters.put("mimetype", "text/html");		
+		
+		
+		for(int i=0; i<args.length; i++) {
+			String[] param = args[i].split("=");
+			
+			if (param[0].startsWith(optParamPrefix)) {
+				String paramName = param[0].substring(optParamPrefix.length());
+				specificParameters.put(paramName, param[1]);
+			} else if (param[0].startsWith(paramPrefix)) {
+				String paramName = param[0].substring(paramPrefix.length());
+				if (paramName.equals("lang")) {
+					outputParameters.put(paramName, param[1]);
+					aUnicornCall.setLang(param[1] + "," + Property.get("DEFAULT_LANGUAGE"));
+				} else if (paramName.equals("task")) {
+					String task = Action.getTask(param[1], messages);
+					if (!task.equals(param[1])) {
+						mapOfStringObject.put("default_task", Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()));
 					}
-					String[] tmp = { pInput[1] };
-					mapOfParameter.put(Property.get("UNICORN_PARAMETER_PREFIX")
-							+ "mime", tmp);*/
-
-					aUnicornCall.setInputParameter(new DirectInputParameter(content, pInput[1]));
-					
-				} catch (IOException e) {
-					e.printStackTrace();
+					aUnicornCall.setTask(task);
+				} else if (outputParams.contains(paramName)) {
+					outputParameters.put(paramName, param[1]);
+				} else if (paramName.equals("uri")) {
+					aUnicornCall.setInputParameter(new URIInputParameter(param[1]));
+				} else if (paramName.equals("text_mime")) {
+					aUnicornCall.addParameter(paramPrefix + "mime", param[1]);
+				} else {					
+					aUnicornCall.addParameter(paramName, param[1]);
 				}
+			} else {
+				aUnicornCall.addParameter(param[0], param[1]);
 			}
-			aUnicornCall.setTask(task);
-			aUnicornCall.setLang(language);
+		}
 
-			long before = System.currentTimeMillis();
-			try {
-				aUnicornCall.doTask();
+//		// parse input type: "uri=http://flyingman.sophia.w3.org/test" or
+//		// "file=text/css=./style/base.css"
+//		String[] pInput = pageToValid.split("=");
+//		if (pInput[0].equals("uri")) {
+//			aUnicornCall.setInputParameter(new URIInputParameter(pInput[1]));
+//		} else { // direct input
+//			try {
+//				BufferedReader bfr = new BufferedReader(new FileReader(pInput[2]));
+//				String content = "";
+//				String line;
+//				while ((line = bfr.readLine()) != null) {
+//					content = content + line + "\n";
+//				}
+//				bfr.close();
+//
+//				// Ajouter mime type dans map of parameter
+//				// TODO check if this is necessary (mime-type is added to DirectInputParameter object)
+//				/*Map<String, String[]> mapOfParameter = aUnicornCall
+//									.getMapOfStringParameter();
+//							if (mapOfParameter == null) {
+//								mapOfParameter = new LinkedHashMap<String, String[]>();
+//								aUnicornCall.setMapOfStringParameter(mapOfParameter);
+//							}
+//							String[] tmp = { pInput[1] };
+//							mapOfParameter.put(Property.get("UNICORN_PARAMETER_PREFIX")
+//									+ "mime", tmp);*/
+//
+//				aUnicornCall.setInputParameter(new DirectInputParameter(content, pInput[1]));
+//
+//			} catch (IOException e) {
+//				e.printStackTrace();
+//			}
+//		}
 
-				Map<String, Object> mapOfStringObject = new LinkedHashMap<String, Object>();
-				mapOfStringObject.put("unicorncall", aUnicornCall);
-				OutputFormater aOutputFormater = OutputFactory.createOutputFormater(outputTemplate, language, "text/html");
-				OutputModule aOutputModule = OutputFactory.createOutputModule("simple");
-				PrintWriter pw = new PrintWriter(System.out);
-				aOutputModule.produceOutput(mapOfStringObject, pw);
-				pw.flush();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			long after = System.currentTimeMillis();
-			System.out.println("Elapsed time (s): " + (double) (after - before) / 1000);
+		long before = System.currentTimeMillis();
+		try {
+			aUnicornCall.doTask();
+
+			mapOfStringObject.put("unicorncall", aUnicornCall);
+			OutputModule aOutputModule = OutputFactory.createOutputModule(outputParameters, specificParameters);
+			PrintWriter pw = new PrintWriter(System.out);
+			aOutputModule.produceOutput(mapOfStringObject, pw);
+			pw.flush();
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
+		long after = System.currentTimeMillis();
+		System.out.println("Elapsed time (s): " + (double) (after - before) / 1000);
 	}
+
 }
Received on Wednesday, 23 September 2009 18:07:19 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:14 GMT