Author: sebb
Date: Sun Oct 23 10:33:21 2005
New Revision: 327813
URL: http://svn.apache.org/viewcvs?rev=327813&view=rev
Log:
Use JOrphanUtils.split(); document that this means trailing delimiters count
towards the limit
Modified:
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java
jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml
Modified:
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=327813&r1=327812&r2=327813&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/functions/org/apache/jmeter/functions/SplitFunction.java
Sun Oct 23 10:33:21 2005
@@ -1,6 +1,5 @@
-// $Header$
/*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,8 +26,8 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -46,7 +45,7 @@
private static final List desc = new LinkedList();
- private static final String KEY = "__split";
+ private static final String KEY = "__split";// $NON-NLS-1$
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 2;
@@ -78,12 +77,18 @@
if (values.length > 2) { // Split string provided
splitString = ((CompoundVariable) values[2]).execute();
}
- String parts[] = JMeterUtils.split(stringToSplit, splitString,
"?");
+ if (log.isDebugEnabled()){
+ log.debug("Split "+stringToSplit+ " using "+ splitString+ " into
"+varNamePrefix);
+ }
+ String parts[] = JOrphanUtils.split(stringToSplit, splitString,
"?");// $NON-NLS-1$
vars.put(varNamePrefix, stringToSplit);
- vars.put(varNamePrefix + "_n", "" + parts.length);
+ vars.put(varNamePrefix + "_n", "" + parts.length);//
$NON-NLS-1$ // $NON-NLS-2$
for (int i = 1; i <= parts.length; i++) {
- vars.put(varNamePrefix + "_" + i, parts[i - 1]);
+ if (log.isDebugEnabled()){
+ log.debug(parts[i-1]);
+ }
+ vars.put(varNamePrefix + "_" + i, parts[i - 1]);//
$NON-NLS-1$
}
return stringToSplit;
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml?rev=327813&r1=327812&r2=327813&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/functions.xml Sun Oct 23
10:33:21 2005
@@ -520,16 +520,19 @@
and returns the original string. If any delimiters are adjacent, "?" is
returned as the value.
The split strings are returned in the variables ${VAR_1}, ${VAR_2} etc.
The count of variables is returned in ${VAR_n}.
+ From JMeter 2.1.2 onwards, a trailing delimiter is treated as a missing
variable, and "?" is returned.
</p>
<p/>
Example:
<code>
<br/>
- Define VAR="a,,c" in the test plan.
+ Define VAR="a,,c," in the test plan.
<br/>
${__split(${VAR},VAR)}
<br/>
- This will return the contents of VAR, i.e. "a,,c" and set the following
variables:
+ This will return the contents of VAR, i.e. "a,,c," and set the
following variables:
+ <br/>
+ VAR_n=4 (3 in JMeter 2.1.1 and earlier)
<br/>
VAR_1=a
<br/>
@@ -537,7 +540,7 @@
<br/>
VAR_3=c
<br/>
- VAR_n=3
+ VAR_4=? (null in JMeter 2.1.1 and earlier)
</code>
</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
