[mapserver-commits] r8782 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-03-12 08:09:21 -0400 (Thu, 12 Mar 2009)
New Revision: 8782

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mapwms.c
Log:
fix time advertising in WMS 1.3.0 (#2935)


Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-12 12:06:47 UTC (rev 8781)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-12 12:09:21 UTC (rev 8782)
@@ -36,6 +36,8 @@
 
 - Fix build on windows (maputil.c)
 
+- fix time advertising in WMS 1.3.0 (#2935)
+
 Version 5.4.0-beta2 (2009-02-25):
 ---------------------------------
 

Modified: branches/branch-5-4/mapserver/mapwms.c
===================================================================
--- branches/branch-5-4/mapserver/mapwms.c	2009-03-12 12:06:47 UTC (rev 8781)
+++ branches/branch-5-4/mapserver/mapwms.c	2009-03-12 12:09:21 UTC (rev 8782)
@@ -1485,12 +1485,20 @@
        pszWmsTimeDefault = msOWSLookupMetadata(&(lp->metadata),  "MO",
                                                "timedefault");
 
-       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
+       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);
-
+       }
    }
 
   if (nVersion >= OWS_1_0_7) {