[mapserver-commits] r11895 - branches/branch-6-0/docs/en/mapfile trunk/docs/en/mapfile

[svn at osgeo.org]

Author: havatv
Date: 2011-07-12 06:15:58 -0700 (Tue, 12 Jul 2011)
New Revision: 11895

Modified:
   branches/branch-6-0/docs/en/mapfile/class.txt
   branches/branch-6-0/docs/en/mapfile/expressions.txt
   trunk/docs/en/mapfile/class.txt
   trunk/docs/en/mapfile/expressions.txt
Log:
Expressions: Updated the expressions and class documents, also including some styling.  Fixed some errors in r11889

Modified: branches/branch-6-0/docs/en/mapfile/class.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/class.txt	2011-07-12 13:15:06 UTC (rev 11894)
+++ branches/branch-6-0/docs/en/mapfile/class.txt	2011-07-12 13:15:58 UTC (rev 11895)
@@ -28,21 +28,19 @@
     
 EXPRESSION [string]
     Four types of expressions are now supported to define class
-    membership.  String comparisons, regular expressions, simple
-    logical expressions, and string functions (see
-    :ref:`EXPRESSIONS`). If no expression is given, then all features
-    are said to belong to this class.
+    membership.  String comparisons, regular expressions, logical
+    expressions, and string functions (see :ref:`EXPRESSIONS`).  If no
+    expression is given, then all features are said to belong to this
+    class.
 
     - String comparisons are case sensitive and are the fastest to
       evaluate.  No special delimiters are necessary although strings
       must be quoted if they contain special characters. (As a matter
-      of good habit, it is recommended you quote all strings).
+      of good habit, it is recommended that you quote all strings).
       
-    - Regular expressions function just like previous versions of
-      MapServer.  Regular expression are limited using quotes
-      (\'regex\').
+    - Regular expression are limited using slashes (/regex/).
 
-    - Logical expressions allow you to build fairly complex tests
+    - Logical expressions allow the building of fairly complex tests
       based on one or more attributes and therefore are only available
       with shapefiles.  Logical expressions are delimited by
       parentheses "(expression)".  Attribute names are delimited by
@@ -55,7 +53,7 @@
          EXPRESSION ([POPULATION] > 50000 AND '[LANGUAGE]' eq 'FRENCH')
 
       The following logical operators are supported: =, >, <, <=, >=,
-      =, or, and, lt, gt, ge, le, eq, ne, in, =~.  As one might
+      =, or, and, lt, gt, ge, le, eq, ne, in, ~, ~\*.  As one might
       expect, this level of complexity is slower to process.
 
     - One string function exists: length(). It computes the length of

Modified: branches/branch-6-0/docs/en/mapfile/expressions.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/expressions.txt	2011-07-12 13:15:06 UTC (rev 11894)
+++ branches/branch-6-0/docs/en/mapfile/expressions.txt	2011-07-12 13:15:58 UTC (rev 11895)
@@ -239,7 +239,7 @@
     LAYER
         NAME 'regexp-example'
         FILTERITEM 'placename'
-        FILTER 'hotel'
+        FILTER /hotel/
         ...
     END
 
@@ -254,21 +254,21 @@
 ::
 
     FILTERITEM "year"
-    FILTER '^20[0-9][0-9]'
+    FILTER /^20[0-9][0-9]/
 
 Example: Match all the records that are either purely numerical or
 empty
 
 ::
 
-    FILTER '^[0-9]*$'
+    FILTER /^[0-9]*$/
 
 Example: Match all the features where the *name* attribute ends with
 "by", "BY", "By" or "bY" (case insensitive matching):
 
 ::
 
-    EXPRESSION ([name] ~* 'by$')
+    EXPRESSION ('[name]' ~* 'by$')
 
 .. note:: 
     
@@ -528,7 +528,8 @@
 * Thh:mm:ssZ
 * Thh:mm:ss
 
-For temporal values obtained this way, the following operations are supported:
+For temporal values obtained this way, the following operations are
+supported:
 
 *  ( t1 eq t2 )
 

Modified: trunk/docs/en/mapfile/class.txt
===================================================================
--- trunk/docs/en/mapfile/class.txt	2011-07-12 13:15:06 UTC (rev 11894)
+++ trunk/docs/en/mapfile/class.txt	2011-07-12 13:15:58 UTC (rev 11895)
@@ -28,21 +28,19 @@
     
 EXPRESSION [string]
     Four types of expressions are now supported to define class
-    membership.  String comparisons, regular expressions, simple
-    logical expressions, and string functions (see
-    :ref:`EXPRESSIONS`). If no expression is given, then all features
-    are said to belong to this class.
+    membership.  String comparisons, regular expressions, logical
+    expressions, and string functions (see :ref:`EXPRESSIONS`).  If no
+    expression is given, then all features are said to belong to this
+    class.
 
     - String comparisons are case sensitive and are the fastest to
       evaluate.  No special delimiters are necessary although strings
       must be quoted if they contain special characters. (As a matter
-      of good habit, it is recommended you quote all strings).
+      of good habit, it is recommended that you quote all strings).
       
-    - Regular expressions function just like previous versions of
-      MapServer.  Regular expression are limited using quotes
-      (\'regex\').
+    - Regular expression are limited using slashes (/regex/).
 
-    - Logical expressions allow you to build fairly complex tests
+    - Logical expressions allow the building of fairly complex tests
       based on one or more attributes and therefore are only available
       with shapefiles.  Logical expressions are delimited by
       parentheses "(expression)".  Attribute names are delimited by
@@ -55,7 +53,7 @@
          EXPRESSION ([POPULATION] > 50000 AND '[LANGUAGE]' eq 'FRENCH')
 
       The following logical operators are supported: =, >, <, <=, >=,
-      =, or, and, lt, gt, ge, le, eq, ne, in, =~.  As one might
+      =, or, and, lt, gt, ge, le, eq, ne, in, ~, ~\*.  As one might
       expect, this level of complexity is slower to process.
 
     - One string function exists: length(). It computes the length of

Modified: trunk/docs/en/mapfile/expressions.txt
===================================================================
--- trunk/docs/en/mapfile/expressions.txt	2011-07-12 13:15:06 UTC (rev 11894)
+++ trunk/docs/en/mapfile/expressions.txt	2011-07-12 13:15:58 UTC (rev 11895)
@@ -239,7 +239,7 @@
     LAYER
         NAME 'regexp-example'
         FILTERITEM 'placename'
-        FILTER 'hotel'
+        FILTER /hotel/
         ...
     END
 
@@ -254,21 +254,21 @@
 ::
 
     FILTERITEM "year"
-    FILTER '^20[0-9][0-9]'
+    FILTER /^20[0-9][0-9]/
 
 Example: Match all the records that are either purely numerical or
 empty
 
 ::
 
-    FILTER '^[0-9]*$'
+    FILTER /^[0-9]*$/
 
 Example: Match all the features where the *name* attribute ends with
 "by", "BY", "By" or "bY" (case insensitive matching):
 
 ::
 
-    EXPRESSION ([name] ~* 'by$')
+    EXPRESSION ('[name]' ~* 'by$')
 
 .. note:: 
     
@@ -528,7 +528,8 @@
 * Thh:mm:ssZ
 * Thh:mm:ss
 
-For temporal values obtained this way, the following operations are supported:
+For temporal values obtained this way, the following operations are
+supported:
 
 *  ( t1 eq t2 )