← Back to branch summary

~ubuntu-branches/ubuntu/raring/mapserver/raring-security

« back to all changes in this revision

Viewing changes to mapwms.c

  • Committer: Bazaar Package Importer
  • Author(s): Francesco Paolo Lovergine, Alan Boudreault, Francesco Paolo Lovergine
  • Date: 2010-03-24 22:13:25 UTC
  • mfrom: (10.2.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100324221325-g9hwfpfqeiq4fz7m
Tags: 5.6.3-1
[ Alan Boudreault ]
* New upstream release, with important bug fixes.
* Fixed some typo in debian/control.

[ Francesco Paolo Lovergine ]
* Policy bumped to 3.8.4 without changes.
* Removed Andreas Putzo among Uploaders: last contribution dated more than
  two years ago.
* Added shapelib to Suggests in mapserver-bin. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapwms.c
1
1
/******************************************************************************
2
 
 * $Id: mapwms.c 9492 2009-10-19 14:55:32Z aboudreault $
 
2
 * $Id: mapwms.c 9855 2010-02-22 00:20:06Z dmorissette $
3
3
 *
4
4
 * Project:  MapServer
5
5
 * Purpose:  OpenGIS Web Mapping Service support implementation.
47
47
#include <process.h>
48
48
#endif
49
49
 
50
 
MS_CVSID("$Id: mapwms.c 9492 2009-10-19 14:55:32Z aboudreault $")
 
50
MS_CVSID("$Id: mapwms.c 9855 2010-02-22 00:20:06Z dmorissette $")
51
51
 
52
52
/* ==================================================================
53
53
 * WMS Server stuff.
621
621
      }
622
622
    }
623
623
    else if (strcasecmp(names[i], "BBOX") == 0) {
624
 
      char **tokens;
625
 
      int n;
 
624
      char **tokens = 0;
 
625
      int n = 0;
626
626
      bboxfound = 1;
627
627
      tokens = msStringSplit(values[i], ',', &n);
628
628
      if (tokens==NULL || n != 4) {
665
665
    }
666
666
    else if (strcasecmp(names[i], "FORMAT") == 0) {
667
667
      const char *format_list = NULL;
 
668
      char **tokens = NULL;
 
669
        
668
670
      formatfound = 1;
669
671
 
670
672
      /*check to see if a predefined list is given*/
1444
1446
   if (msOWSGetEPSGProj(&(map->projection),&(map->web.metadata),
1445
1447
                        "MO", MS_FALSE) == NULL)
1446
1448
   {
1447
 
       /* starting 1.1.1 SRS are given in individual tags */
 
1449
       /* If map has no proj then every layer MUST have one or produce a warning */
1448
1450
       if (nVersion > OWS_1_1_0)
1449
1451
       {
 
1452
           /* starting 1.1.1 SRS are given in individual tags */
1450
1453
           if (nVersion >= OWS_1_3_0)
1451
1454
             msOWSPrintEncodeParamList(stdout, "(at least one of) "
1452
1455
                                       "MAP.PROJECTION, LAYER.PROJECTION "
1467
1470
                                     "        <SRS>%s</SRS>\n", NULL);
1468
1471
       }
1469
1472
       else
1470
 
         /* If map has no proj then every layer MUST have one or produce a warning */
1471
1473
         msOWSPrintEncodeParam(stdout, "(at least one of) MAP.PROJECTION, "
1472
1474
                               "LAYER.PROJECTION or wms_srs metadata",
1473
1475
                               msOWSGetEPSGProj(&(lp->projection),
1476
1478
   }
1477
1479
   else
1478
1480
   {
1479
 
       /* starting 1.1.1 SRS are given in individual tags */
 
1481
       /* No warning required in this case since there's at least a map proj. */
1480
1482
       if (nVersion > OWS_1_1_0)
1481
1483
       {
 
1484
           /* starting 1.1.1 SRS are given in individual tags */
1482
1485
           if (nVersion >=  OWS_1_3_0)
1483
1486
             msOWSPrintEncodeParamList(stdout, "(at least one of) "
1484
1487
                                     "MAP.PROJECTION, LAYER.PROJECTION "
1486
1489
                                     msOWSGetEPSGProj(&(lp->projection), 
1487
1490
                                                      &(lp->metadata),
1488
1491
                                                      "MO", MS_FALSE),
1489
 
                                     OWS_WARN, ' ', NULL, NULL, 
 
1492
                                     OWS_NOERR, ' ', NULL, NULL, 
1490
1493
                                     "        <CRS>%s</CRS>\n", NULL);
1491
1494
           else
1492
1495
             msOWSPrintEncodeParamList(stdout, "(at least one of) "
1495
1498
                                     msOWSGetEPSGProj(&(lp->projection), 
1496
1499
                                                      &(lp->metadata),
1497
1500
                                                      "MO", MS_FALSE),
1498
 
                                     OWS_WARN, ' ', NULL, NULL, 
 
1501
                                     OWS_NOERR, ' ', NULL, NULL, 
1499
1502
                                     "        <SRS>%s</SRS>\n", NULL);
1500
1503
       }
1501
1504
       else
1502
 
       /* No warning required in this case since there's at least a map proj. */
1503
1505
         msOWSPrintEncodeParam(stdout,
1504
1506
                               " LAYER.PROJECTION (or wms_srs metadata)",
1505
1507
                               msOWSGetEPSGProj(&(lp->projection),