Author: sebb
Date: Wed Apr 16 08:15:42 2008
New Revision: 648718

URL: http://svn.apache.org/viewvc?rev=648718&view=rev
Log:
Resynch

Modified:
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/docs/usermanual/functions.html
    jakarta/jmeter/trunk/docs/usermanual/get-started.html
    jakarta/jmeter/trunk/docs/usermanual/listeners.html

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=648718&r1=648717&r2=648718&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Wed Apr 16 
08:15:42 2008
@@ -5591,7 +5591,12 @@
                                                                                
                <p><table border="1" bgcolor="#bbbb00" width="50%" 
cellspacing="0" cellpadding="2">
                <tr><td>                                                
 Versions of JMeter after 2.3.1 allow JMeter variables to be saved to the 
output files.
-This can only be specified using a property. See the following link for 
details.
+This can only be specified using a property.
+See the 
+                                                                               
                <a       href="listeners.html#sample_variables">
+                                                               Listener Sample 
Variables
+                                               </a>
+                                                                        for 
details
 
                        </td></tr>
        </table></p>
@@ -10519,7 +10524,6 @@
                        <tr>
                        <td>Use Namespace?</td>
                        <td>                                            
-
         If checked, then the XML parser will use namespace resolution.
         Note that currently only namespaces declared on the root element will 
be recognised.
         A later version of JMeter may support user-definition of additional 
workspace names.

Modified: jakarta/jmeter/trunk/docs/usermanual/functions.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/functions.html?rev=648718&r1=648717&r2=648718&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/functions.html Wed Apr 16 08:15:42 2008
@@ -186,9 +186,16 @@
                                                </p>
                                                                                
                                                                                
<p      >
                                                                
+
+                                                                               
                <b      >
+                                                               
 If an undefined function or variable is referenced, JMeter does not report/log 
an error - the reference is returned unchanged.
 For example if UNDEF is not defined as a variable, then the value of ${UNDEF} 
is ${UNDEF}.
 
+                                               </b>
+                                                                       
+Variables, functions (and properties) are all case-sensitive.
+
                                                </p>
                                                                                
                                                                                
<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
                <tr><td>                                                
@@ -745,6 +752,7 @@
                                                                
 Configuration elements are processed by a separate thread.
 Therefore functions such as __threadNum do not work properly in elements such 
as User Defined Variables.
+Also note that variables defined in a UDV element are not available until the 
element has been processed.
 
                                                </p>
                                                                                
                                                                                
<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
@@ -1151,6 +1159,7 @@
                                                                                
                                                                                
                                                        <p><table border="1" 
bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
                <tr><td>                                                
 This function does not work in any Configuration elements (e.g. User Defined 
Variables) as these are run from a separate thread.
+Nor does it make sense to use it on the Test Plan.
 
                        </td></tr>
        </table></p>
@@ -1828,6 +1837,55 @@
                </tr>
                </table>
        </p>
+                                                                               
                                                                                
<p      >
+                                                               For example, 
you could set up some variables as follows:
+
+                                                                               
                <ul     >
+                                                               
+
+                                                                               
                <li     >
+                                                               COL1a 
${__CSVRead(random.txt,0)}
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               COL2a 
${__CSVRead(random.txt,1)}${__CSVRead(random.txt,next)}
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               COL1b 
${__CSVRead(random.txt,0)}
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               COL2b 
${__CSVRead(random.txt,1)}${__CSVRead(random.txt,next)}
+                                               </li>
+                                                                       
+
+                                               </ul>
+                                                                       
+This would read two columns from one line, and two columns from the next 
available line.
+If all the variables are defined on the same User Parameters Pre-Processor, 
then the lines
+will be consecutive. Otherwise, a different thread may grab the next line.
+
+                                               </p>
+                                                                               
                                                                                
<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" 
cellpadding="2">
+               <tr><td>                                                
+The function is not suitable for use with large files, as the entire file is 
stored in memory.
+For larger files, use 
+                                                                               
                <a       href="component_reference.html#CSV_Data_Set_Config">
+                                                               CSV Data Set 
Config element
+                                               </a>
+                                                                       
+or 
+                                                                               
                <a       href="#__StringFromFile">
+                                                               StringFromFile
+                                               </a>
+                                                                       .
+
+                       </td></tr>
+       </table></p>
                                                                        
</td></tr>
                <tr><td><br></td></tr>
         </table>
