[mapserver-commits] r12557 - branches/branch-6-0/docs/en/mapscript branches/branch-6-0/docs/en/mapscript/php trunk/docs/en/mapscript trunk/docs/en/mapscript/php

[svn at osgeo.org]

Author: havatv
Date: 2011-09-19 14:18:10 -0700 (Mon, 19 Sep 2011)
New Revision: 12557

Modified:
   branches/branch-6-0/docs/en/mapscript/mapscript.txt
   branches/branch-6-0/docs/en/mapscript/php/index.txt
   trunk/docs/en/mapscript/mapscript.txt
   trunk/docs/en/mapscript/php/index.txt
Log:
Added MS_DONE to the return codes of Layer-> whichShapes in the mapscript documentation (#3440). php and swig.

Modified: branches/branch-6-0/docs/en/mapscript/mapscript.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/mapscript.txt	2011-09-19 17:11:32 UTC (rev 12556)
+++ branches/branch-6-0/docs/en/mapscript/mapscript.txt	2011-09-19 21:18:10 UTC (rev 12557)
@@ -1316,7 +1316,8 @@
     Performs a spatial, and optionally an attribute based feature search. 
     The function basically prepares things so that candidate features can be 
     accessed by query or drawing functions (eg using nextShape function).
-    Returns MS_SUCCESS or MS_FAILURE.
+    Returns MS_SUCCESS, MS_FAILURE or MS_DONE.  MS_DONE is returned if
+    the layer extent does not overlap rect.
 
 resultsGetShape(int shapeindex [, int tileindex = -1]) : shapeObj 
     Retrieve shapeObj from a layer's resultset by index.
@@ -2083,6 +2084,16 @@
 
 .. note:: MapServer's OWSRequest supports only single valued parameters.
 
+addParameter( string name, string value ) : void
+    Add a request parameter, even if the parameter key was previousely set.
+    This is useful when multiple parameters with the same key are required.
+    For example
+
+::
+    
+    request.addParameter('SIZE', 'x(100)')
+    request.addParameter('SIZE', 'y(100)')
+
 getName( int index ) : string
     Return the name of the parameter at *index* in the request's array
     of parameter names.

Modified: branches/branch-6-0/docs/en/mapscript/php/index.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/php/index.txt	2011-09-19 17:11:32 UTC (rev 12556)
+++ branches/branch-6-0/docs/en/mapscript/php/index.txt	2011-09-19 21:18:10 UTC (rev 12557)
@@ -979,7 +979,9 @@
     Performs a spatial, and optionally an attribute based feature
     search.  The function basically prepares things so that candidate
     features can be accessed by query or drawing functions (eg using
-    nextshape function).  Returns MS_SUCCESS or MS_FAILURE.
+    nextshape function).  Returns MS_SUCCESS, MS_FAILURE or MS_DONE.
+    MS_DONE is returned if the layer extent does not overlap the
+    rectObj.
 
 shapeobj nextShape()
     Called after msWhichShapes has been called to actually retrieve
@@ -1835,6 +1837,16 @@
 
        $request->setparameter('REQUEST', 'GetMap');
 
+int addparameter(string name, string value)
+    Add a request parameter, even if the parameter key was previousely set.
+    This is useful when multiple parameters with the same key are required.
+    For example :
+    
+    .. code-block:: php
+
+        $request->addparameter('SIZE', 'x(100)');
+        $request->addparameter('SIZE', 'y(100)');
+
 .. index::
    triple: MapScript; PHP; pointObj
 

Modified: trunk/docs/en/mapscript/mapscript.txt
===================================================================
--- trunk/docs/en/mapscript/mapscript.txt	2011-09-19 17:11:32 UTC (rev 12556)
+++ trunk/docs/en/mapscript/mapscript.txt	2011-09-19 21:18:10 UTC (rev 12557)
@@ -1316,7 +1316,8 @@
     Performs a spatial, and optionally an attribute based feature search. 
     The function basically prepares things so that candidate features can be 
     accessed by query or drawing functions (eg using nextShape function).
-    Returns MS_SUCCESS or MS_FAILURE.
+    Returns MS_SUCCESS, MS_FAILURE or MS_DONE.  MS_DONE is returned if
+    the layer extent does not overlap rect.
 
 resultsGetShape(int shapeindex [, int tileindex = -1]) : shapeObj 
     Retrieve shapeObj from a layer's resultset by index.

Modified: trunk/docs/en/mapscript/php/index.txt
===================================================================
--- trunk/docs/en/mapscript/php/index.txt	2011-09-19 17:11:32 UTC (rev 12556)
+++ trunk/docs/en/mapscript/php/index.txt	2011-09-19 21:18:10 UTC (rev 12557)
@@ -979,7 +979,9 @@
     Performs a spatial, and optionally an attribute based feature
     search.  The function basically prepares things so that candidate
     features can be accessed by query or drawing functions (eg using
-    nextshape function).  Returns MS_SUCCESS or MS_FAILURE.
+    nextshape function).  Returns MS_SUCCESS, MS_FAILURE or MS_DONE.
+    MS_DONE is returned if the layer extent does not overlap the
+    rectObj.
 
 shapeobj nextShape()
     Called after msWhichShapes has been called to actually retrieve