Changeset 478


Ignore:
Timestamp:
May 27, 2014, 4:05:49 PM (5 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:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/service_internal.c

    r476 r478  
    2626#ifdef USE_MS
    2727#include "service_internal_ms.h"
     28#else
     29#include "cpl_vsi.h"
    2830#endif
    2931
     
    165167    i++;
    166168  }
     169#ifdef DEBUG
    167170  fprintf(stderr,"READING STRING S %s\n",lpszBuf);
     171#endif
    168172  return (char*)lpszBuf;
    169173}
     
    29402944  tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));
    29412945  if(tmpMap->value==NULL)
    2942     fprintf(stderr,"Unable to allocate memory!\n");
     2946    return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
    29432947  //snprintf(tmpMap->value,(fsize+1)*sizeof(char),fcontent);
    29442948  memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
     
    29712975}
    29722976
    2973 #ifdef USE_MS
    29742977char *readVSIFile(maps* conf,const char* dataSource){
    29752978    VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
     
    29892992    return res1;
    29902993}
    2991 #endif
    29922994
    29932995void parseIdentifier(maps* conf,char* conf_dir,char *identifier,char* buffer){
  • trunk/zoo-project/zoo-kernel/service_internal.h

    r476 r478  
    3131#define TIME_SIZE 40
    3232
    33 #include "cgic.h"
    3433#include <libintl.h>
    3534#include <locale.h>
     
    3938#include <sys/stat.h>
    4039#include <sys/types.h>
     40#include "cgic.h"
    4141#ifndef WIN32
    4242#include <sys/ipc.h>
     
    145145  int loadRemoteFile(maps**,map**,HINTERNET,char*);
    146146
    147 #ifdef USE_MS
    148147  char *readVSIFile(maps*,const char*);
    149 #endif
    150148  void parseIdentifier(maps*,char*,char*,char*);
    151149  int updateStatus( maps*,const int,const char*);
  • trunk/zoo-project/zoo-kernel/service_internal_python.c

    r474 r478  
    285285    PyErr_Clear();
    286286    res=-1;
    287     //exit(-1);
    288287  }
    289288#if PY_MAJOR_VERSION < 3
    290289  PyGILState_Release(gstate);
    291   PyEval_ReleaseLock();
     290  PyEval_AcquireLock();
    292291#endif
    293292  PyThreadState_Swap(mainstate);
  • trunk/zoo-project/zoo-kernel/ulinet.c

    r471 r478  
    229229      sprintf(filename,"/tmp/ZOO_Cache%d",(int)time(NULL));
    230230      filename[24]=0;
    231       fprintf(stderr,"file=%s",filename);
    232231#ifdef MSG_LAF_VERBOSE
    233232      fprintf(stderr,"file=%s",filename);
     
    267266#ifdef ULINET_DEBUG
    268267  fprintf(stderr,"DEBUG MIMETYPE: %s\n",hInternet.mimeType);
     268  fflush(stderr);
    269269#endif
    270270  return hInternet;
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r473 r478  
    297297
    298298void donothing(int sig){
     299#ifdef DEBUG
    299300  fprintf(stderr,"Signal %d after the ZOO-Kernel returned result !\n",sig);
     301#endif
    300302  exit(0);
    301303}
     
    376378    DWORD errstr;
    377379    errstr = GetLastError();
    378     fprintf(stderr,"%s loaded (%d) \n",tmps1,errstr);
    379380#else
    380381    char *errstr;
    381382    errstr = dlerror();
     383#endif
     384#ifdef DEBUG
     385    fprintf(stderr,"%s loaded (%d) \n",tmps1,errstr);
    382386#endif
    383387    if( so != NULL ) {
     
    461465          errorException(m, tmpMsg, "InternalError",NULL);
    462466          free(tmpMsg);
     467#ifdef DEBUG
    463468          fprintf(stderr,"Function %s error %s\n",r_inputs->value,errstr);
     469#endif
    464470          return;
    465471        }
  • trunk/zoo-project/zoo-services/utils/status/makefile.vc

    r384 r478  
    22!INCLUDE $(ZOOK_DIR)/nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/dirent.obj $(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
     4FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    55!IFDEF JS_DIR
    66FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
  • trunk/zoo-project/zoo-services/utils/status/service.c

    r471 r478  
    104104       */
    105105      char *tmpStr=getStatus(atoi(tmpMap->value));
     106#ifdef DEBUG
    106107      fprintf(stderr,"DEBUG: %s \n",tmpStr);
     108#endif
    107109      if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){
    108110        char *tmpStr1=strdup(tmpStr);
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