Changeset 478 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

May 27, 2014, 4:05:49 PM (9 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.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (5 diffs)

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){