@@ -2687,7 +2745,7 @@
                        <tr>
                        <td>Expression</td>
                        <td>                                            
-        The expression to be evaluated. 
+        The expression to be evaluated. For example, 6*(5+2)
         
                        </td>
                        <td>
@@ -2859,17 +2917,50 @@
                                                                                
                                                        
        
                                                                                
                <p      >
-                                                               The eval 
function returns the result of evaluating an expression.
+                                                               The eval 
function returns the result of evaluating a string expression.
        
                                                </p>
                                                                        
        
                                                                                
                <p      >
                                                                
-       This allows one to interpolate variable and function references in a 
string.
-       For example, if "column" and "table" contain "name" and "customers", 
-       then ${__eval(select ${column} from ${table})}
-       will evaluate as "select name from customers". 
+       This allows one to interpolate variable and function references in a 
string
+       which is stored in a variable.  For example, given the following 
variables:
+       
+                                                                               
                <ul     >
+                                                               
+       
+                                                                               
                <li     >
+                                                               name=Smith
+                                               </li>
+                                                                       
+       
+                                                                               
                <li     >
+                                                               column=age
+                                               </li>
+                                                                       
+       
+                                                                               
                <li     >
+                                                               table=birthdays
+                                               </li>
+                                                                       
+       
+                                                                               
                <li     >
+                                                               SQL=select 
${column} from ${table} where name='${name}'
+                                               </li>
+                                                                       
+       
+                                               </ul>
+                                                                       
+       then ${__eval(${SQL})} will evaluate as "select age from birthdays 
where name='Smith'". 
+       
+                                               </p>
+                                                                       
+       
+                                                                               
                <p      >
+                                                               
+       This can be used in conjunction with CSV Dataset, for example 
+       where the both SQL statements and the values are defined in the data 
file.
        
                                                </p>
                                                                        

Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=648718&r1=648717&r2=648718&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Wed Apr 16 08:15:42 
2008
@@ -1064,8 +1064,20 @@
                </td></tr>
                <tr><td>
                  <blockquote>
-                                                                               
                                        <p      >
-                                                               If JMeter 
detects an error, a message will be written to the log file. 
+                                                                               
                                        <p><table border="1" bgcolor="#bbbb00" 
width="50%" cellspacing="0" cellpadding="2">
+               <tr><td>                                                
+    JMeter does not generally use pop-up dialog boxes for errors, as these 
would interfere with
+    running tests. Nor does it report any error for a mis-spelt variable or 
function; instead the
+    reference is just used as is. See 
+                                                                               
                <a       href="functions.html">
+                                                               Functions and 
Variables for more information
+                                               </a>
+                                                                       .
+    
+                       </td></tr>
+       </table></p>
+                                                                               
                                                                                
<p      >
+                                                               If JMeter 
detects an error during a test, a message will be written to the log file. 
                The log file name is defined in the jmeter.properties file (or 
using the -j option, see below).
                It defaults to 
                                                                                
                <b      >

Modified: jakarta/jmeter/trunk/docs/usermanual/listeners.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/listeners.html?rev=648718&r1=648717&r2=648718&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/listeners.html Wed Apr 16 08:15:42 2008
@@ -362,7 +362,15 @@
 make it impossible for JMeter to interpret the value when it is read
 in later for viewing purposes.
                                                </p>
-                                                                               
                                                                                
<p      >
+                                                                               
                                                                                
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
+               <tr><td bgcolor="#828DA6">
+                 <font color="#ffffff" face="arial,helvetica,sanserif">
+                        <a name="sample_variables"><strong>14.1.1 Sample 
Variables</strong></a>
+                 </font>
+               </td></tr>
+               <tr><td>
+                 <blockquote>
+                                                                               
                                        <p      >
                                                                
 Versions of JMeter after 2.3.1 allow one to use the 
                                                                                
                <b      >
@@ -371,9 +379,13 @@
                                                                         
 property to define a list of additional JMeter variables which are to be saved 
with
 each sample in the JTL files. The values are written to CSV files as 
additional columns,
-and as additional attributes in XML files.
+and as additional attributes in XML files. See above for an example.
 
                                                </p>
+                                                                         
</blockquote>
+               </td></tr>
+               <tr><td><br></td></tr>
+        </table>
                                                                          
</blockquote>
                  </p>
                </td></tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to