[mapserver-commits] r8779 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-03-12 07:42:57 -0400 (Thu, 12 Mar 2009)
New Revision: 8779

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwms.c
Log:
fix time advertising in WMS 1.3.0 (#2935)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-11 21:06:20 UTC (rev 8778)
+++ trunk/mapserver/HISTORY.TXT	2009-03-12 11:42:57 UTC (rev 8779)
@@ -41,6 +41,8 @@
 
 - fix warning for change in bitmask type (#2930)
 
+- fix time advertising in WMS 1.3.0 (#2935)
+
 Version 5.4.0-beta3 (2009-3-5):
 --------------------------------
 

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2009-03-11 21:06:20 UTC (rev 8778)
+++ trunk/mapserver/mapwms.c	2009-03-12 11:42:57 UTC (rev 8779)
@@ -1494,11 +1494,20 @@
        pszWmsTimeDefault = msOWSLookupMetadata(&(lp->metadata),  "MO",
                                                "timedefault");
 
+       if (nVersion >= OWS_1_3_0) {
+         if (pszWmsTimeDefault)
+           msIO_fprintf(stdout, "        <Dimension name=\"time\" units=\"ISO8601\" default=\"%s\" nearestValue=\"0\">%s</Dimension>\n",pszWmsTimeDefault, pszWmsTimeExtent);
+         else
+           msIO_fprintf(stdout, "        <Dimension name=\"time\" units=\"ISO8601\" nearestValue=\"0\">%s</Dimension>\n",pszWmsTimeExtent);
+       }
+
+       else {
        msIO_fprintf(stdout, "        <Dimension name=\"time\" units=\"ISO8601\"/>\n");
        if (pszWmsTimeDefault)
          msIO_fprintf(stdout, "        <Extent name=\"time\" default=\"%s\" nearestValue=\"0\">%s</Extent>\n",pszWmsTimeDefault, pszWmsTimeExtent);
        else
            msIO_fprintf(stdout, "        <Extent name=\"time\" nearestValue=\"0\">%s</Extent>\n",pszWmsTimeExtent);
+       }
 
    }