Changeset 743 for trunk/zoo-project/zoo-services/gdal/contour

Timestamp:

Dec 3, 2015, 8:44:39 AM (8 years ago)

Author:

djay

Message:

Add WCPS-Proxy, data-api proxy and update Makefile for dealing with specific location of fastcgi. Add status update for contour lines computation.

Location:

trunk/zoo-project/zoo-services/gdal/contour

Files:

• Makefile (modified) (1 diff)
• service.c (modified) (5 diffs)

trunk/zoo-project/zoo-services/gdal/contour/Makefile

@@ -1 +1 @@
 ZRPATH=../../..
 include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
-CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
+CFLAGS=-DZOO_SERVICE -I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
 CC=gcc
 
 cgi-env/contour_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service ${FCGI_LDFLAGS}
 install:
         install -d ${CGI_DIR}/gdal/contour

trunk/zoo-project/zoo-services/gdal/contour/service.c

@@ -36 +36 @@
 #ifdef ZOO_SERVICE
 #include "service.h"
+#include "service_internal.h"
 #endif
 CPL_CVSID("$Id: gdal_contour.cpp 25643 2013-02-12 13:50:42Z bishop $");
@@ -73 +74 @@
     exit( 1 );
 }
+
+#ifdef ZOO_SERVICE
+  int pfnProgress1( double dfComplete, const char *pszMessage, void *pData)
+  {
+    maps* conf=(maps*)pData;
+    map* tmpMap=getMapFromMaps(conf,"lenv","status");
+    char tmpStr[4];
+    sprintf(tmpStr,"%d",(int) (dfComplete*100));
+    if(tmpMap!=NULL && strcmp(tmpMap->value,tmpStr)!=0){
+      if( pszMessage != NULL && strlen(pszMessage)>1){
+        updateStatus(conf,(int) (dfComplete*100), pszMessage);
+      }      
+      else
+        updateStatus(conf,(int) (dfComplete*100), "Processing...");
+    }
+    return TRUE;
+  }
+#endif
 
 /************************************************************************/
@@ -106 +125 @@
     const char *pszNewLayerName = "contour";
     int bQuiet = FALSE;
-    GDALProgressFunc pfnProgress = NULL;
-    fprintf(stderr,"DEBUG HELLO %f %d\n",__FILE__,__LINE__);
-    fflush(stderr);
 #ifndef ZOO_SERVICE
     /* Check that we are running against at least GDAL 1.4 */
@@ -262 +278 @@
     }
     
-    if (!bQuiet)
-        pfnProgress = GDALTermProgress;
-
+    /*if (!bQuiet)
+      pfnProgress = GDALTermProgress;*/
+    //pfnProgress = GDALTermProgress;
 /* -------------------------------------------------------------------- */
 /*      Open source raster file.                                        */
@@ -372 +388 @@
                                  OGR_FD_GetFieldIndex( OGR_L_GetLayerDefn( hLayer ), 
                                                        pszElevAttrib ), 
-                         pfnProgress, NULL );
+                         pfnProgress1, conf );
 
     OGR_DS_Destroy( hDS );