[mapserver-commits] r9294 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-09-04 09:39:08 -0400 (Fri, 04 Sep 2009)
New Revision: 9294

Modified:
   trunk/mapserver/mapquery.c
   trunk/mapserver/mapserver.h
Log:
Fixed some name conflicts with the queryObj and MapScript.

Modified: trunk/mapserver/mapquery.c
===================================================================
--- trunk/mapserver/mapquery.c	2009-09-04 12:18:13 UTC (rev 9293)
+++ trunk/mapserver/mapquery.c	2009-09-04 13:39:08 UTC (rev 9294)
@@ -35,32 +35,32 @@
 {
   if(!query) return MS_FAILURE;
 
-  query->type = MS_QUERY_IS_NULL; /* nothing defined */
-  query->mode = MS_QUERY_SINGLE;
+  query->qtype = MS_QUERY_IS_NULL; /* nothing defined */
+  query->qmode = MS_QUERY_SINGLE;
 
-  query->layer=-1;
+  query->qlayer=-1;
 
-  query->point.x = query->point.y = -1;
-  query->rect.minx = query->rect.miny = query->rect.maxx = query->rect.maxy = -1;
-  query->shape = NULL;
+  query->qpoint.x = query->qpoint.y = -1;
+  query->qrect.minx = query->qrect.miny = query->qrect.maxx = query->qrect.maxy = -1;
+  query->qshape = NULL;
 
-  query->index = -1;
+  query->qindex = -1;
 
-  query->item = NULL;
-  query->string = NULL;
+  query->qitem = NULL;
+  query->qstring = NULL;
 
   return MS_SUCCESS;
 }
 
 void msFreeQuery(queryObj *query)
 {
-  if(query->shape) {
-    msFreeShape(query->shape);
-    free(query->shape);
+  if(query->qshape) {
+    msFreeShape(query->qshape);
+    free(query->qshape);
   }
 
-  if(query->item) free(query->item);
-  if(query->string) free(query->string);
+  if(query->qitem) free(query->qitem);
+  if(query->qstring) free(query->qstring);
 }
 
 /*

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2009-09-04 12:18:13 UTC (rev 9293)
+++ trunk/mapserver/mapserver.h	2009-09-04 13:39:08 UTC (rev 9294)
@@ -586,21 +586,23 @@
 /*                                                                      */
 /*      encapsulates the information necessary to perform a query       */
 /************************************************************************/
+#ifndef SWIG
 typedef struct {
-  int type; /* MS_QUERY_TYPE */
-  int mode; /* MS_QUERY_MODE */
+  int qtype; /* MS_QUERY_TYPE */
+  int qmode; /* MS_QUERY_MODE */
 
-  int layer;
+  int qlayer;
 
-  pointObj point; /* by point */
-  rectObj rect; /* by rect */
-  shapeObj *shape; /* by shape */
+  pointObj qpoint; /* by point */
+  rectObj qrect; /* by rect */
+  shapeObj *qshape; /* by shape */
 
-  long index; /* by index */
+  long qindex; /* by index */
 
-  char *item; /* by attribute */
-  char *string;
+  char *qitem; /* by attribute */
+  char *qstring;
 } queryObj;
+#endif
 
 /************************************************************************/
 /*                             queryMapObj                              */