Changeset 743 for trunk/zoo-project/zoo-services/gdal/contour
- Timestamp:
- Dec 3, 2015, 8:44:39 AM (9 years ago)
- Location:
- trunk/zoo-project/zoo-services/gdal/contour
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-services/gdal/contour/Makefile
r650 r743 1 1 ZRPATH=../../.. 2 2 include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts 3 CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG3 CFLAGS=-DZOO_SERVICE -I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG 4 4 CC=gcc 5 5 6 6 cgi-env/contour_service.zo: service.c 7 g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} - lzoo_service7 g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service ${FCGI_LDFLAGS} 8 8 install: 9 9 install -d ${CGI_DIR}/gdal/contour -
trunk/zoo-project/zoo-services/gdal/contour/service.c
r450 r743 36 36 #ifdef ZOO_SERVICE 37 37 #include "service.h" 38 #include "service_internal.h" 38 39 #endif 39 40 CPL_CVSID("$Id: gdal_contour.cpp 25643 2013-02-12 13:50:42Z bishop $"); … … 73 74 exit( 1 ); 74 75 } 76 77 #ifdef ZOO_SERVICE 78 int pfnProgress1( double dfComplete, const char *pszMessage, void *pData) 79 { 80 maps* conf=(maps*)pData; 81 map* tmpMap=getMapFromMaps(conf,"lenv","status"); 82 char tmpStr[4]; 83 sprintf(tmpStr,"%d",(int) (dfComplete*100)); 84 if(tmpMap!=NULL && strcmp(tmpMap->value,tmpStr)!=0){ 85 if( pszMessage != NULL && strlen(pszMessage)>1){ 86 updateStatus(conf,(int) (dfComplete*100), pszMessage); 87 } 88 else 89 updateStatus(conf,(int) (dfComplete*100), "Processing..."); 90 } 91 return TRUE; 92 } 93 #endif 75 94 76 95 /************************************************************************/ … … 106 125 const char *pszNewLayerName = "contour"; 107 126 int bQuiet = FALSE; 108 GDALProgressFunc pfnProgress = NULL;109 fprintf(stderr,"DEBUG HELLO %f %d\n",__FILE__,__LINE__);110 fflush(stderr);111 127 #ifndef ZOO_SERVICE 112 128 /* Check that we are running against at least GDAL 1.4 */ … … 262 278 } 263 279 264 if (!bQuiet)265 pfnProgress = GDALTermProgress;266 280 /*if (!bQuiet) 281 pfnProgress = GDALTermProgress;*/ 282 //pfnProgress = GDALTermProgress; 267 283 /* -------------------------------------------------------------------- */ 268 284 /* Open source raster file. */ … … 372 388 OGR_FD_GetFieldIndex( OGR_L_GetLayerDefn( hLayer ), 373 389 pszElevAttrib ), 374 pfnProgress , NULL);390 pfnProgress1, conf ); 375 391 376 392 OGR_DS_Destroy( hDS );
Note: See TracChangeset
for help on using the changeset viewer.