Changeset 649 for trunk/zoo-project


Ignore:
Timestamp:
May 29, 2015, 1:31:23 PM (7 years ago)
Author:
djay
Message:

Migrate readVSIFile from server_internal to zoo_service shared library.

Location:
trunk/zoo-project/zoo-kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/Makefile.in

    r640 r649  
    9494
    9595libzoo_service.${EXT}: version.h service_internal.o service.o
    96         gcc -shared ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o -lfcgi
     96        gcc -shared  ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o -lfcgi ${GDAL_LIBS}
    9797
    9898zoo_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

    r642 r649  
    2828#ifndef WIN32
    2929#include <dlfcn.h>
    30 #endif
    31 
    32 #ifdef USE_MS
    33 #include "service_internal_ms.h"
    34 #else
    35 #include "cpl_vsi.h"
    3630#endif
    3731
     
    767761}
    768762
    769 /**
    770  * Read a file using the GDAL VSI API
    771  *
    772  * @param conf the maps containing the settings of the main.cfg file
    773  * @param dataSource the datasource name to read
    774  * @warning make sure to free ressources returned by this function
    775  */
    776 char *readVSIFile(maps* conf,const char* dataSource){
    777     VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
    778     VSIStatBufL file_status;
    779     VSIStatL(dataSource, &file_status);
    780     if(fichier==NULL){
    781       char tmp[1024];
    782       sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %lld.",
    783               dataSource,file_status.st_size);
    784       setMapInMaps(conf,"lenv","message",tmp);
    785       return NULL;
    786     }
    787     char *res1=(char *)malloc(file_status.st_size*sizeof(char));
    788     VSIFReadL(res1,1,file_status.st_size*sizeof(char),fichier);
    789     res1[file_status.st_size-1]=0;
    790     VSIFCloseL(fichier);
    791     VSIUnlink(dataSource);
    792     return res1;
    793 }
    794 
    795 
     763
     764
  • trunk/zoo-project/zoo-kernel/server_internal.h

    r642 r649  
    4949  char* addDefaultValues(maps**,elements*,maps*,int,map**);
    5050  char* getEncoding(maps*);
    51   char *readVSIFile(maps*,const char*);
    5251  void parseIdentifier(maps*,char*,char*,char*);
    5352  void dumpMapsValuesToFiles(maps**,maps**);
  • trunk/zoo-project/zoo-kernel/service_internal.c

    r640 r649  
    2525#include "fcgi_stdio.h"
    2626#include "service_internal.h"
     27#ifdef USE_MS
     28#include "service_internal_ms.h"
     29#else
     30#include "cpl_vsi.h"
     31#endif
    2732
    2833#ifndef TRUE
     
    606611
    607612/**
     613 * Read a file using the GDAL VSI API
     614 *
     615 * @param conf the maps containing the settings of the main.cfg file
     616 * @param dataSource the datasource name to read
     617 * @warning make sure to free ressources returned by this function
     618 */
     619char *readVSIFile(maps* conf,const char* dataSource){
     620    VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
     621    VSIStatBufL file_status;
     622    VSIStatL(dataSource, &file_status);
     623    if(fichier==NULL){
     624      char tmp[1024];
     625      sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %lld.",
     626              dataSource,file_status.st_size);
     627      setMapInMaps(conf,"lenv","message",tmp);
     628      return NULL;
     629    }
     630    char *res1=(char *)malloc(file_status.st_size*sizeof(char));
     631    VSIFReadL(res1,1,file_status.st_size*sizeof(char),fichier);
     632    res1[file_status.st_size-1]=0;
     633    VSIFCloseL(fichier);
     634    VSIUnlink(dataSource);
     635    return res1;
     636}
     637
     638/**
    608639 * Set an output value
    609640 *
  • trunk/zoo-project/zoo-kernel/service_internal.h

    r640 r649  
    9494#endif
    9595
     96  char *readVSIFile(maps*,const char*);
    9697  int  setOutputValue( maps*, const char*, char*, size_t);
    9798  char* getInputValue( maps*,const char*,size_t*);
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png