Changeset 453 for trunk/zoo-project/zoo-kernel/service_internal_ms.c
- Timestamp:
- Feb 12, 2014, 3:25:15 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/service_internal_ms.c
r451 r453 109 109 map *msOgcVersion=getMapFromMaps(m,"main","msOgcVersion"); 110 110 map *dataPath=getMapFromMaps(m,"main","dataPath"); 111 map *sid=getMapFromMaps(m,"lenv"," sid");111 map *sid=getMapFromMaps(m,"lenv","usid"); 112 112 map* format=getMap(tmpI->content,"mimeType"); 113 113 map* rformat=getMap(tmpI->content,"requestedMimeType"); … … 371 371 OGRSFDriverH *poDriver1 = NULL; 372 372 char *dsName=(char*)malloc((8+strlen(pszDataSource)+1)*sizeof(char)); 373 char *odsName= strdup(pszDataSource);374 char *sdsName= strdup(pszDataSource);373 char *odsName=zStrdup(pszDataSource); 374 char *sdsName=zStrdup(pszDataSource); 375 375 char *demo=strstr(odsName,"."); 376 376 sdsName[strlen(sdsName)-(strlen(demo)-1)]='d'; … … 414 414 char** demo=VSIReadDir(dsName); 415 415 int i=0; 416 mkdir(sdsName416 zMkdir(sdsName 417 417 #ifndef WIN32 418 418 ,S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH … … 432 432 #endif 433 433 VSIFSeekL(vsif,0,SEEK_END); 434 int size=VSIFTellL(vsif);434 vsi_l_offset size=VSIFTellL(vsif); 435 435 #ifdef DEBUGMS 436 436 fprintf(stderr,"size : %d\n",size); 437 437 #endif 438 438 VSIFSeekL(vsif,0,SEEK_SET); 439 char *vsifcontent=(char*) malloc(( size+1)*sizeof(char));440 VSIFReadL(vsifcontent,1, size,vsif);439 char *vsifcontent=(char*) malloc(((int)size+1)*sizeof(char)); 440 VSIFReadL(vsifcontent,1,(size_t)size,vsif); 441 441 char *fpath=(char*) malloc((strlen(sdsName)+strlen(demo[1])+2)*sizeof(char)); 442 442 sprintf(fpath,"%s/%s",sdsName,demo[i]); 443 int f= open(fpath,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);444 write(f,vsifcontent,size);443 int f=zOpen(fpath,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); 444 zWrite(f,vsifcontent,(int)size); 445 445 close(f); 446 446 chmod(fpath,S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH); … … 511 511 dumpMaps(output); 512 512 #endif 513 myLayer->name = strdup(output->name);513 myLayer->name = zStrdup(output->name); 514 514 myLayer->tileitem=NULL; 515 myLayer->data = strdup(OGR_L_GetName(poLayer));516 myLayer->connection = strdup(pszDataSource);515 myLayer->data = zStrdup(OGR_L_GetName(poLayer)); 516 myLayer->connection = zStrdup(pszDataSource); 517 517 myLayer->index = m->numlayers; 518 518 myLayer->dump = MS_TRUE; … … 699 699 700 700 layerObj* myLayer=m->layers[m->numlayers]; 701 myLayer->name = strdup(output->name);701 myLayer->name = zStrdup(output->name); 702 702 myLayer->tileitem=NULL; 703 myLayer->data = strdup(pszFilename);703 myLayer->data = zStrdup(pszFilename); 704 704 myLayer->index = m->numlayers; 705 705 myLayer->dump = MS_TRUE; … … 734 734 const char *tRef=GDALGetProjectionRef( hDataset ); 735 735 if( tRef != NULL && strlen(tRef)>0 ){ 736 OGRSpatialReferenceH hSRS;737 736 char *pszProjection; 738 737 pszProjection = (char *) GDALGetProjectionRef( hDataset ); 739 #ifdef DEBUGMS738 //#ifdef DEBUGMS 740 739 fprintf(stderr,"Accessing the DataSource %s\n",GDALGetProjectionRef( hDataset )); 741 #endif740 //#endif 742 741 setSrsInformations(output,m,myLayer,pszProjection); 743 } 742 }else{ 743 fprintf(stderr,"NO SRS FOUND ! %s\n",GDALGetProjectionRef( hDataset )); 744 } 744 745 745 746 … … 792 793 }else{ 793 794 if(iBand<4){ 794 char *tmpS= strdup(nameBands);795 char *tmpS=zStrdup(nameBands); 795 796 nameBands=(char*)realloc(nameBands,(strlen(nameBands)+strlen(lBands)+1)*sizeof(char)); 796 797 sprintf(nameBands,"%s %s",tmpS,lBands); … … 805 806 */ 806 807 for( iBand = 0; iBand < nBandsI; iBand++ ){ 807 int bGotNodata, bSuccess;808 double adfCMinMax[2] , dfNoData;809 int nBlockXSize, nBlockYSize, nMaskFlags;810 double dfMean, dfStdDev;808 //int bGotNodata;//, bSuccess; 809 double adfCMinMax[2]/*, dfNoData*/; 810 //int nBlockXSize, nBlockYSize, nMaskFlags; 811 //double /*dfMean, dfStdDev*/; 811 812 hBand = GDALGetRasterBand( hDataset, iBand+1 ); 812 813 … … 863 864 char className[7]; 864 865 sprintf(className,"class%d",i); 865 myLayer->CLASS[myLayer->numclasses]->name= strdup(className);866 myLayer->CLASS[myLayer->numclasses]->name=zStrdup(className); 866 867 867 868 /** … … 924 925 925 926 map* tmpMap=getMapFromMaps(conf,"main","dataPath"); 926 map* sidMap=getMapFromMaps(conf,"lenv"," sid");927 map* sidMap=getMapFromMaps(conf,"lenv","usid"); 927 928 char *pszDataSource=(char*)malloc((strlen(tmpMap->value)+strlen(sidMap->value)+strlen(outputs->name)+17)*sizeof(char)); 928 929 sprintf(pszDataSource,"%s/ZOO_DATA_%s_%s.%s",tmpMap->value,outputs->name,sidMap->value,ext); … … 945 946 mapObj *myMap=msNewMapObj(); 946 947 free(myMap->name); 947 myMap->name= strdup("ZOO-Project_WXS_Server");948 myMap->name=zStrdup("ZOO-Project_WXS_Server"); 948 949 msMapSetSize(myMap,2048,2048); 949 950 msMapSetExtent(myMap,-1,-1,1,1); … … 953 954 */ 954 955 map *tmp1=getMapFromMaps(conf,"main","tmpPath"); 955 myMap->web.imagepath= strdup(tmp1->value);956 myMap->web.imagepath=zStrdup(tmp1->value); 956 957 tmp1=getMapFromMaps(conf,"main","tmpUrl"); 957 myMap->web.imageurl= strdup(tmp1->value);958 myMap->web.imageurl=zStrdup(tmp1->value); 958 959 959 960 /* … … 1084 1085 sprintf(tmpPath,"%s/symbols.sym",tmp1->value); 1085 1086 msInitSymbolSet(&myMap->symbolset); 1086 myMap->symbolset.filename= strdup(tmpPath);1087 myMap->symbolset.filename=zStrdup(tmpPath); 1087 1088 free(tmpPath); 1088 1089 1089 map* sid=getMapFromMaps(conf,"lenv"," sid");1090 map* sid=getMapFromMaps(conf,"lenv","usid"); 1090 1091 char *mapPath= 1091 1092 (char*)malloc((16+strlen(outputs->name)+strlen(tmp1->value))*sizeof(char));
Note: See TracChangeset
for help on using the changeset viewer.