Changeset 370 for trunk/zoo-project/zoo-kernel/service_internal_ms.c

Timestamp:

Oct 10, 2012, 10:11:10 AM (12 years ago)

Author:

djay

Message:

Add the capability to use a specific Python version by detecting if python-VERS-config exists or if python-config-VERS exists. Add NEED_STRCASESTR to nmake.opt for MapServer? support. Fix for the name of layer class on Unix/Windows?. Provide definition of strcasestr if and only if MapServer? was not activated.

File:

• trunk/zoo-project/zoo-kernel/service_internal_ms.c (modified) (7 diffs)

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -1 +1 @@
 #ifdef USE_MS
-
+#ifndef WIN32
+#define CLASS class
+#else
+#define CLASS _class
+#endif
 #include "service_internal_ms.h"
 
@@ -555 +559 @@
     if(msGrowLayerClasses(myLayer) == NULL)
       return -1;
-    if(initClass((myLayer->_class[myLayer->numclasses])) == -1)
+    if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
       return -1;
-    myLayer->_class[myLayer->numclasses]->type = myLayer->type;
-    if(msGrowClassStyles(myLayer->_class[myLayer->numclasses]) == NULL)
+    myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
+    if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
       return -1;
-    if(initStyle(myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]) == -1)
+    if(initStyle(myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]) == -1)
       return -1;
 
@@ -568 +572 @@
     tmpMap=getMap(output->content,"msStyle");
     if(tmpMap!=NULL)
-      msUpdateStyleFromString(myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles],tmpMap->value,0);
+      msUpdateStyleFromString(myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles],tmpMap->value,0);
     else{
       /**
        * Set style
        */
-      myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->color.red=125;
-      myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->color.green=125;
-      myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->color.blue=255;
-      myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->outlinecolor.red=80;
-      myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->outlinecolor.green=80;
-      myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->outlinecolor.blue=80;
+      myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->color.red=125;
+      myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->color.green=125;
+      myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->color.blue=255;
+      myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->outlinecolor.red=80;
+      myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->outlinecolor.green=80;
+      myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->outlinecolor.blue=80;
 
       /**
@@ -584 +588 @@
        */
       if(myLayer->type == MS_LAYER_POLYGON)
-        myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->width=3;
+        myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->width=3;
       if(myLayer->type == MS_LAYER_LINE){
-        myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->width=3;
-        myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->outlinewidth=1.5;
+        myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->width=3;
+        myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->outlinewidth=1.5;
       }
       if(myLayer->type == MS_LAYER_POINT){
-        myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->symbol=1;
-        myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->size=15;
-      }
-
-    }
-    myLayer->_class[myLayer->numclasses]->numstyles++;
+        myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->symbol=1;
+        myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->size=15;
+      }
+
+    }
+    myLayer->CLASS[myLayer->numclasses]->numstyles++;
     myLayer->numclasses++;
     m->layerorder[m->numlayers] = m->numlayers;
@@ -795 +799 @@
             if(msGrowLayerClasses(myLayer) == NULL)
               return -1;
-            if(initClass((myLayer->_class[myLayer->numclasses])) == -1)
+            if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
               return -1;
-            myLayer->_class[myLayer->numclasses]->type = myLayer->type;
-            if(msGrowClassStyles(myLayer->_class[myLayer->numclasses]) == NULL)
+            myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
+            if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
               return -1;
-            if(initStyle(myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]) == -1)
+            if(initStyle(myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]) == -1)
               return -1;
             
@@ -808 +812 @@
             char className[7];
             sprintf(className,"class%d",i);
-            myLayer->_class[myLayer->numclasses]->name=strdup(className);
+            myLayer->CLASS[myLayer->numclasses]->name=strdup(className);
             
             /**
@@ -818 +822 @@
             else
               sprintf(expression,"([pixel]>=%.3f AND [pixel]<=%.3f)",cstep,cstep+interval);
-            msLoadExpressionString(&myLayer->_class[myLayer->numclasses]->expression,expression);
+            msLoadExpressionString(&myLayer->CLASS[myLayer->numclasses]->expression,expression);
             
             /**
              * Set color
              */
-            myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->color.red=_tmpColors[i][0];
-            myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->color.green=_tmpColors[i][1];
-            myLayer->_class[myLayer->numclasses]->styles[myLayer->_class[myLayer->numclasses]->numstyles]->color.blue=_tmpColors[i][2];
+            myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->color.red=_tmpColors[i][0];
+            myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->color.green=_tmpColors[i][1];
+            myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles]->color.blue=_tmpColors[i][2];
             cstep+=interval;
-            myLayer->_class[myLayer->numclasses]->numstyles++;
+            myLayer->CLASS[myLayer->numclasses]->numstyles++;
             myLayer->numclasses++;