Merge branch 'branch-1-6' of github.com:mapserver/mapcache

Author: jmckenna

CMakeLists.txt

@@ -12,7 +12,7 @@ endif ()
 
 
 set (MAPCACHE_VERSION_MAJOR 1)
-set (MAPCACHE_VERSION_MINOR 7)
+set (MAPCACHE_VERSION_MINOR 8)
 set (MAPCACHE_VERSION_REVISION 0)
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)

mapcache.xml.sample

@@ -856,7 +856,12 @@
                file. i.e. their are as many different caches created as their are values in the
                <values> tag.
          -->
-         <dimension type="values" name="DIM1" default="foobar">foobar,foobarbaz,foo,bar</dimension>
+	 <dimension type="values" name="DIM1" default="foobar">
+		 <value>foobar</value>
+		 <value>foobarbaz</value>
+		 <value>foo</value>
+		 <value>bar</value>
+	 </dimension>
 
          <!-- regex dimension
             the following creates a MAPFILE dimension, for using the same mod-mapcache tileset with different
@@ -867,18 +872,12 @@
             spearated by slashes (/) and finishing with ".map" ( [a-zA-Z0-9\./]*\.map$ ) , but will faill if there
             are two consecutive dots (..) in the path, to prevent filesystem traversal  ( (?!.*\.\.) ).
          -->
-         <dimension type="regex" name="MAPFILE" default="/path/to/mapfile.map">^(?!.*\.\.)[a-zA-Z0-9\./]*\.map$</dimension>
-
-         <!-- intervals dimension
-            the syntax is the same as common-ows, i.e. a comma separated list of "min/max/resolution" entries.
-            eg: 
-               * 0/5000/1000 allows the values 0,1000,2000,3000,4000 and 5000
-               * 0/100/0 allows any values between 0 and 100
-               * both values can be combined: 0/5000/1000,0/100/0
-         -->
-         <dimension name="ELEVATION" type="intervals" default="0">0/5000/1000</dimension>
+	 <dimension type="regex" name="MAPFILE" default="/path/to/mapfile.map">
+		 <regex>^(?!.*\.\.)[a-zA-Z0-9\./]*\.map$</regex>
+	 </dimension>
+
 
-         <!-- coming in a future version: support for ISO8601 date/time dimensions -->
+         <!-- todo: example support for ISO8601 date/time and sqlite dimensions -->
 
       </dimensions>
    </tileset>