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

Timestamp:

Feb 12, 2014, 3:25:15 PM (10 years ago)

Author:

djay

Message:

Add the optional Ruby Language Support to the ZOO-Kernel with an API similar to the Python ZOO-API. Small rewrite of Python support. Fix issue #86 and #87. Add usid in [lenv] section, this value is used to generate an unique identifier based on time and the process identifier. This usid is now used to name the stored result or the mapfile generated. Remove *some* warning messages displayed at compilation time.

File:

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

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

@@ -109 +109 @@
   map *msOgcVersion=getMapFromMaps(m,"main","msOgcVersion");
   map *dataPath=getMapFromMaps(m,"main","dataPath");
-  map *sid=getMapFromMaps(m,"lenv","sid");
+  map *sid=getMapFromMaps(m,"lenv","usid");
   map* format=getMap(tmpI->content,"mimeType");
   map* rformat=getMap(tmpI->content,"requestedMimeType");
@@ -371 +371 @@
   OGRSFDriverH *poDriver1 = NULL;
   char *dsName=(char*)malloc((8+strlen(pszDataSource)+1)*sizeof(char));
-  char *odsName=strdup(pszDataSource);
-  char *sdsName=strdup(pszDataSource);
+  char *odsName=zStrdup(pszDataSource);
+  char *sdsName=zStrdup(pszDataSource);
   char *demo=strstr(odsName,".");
   sdsName[strlen(sdsName)-(strlen(demo)-1)]='d';
@@ -414 +414 @@
     char** demo=VSIReadDir(dsName);
     int i=0;
