INTEGRATION: CWS qadev32 (1.10.56); FILE MERGED

2008/04/17 11:40:21 cn 1.10.56.4: RESYNC: (1.10-1.11); FILE MERGED
2008/04/17 09:18:25 cn 1.10.56.3: #i87389# enhance argument parsing: a parameter like -param '"c:\my path\program.exe" -value' are possible
2008/03/12 09:47:17 cn 1.10.56.2: #i85370# add parameter NoCwsAttach
2008/03/05 10:57:50 cn 1.10.56.1: #i85370# now it is possible to use parameter with spaces like -cl "soffice -accept..."

1 files changed, 14 insertions, 3 deletions

diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java
index d3cdd629c0f7..b8d27938187d 100644
--- a/qadevOOo/runner/helper/ClParser.java
+++ b/qadevOOo/runner/helper/ClParser.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ClParser.java,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,6 +32,7 @@ package helper;
 import java.util.Properties;
 
 import lib.TestParameters;
+import util.utils;
 
 
 /**
@@ -45,7 +46,6 @@ public class ClParser {
      */
     public void getCommandLineParameter(TestParameters param, String[] args) {
         Properties mapping = getMapping();
-        boolean isTestJob = false;
 
         for (int i = 0; i < args.length;) {
             String pName = getParameterFor(mapping, args[i]).trim();
@@ -65,7 +65,17 @@ public class ClParser {
                     if (pValue.startsWith("-")) {
                         i++;
                         pValue = "yes";
-                    } else {
+                    } else if (pValue.startsWith("'")){
+                        i++;
+                        while ( ! pValue.endsWith("'")){
+                            i++;
+                            pValue = pValue + " " + args[i].trim();
+
+                        }
+                        pValue = utils.replaceAll13(pValue, "'", "");
+                        i++;
+                    }
+                    else {
                         i += 2;
                     }
 
@@ -116,6 +126,7 @@ public class ClParser {
         map.setProperty("-debug", "DebugIsActive");
         map.setProperty("-log", "LoggingIsActive");
         map.setProperty("-dbout", "DataBaseOut");
+        map.setProperty("-nca", "NoCwsAttach");
 
         return map;
     }