Changeset 649 for trunk/zoo-project

Timestamp:

May 29, 2015, 1:31:23 PM (9 years ago)

Author:

djay

Message:

Migrate readVSIFile from server_internal to zoo_service shared library.

Location:

trunk/zoo-project/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• server_internal.c (modified) (2 diffs)
• server_internal.h (modified) (1 diff)
• service_internal.c (modified) (2 diffs)
• service_internal.h (modified) (1 diff)

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -94 +94 @@
 
 libzoo_service.${EXT}: version.h service_internal.o service.o 
-        gcc -shared ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o -lfcgi
+        gcc -shared  ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o -lfcgi ${GDAL_LIBS}
 
 zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o sqlapi.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE}

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

@@ -28 +28 @@
 #ifndef WIN32
 #include <dlfcn.h>
-#endif
-
-#ifdef USE_MS
-#include "service_internal_ms.h"
-#else
-#include "cpl_vsi.h"
 #endif
 
@@ -767 +761 @@
 }
 
-/**
- * Read a file using the GDAL VSI API 
- *
- * @param conf the maps containing the settings of the main.cfg file
- * @param dataSource the datasource name to read
- * @warning make sure to free ressources returned by this function
- */
-char *readVSIFile(maps* conf,const char* dataSource){
-    VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
-    VSIStatBufL file_status;
-    VSIStatL(dataSource, &file_status);
-    if(fichier==NULL){
-      char tmp[1024];
-      sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %lld.",
-              dataSource,file_status.st_size);
-      setMapInMaps(conf,"lenv","message",tmp);
-      return NULL;
-    }
-    char *res1=(char *)malloc(file_status.st_size*sizeof(char));
-    VSIFReadL(res1,1,file_status.st_size*sizeof(char),fichier);
-    res1[file_status.st_size-1]=0;
-    VSIFCloseL(fichier);
-    VSIUnlink(dataSource);
-    return res1;
-}
-
-
+
+

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

@@ -49 +49 @@
   char* addDefaultValues(maps**,elements*,maps*,int,map**);
   char* getEncoding(maps*);
-  char *readVSIFile(maps*,const char*);
   void parseIdentifier(maps*,char*,char*,char*);
   void dumpMapsValuesToFiles(maps**,maps**);

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

@@ -25 +25 @@
 #include "fcgi_stdio.h"
 #include "service_internal.h"
+#ifdef USE_MS
+#include "service_internal_ms.h"
+#else
+#include "cpl_vsi.h"
+#endif
 
 #ifndef TRUE
@@ -606 +611 @@
 
 /**
+ * Read a file using the GDAL VSI API 
+ *
+ * @param conf the maps containing the settings of the main.cfg file
+ * @param dataSource the datasource name to read
+ * @warning make sure to free ressources returned by this function
+ */
+char *readVSIFile(maps* conf,const char* dataSource){
+    VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
+    VSIStatBufL file_status;
+    VSIStatL(dataSource, &file_status);
+    if(fichier==NULL){
+      char tmp[1024];
+      sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %lld.",
+              dataSource,file_status.st_size);
+      setMapInMaps(conf,"lenv","message",tmp);
+      return NULL;
+    }
+    char *res1=(char *)malloc(file_status.st_size*sizeof(char));
+    VSIFReadL(res1,1,file_status.st_size*sizeof(char),fichier);
+    res1[file_status.st_size-1]=0;
+    VSIFCloseL(fichier);
+    VSIUnlink(dataSource);
+    return res1;
+}
+
+/**
  * Set an output value 
  *

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

@@ -94 +94 @@
 #endif
 
+  char *readVSIFile(maps*,const char*);
   int  setOutputValue( maps*, const char*, char*, size_t);
   char* getInputValue( maps*,const char*,size_t*);