Changeset 478 for trunk

Timestamp:

May 27, 2014, 4:05:49 PM (11 years ago)

Author:

djay

Message:

Fix issue on win32 platform for Python support. Remove dirent.obj dependency from utils/status service. readVSIFile defined when MapServer? is not activated.

Location:

trunk/zoo-project

Files:

• zoo-kernel/service_internal.c (modified) (5 diffs)
• zoo-kernel/service_internal.h (modified) (3 diffs)
• zoo-kernel/service_internal_python.c (modified) (1 diff)
• zoo-kernel/ulinet.c (modified) (2 diffs)
• zoo-kernel/zoo_service_loader.c (modified) (3 diffs)
• zoo-services/utils/status/makefile.vc (modified) (1 diff)
• zoo-services/utils/status/service.c (modified) (1 diff)

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

@@ -26 +26 @@
 #ifdef USE_MS
 #include "service_internal_ms.h"
+#else
+#include "cpl_vsi.h"
 #endif
 
@@ -165 +167 @@
     i++;
   }
+#ifdef DEBUG
   fprintf(stderr,"READING STRING S %s\n",lpszBuf);
+#endif
   return (char*)lpszBuf;
 }
@@ -2940 +2944 @@
   tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));
   if(tmpMap->value==NULL)
-    fprintf(stderr,"Unable to allocate memory!\n");
+    return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
   //snprintf(tmpMap->value,(fsize+1)*sizeof(char),fcontent);
   memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
@@ -2971 +2975 @@
 }
 
-#ifdef USE_MS
 char *readVSIFile(maps* conf,const char* dataSource){
     VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
@@ -2989 +2992 @@
     return res1;
 }
-#endif
 
 void parseIdentifier(maps* conf,char* conf_dir,char *identifier,char* buffer){

trunk/zoo-project/zoo-kernel/service_internal.h

@@ -31 +31 @@
 #define TIME_SIZE 40
 
-#include "cgic.h"
 #include <libintl.h>
 #include <locale.h>
@@ -39 +38 @@
 #include <sys/stat.h>
 #include <sys/types.h>
+#include "cgic.h"
 #ifndef WIN32
 #include <sys/ipc.h>
@@ -145 +145 @@
   int loadRemoteFile(maps**,map**,HINTERNET,char*);
 
-#ifdef USE_MS
   char *readVSIFile(maps*,const char*);
-#endif
   void parseIdentifier(maps*,char*,char*,char*);
   int updateStatus( maps*,const int,const char*);

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

@@ -285 +285 @@
     PyErr_Clear();
     res=-1;
-    //exit(-1);
   } 
 #if PY_MAJOR_VERSION < 3
   PyGILState_Release(gstate);
-  PyEval_ReleaseLock();
+  PyEval_AcquireLock();
 #endif
   PyThreadState_Swap(mainstate);

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

@@ -229 +229 @@
       sprintf(filename,"/tmp/ZOO_Cache%d",(int)time(NULL));
       filename[24]=0;
-      fprintf(stderr,"file=%s",filename);
 #ifdef MSG_LAF_VERBOSE
       fprintf(stderr,"file=%s",filename);
@@ -267 +266 @@
 #ifdef ULINET_DEBUG
   fprintf(stderr,"DEBUG MIMETYPE: %s\n",hInternet.mimeType);
+  fflush(stderr);
 #endif
   return hInternet;

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

@@ -297 +297 @@
 
 void donothing(int sig){
+#ifdef DEBUG
   fprintf(stderr,"Signal %d after the ZOO-Kernel returned result !\n",sig);
+#endif
   exit(0);
 }
@@ -376 +378 @@
     DWORD errstr;
     errstr = GetLastError();
-    fprintf(stderr,"%s loaded (%d) \n",tmps1,errstr);
 #else
     char *errstr;
     errstr = dlerror();
+#endif
+#ifdef DEBUG
+    fprintf(stderr,"%s loaded (%d) \n",tmps1,errstr);
 #endif
     if( so != NULL ) {
@@ -461 +465 @@
           errorException(m, tmpMsg, "InternalError",NULL);
           free(tmpMsg);
+#ifdef DEBUG
           fprintf(stderr,"Function %s error %s\n",r_inputs->value,errstr);
+#endif
           return;
         }

trunk/zoo-project/zoo-services/utils/status/makefile.vc

@@ -2 +2 @@
 !INCLUDE $(ZOOK_DIR)/nmake.opt
 
-FILES=$(ZOOK_DIR)/dirent.obj $(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
+FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
 !IFDEF JS_DIR
 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)

trunk/zoo-project/zoo-services/utils/status/service.c

@@ -104 +104 @@
        */
       char *tmpStr=getStatus(atoi(tmpMap->value));
+#ifdef DEBUG
       fprintf(stderr,"DEBUG: %s \n",tmpStr);
+#endif
       if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){
         char *tmpStr1=strdup(tmpStr);