-    mkdir(sdsName
+    zMkdir(sdsName
 #ifndef WIN32
                 ,S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH 
@@ -432 +432 @@
 #endif
       VSIFSeekL(vsif,0,SEEK_END);
-      int size=VSIFTellL(vsif);
+      vsi_l_offset size=VSIFTellL(vsif);
 #ifdef DEBUGMS
       fprintf(stderr,"size : %d\n",size);
 #endif
       VSIFSeekL(vsif,0,SEEK_SET);
-      char *vsifcontent=(char*) malloc((size+1)*sizeof(char));
-      VSIFReadL(vsifcontent,1,size,vsif);
+      char *vsifcontent=(char*) malloc(((int)size+1)*sizeof(char));
+      VSIFReadL(vsifcontent,1,(size_t)size,vsif);
       char *fpath=(char*) malloc((strlen(sdsName)+strlen(demo[1])+2)*sizeof(char));
       sprintf(fpath,"%s/%s",sdsName,demo[i]);
-      int f=open(fpath,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
-      write(f,vsifcontent,size);
+      int f=zOpen(fpath,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
+      zWrite(f,vsifcontent,(int)size);
       close(f);
       chmod(fpath,S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH);
@@ -511 +511 @@
     dumpMaps(output);
 #endif
-    myLayer->name = strdup(output->name);
+    myLayer->name = zStrdup(output->name);
     myLayer->tileitem=NULL;
-    myLayer->data = strdup(OGR_L_GetName(poLayer));
-    myLayer->connection = strdup(pszDataSource);
+    myLayer->data = zStrdup(OGR_L_GetName(poLayer));
+    myLayer->connection = zStrdup(pszDataSource);
     myLayer->index = m->numlayers;
     myLayer->dump = MS_TRUE;
@@ -699 +699 @@
 
   layerObj* myLayer=m->layers[m->numlayers];
-  myLayer->name = strdup(output->name);
+  myLayer->name = zStrdup(output->name);
   myLayer->tileitem=NULL;
-  myLayer->data = strdup(pszFilename);
+  myLayer->data = zStrdup(pszFilename);
   myLayer->index = m->numlayers;
   myLayer->dump = MS_TRUE;
@@ -734 +734 @@
   const char *tRef=GDALGetProjectionRef( hDataset );
   if( tRef != NULL && strlen(tRef)>0 ){
-    OGRSpatialReferenceH  hSRS;
     char *pszProjection;
     pszProjection = (char *) GDALGetProjectionRef( hDataset );
-#ifdef DEBUGMS
+    //#ifdef DEBUGMS
     fprintf(stderr,"Accessing the DataSource %s\n",GDALGetProjectionRef( hDataset ));
-#endif
+    //#endif
     setSrsInformations(output,m,myLayer,pszProjection);
-    }
+  }else{
+    fprintf(stderr,"NO SRS FOUND ! %s\n",GDALGetProjectionRef( hDataset ));    
+  }
 
 
@@ -792 +793 @@
     }else{
       if(iBand<4){
-        char *tmpS=strdup(nameBands);
+        char *tmpS=zStrdup(nameBands);
         nameBands=(char*)realloc(nameBands,(strlen(nameBands)+strlen(lBands)+1)*sizeof(char));
         sprintf(nameBands,"%s %s",tmpS,lBands);
@@ -805 +806 @@
    */
   for( iBand = 0; iBand < nBandsI; iBand++ ){
-    int         bGotNodata, bSuccess;
-    double      adfCMinMax[2], dfNoData;
-    int         nBlockXSize, nBlockYSize, nMaskFlags;
-    double      dfMean, dfStdDev;
+    //int         bGotNodata;//, bSuccess;
+    double      adfCMinMax[2]/*, dfNoData*/;
+    //int         nBlockXSize, nBlockYSize, nMaskFlags;
+    //double      /*dfMean, dfStdDev*/;
     hBand = GDALGetRasterBand( hDataset, iBand+1 );
 
@@ -863 +864 @@
             char className[7];
             sprintf(className,"class%d",i);
-            myLayer->CLASS[myLayer->numclasses]->name=strdup(className);
+            myLayer->CLASS[myLayer->numclasses]->name=zStrdup(className);
             
             /**
@@ -924 +925 @@
   
   map* tmpMap=getMapFromMaps(conf,"main","dataPath");
-  map* sidMap=getMapFromMaps(conf,"lenv","sid");
+  map* sidMap=getMapFromMaps(conf,"lenv","usid");
   char *pszDataSource=(char*)malloc((strlen(tmpMap->value)+strlen(sidMap->value)+strlen(outputs->name)+17)*sizeof(char));
   sprintf(pszDataSource,"%s/ZOO_DATA_%s_%s.%s",tmpMap->value,outputs->name,sidMap->value,ext);
@@ -945 +946 @@
   mapObj *myMap=msNewMapObj();
   free(myMap->name);
-  myMap->name=strdup("ZOO-Project_WXS_Server");
+  myMap->name=zStrdup("ZOO-Project_WXS_Server");
   msMapSetSize(myMap,2048,2048);
   msMapSetExtent(myMap,-1,-1,1,1);
@@ -953 +954 @@
    */
   map *tmp1=getMapFromMaps(conf,"main","tmpPath");
-  myMap->web.imagepath=strdup(tmp1->value);
+  myMap->web.imagepath=zStrdup(tmp1->value);
   tmp1=getMapFromMaps(conf,"main","tmpUrl");
-  myMap->web.imageurl=strdup(tmp1->value);
+  myMap->web.imageurl=zStrdup(tmp1->value);
   
   /*
@@ -1084 +1085 @@
   sprintf(tmpPath,"%s/symbols.sym",tmp1->value);
   msInitSymbolSet(&myMap->symbolset);
-  myMap->symbolset.filename=strdup(tmpPath);
+  myMap->symbolset.filename=zStrdup(tmpPath);
   free(tmpPath);
 
-  map* sid=getMapFromMaps(conf,"lenv","sid");
+  map* sid=getMapFromMaps(conf,"lenv","usid");
   char *mapPath=
     (char*)malloc((16+strlen(outputs->name)+strlen(tmp1->value))*sizeof(char));