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

Update of /sources/public/2006/unicorn/org/w3c/unicorn/tests
In directory hutz:/tmp/cvs-serv27680/org/w3c/unicorn/tests

Modified Files:
	UnicornClient.java 
Log Message:
UnicornClient calculator http://flyingman.sophia.w3.org/test en text10 x2=on,ptoto=titi

Index: UnicornClient.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/tests/UnicornClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UnicornClient.java	29 Nov 2007 14:12:00 -0000	1.2
+++ UnicornClient.java	19 Dec 2007 16:14:08 -0000	1.3
@@ -13,15 +13,27 @@
 public class UnicornClient {
 
 	public static void main(String[] args) {
-		String task = "multithreading";
-		String pageToValid = "http://flyingman.sophia.w3.org/test.txt";
+		UnicornCall aUnicornCall = new UnicornCall();
+		/*
+		String task = "css";
+		String pageToValid = "http://w3.org";
 		String language = "en";
-		String outputTemplate = "xhtml10";
-
+		String outputTemplate = "text10";
+		String pParams="";
+		*/
 		/*
+		String task = "calculator";
+		String pageToValid = "http://flyingman.sophia.w3.org/test";
+		String language = "fr";
+		String outputTemplate = "text10";
+		String pParams = "x2=on";
+		*/
+		
 		// read parameters
 		if (args.length<4) {
-			System.out.println("[Usage] UnicornClient task pageToValid language outputTemplate");
+			System.out.println("[Usage] UnicornClient task pageToValid templateLanguage outputTemplate [otherParameters]");
+			System.out.println("[Example] UnicornClient calculator http://flyingman.sophia.w3.org/test en text10 x2=on,ptoto=titi");
+			System.out.println("[Example] UnicornClient markup http://w3.org en xhtml10");
 			System.out.println("[Example] UnicornClient markup http://w3.org en xhtml10");
 			System.out.println("[Example] UnicornClient css http://w3.org en text10");
 		}
@@ -29,17 +41,32 @@
 		String pageToValid = args[1];
 		String language = args[2];
 		String outputTemplate = args[3];
-		*/
-		
-		
-		long before = System.currentTimeMillis() ;
+		String pParams = ""; //pParam = "x2=on,toto=tata"
+		if (args.length>4) {
+			pParams = args[4];
+		}
 		
-		UnicornCall aUnicornCall = new UnicornCall();
-		aUnicornCall.setTask(task); //task id
-		aUnicornCall.setEnumInputMethod(EnumInputMethod.URI);
-		aUnicornCall.setDocumentName(pageToValid);
-		aUnicornCall.setInputParameterValue(pageToValid);
-		aUnicornCall.setLang(language);
+		// simple parser des paramètres
+		if (pParams!=null && !pParams.isEmpty()) {
+			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);
+	
+			aUnicornCall.setTask(task); //task id
+			aUnicornCall.setEnumInputMethod(EnumInputMethod.URI);
+			aUnicornCall.setDocumentName(pageToValid);
+			aUnicornCall.setInputParameterValue(pageToValid);
+			aUnicornCall.setLang(language);
+		}
 
 		/*
 		// lang par defaut
@@ -49,6 +76,8 @@
 		aUnicornCall.setMapOfStringParameter(mapOfParameter);
 		*/
 		
+		
+		long before = System.currentTimeMillis() ;
 		try {
 			aUnicornCall.doTask();
 			

Received on Wednesday, 19 December 2007 16:14:21 UTC