Changeset 921
- Timestamp:
- May 27, 2019, 3:03:29 PM (6 years ago)
- Location:
- trunk/zoo-project/zoo-kernel
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/caching.c
r917 r921 759 759 760 760 char ltmp1[256]; 761 sprintf(ltmp1,"%l d",fsize);761 sprintf(ltmp1,"%lld",fsize); 762 762 addToMap(*content,"size",ltmp1); 763 763 if(cached==NULL){ -
trunk/zoo-project/zoo-kernel/mimetypes.h
r917 r921 839 839 840 840 static int isGeographic(const char* mimeType){ 841 c har* imageMimeType[4]={841 const char* imageMimeType[4]={ 842 842 "image/tiff", 843 843 "image/png", … … 845 845 "application/vnd.google-earth.kmz" 846 846 }; 847 c har* vectorMimeType[5]={847 const char* vectorMimeType[5]={ 848 848 "text/xml", 849 849 "application/json", -
trunk/zoo-project/zoo-kernel/response_print.c
r917 r921 24 24 25 25 #include "service.h" 26 #include "service_internal.h" 27 #include "server_internal.h" 26 28 #include "response_print.h" 27 #include "request_parser.h"28 #include "server_internal.h"29 #include "service_internal.h"30 29 #ifdef USE_MS 31 30 #include "service_internal_ms.h" … … 35 34 #ifdef USE_CALLBACK 36 35 #include "service_callback.h" 37 #endif38 39 #ifndef TRUE40 #define TRUE 141 #endif42 #ifndef FALSE43 #define FALSE -144 36 #endif 45 37 -
trunk/zoo-project/zoo-kernel/response_print.h
r917 r921 64 64 #include <sys/stat.h> 65 65 #include <sys/types.h> 66 //#include "cgic.h" 66 67 #ifndef WIN32 67 68 #include <sys/ipc.h> … … 83 84 #include <locale.h> // knut: this appears to be a non-standard header file that has been removed in newer versions of glibc; it may be sufficient to include <locale.h> (see above) 84 85 #endif 85 #include "ulinet.h"86 86 87 87 #include "service.h" … … 96 96 #include <libxml/xpath.h> 97 97 98 #include "cgic.h"99 100 98 #ifdef __cplusplus 101 99 extern "C" { … … 173 171 * Definitions of root node for response depending on the request and the WPS version 174 172 */ 175 static const char root_nodes[2][4][20]={173 static const char* root_nodes[2][4]={ 176 174 {"ProcessOfferings","ProcessDescriptions","ExecuteResponse",NULL}, 177 175 {"Contents","ProcessOfferings","Result",NULL} -
trunk/zoo-project/zoo-kernel/server_internal.c
r917 r921 738 738 * content map. 739 739 */ 740 c har* keys[4]={740 const char* keys[4]={ 741 741 "minOccurs", 742 742 "maxOccurs", -
trunk/zoo-project/zoo-kernel/server_internal.h
r789 r921 29 29 #ifndef IMPORTSERVICE 30 30 #define IMPORTSERVICE "include" // default name of [include] block in main.cfg 31 #endif32 31 33 #include "ulinet.h"34 32 #include "service.h" 35 33 #include <openssl/sha.h> … … 79 77 } 80 78 #endif 79 80 #endif -
trunk/zoo-project/zoo-kernel/service_internal.c
r917 r921 874 874 VSILFILE * fichier=VSIFOpenL(dataSource,"rb"); 875 875 VSIStatBufL file_status; 876 VSIStatL(dataSource, &file_status);877 if(fichier==NULL ){876 int res=VSIStatL(dataSource, &file_status); 877 if(fichier==NULL || res<0){ 878 878 char tmp[1024]; 879 sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %l ld.",879 sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %ld.", 880 880 dataSource,file_status.st_size); 881 881 setMapInMaps(conf,"lenv","message",tmp); -
trunk/zoo-project/zoo-kernel/service_internal_ms.c
r917 r921 860 860 char extent[1024]; 861 861 memset(&extent,0,1024); 862 sprintf(extent,"% d,%d,%d,%d",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);862 sprintf(extent,"%f,%f,%f,%f",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY); 863 863 setMapArray(output->content,"boundingbox",imyIndex,extent); 864 864 } … … 1090 1090 char extent[1024]; 1091 1091 memset(&extent,0,1024); 1092 sprintf(extent,"% d,%d,%d,%d",minX,minY,maxX,maxY);1092 sprintf(extent,"%f,%f,%f,%f",minX,minY,maxX,maxY); 1093 1093 setMapArray(output->content,"boundingbox",imyIndex,extent); 1094 1094 } -
trunk/zoo-project/zoo-kernel/service_internal_ms.h
r917 r921 26 26 27 27 #include <sys/stat.h> 28 #include "service_internal.h"29 28 #include "service.h" 30 29 #include "cpl_conv.h" … … 33 32 #include "gdal.h" 34 33 #include "ogr_srs_api.h" 35 #include "ulinet.h"36 34 #ifdef WIN32 37 35 #include <unistd.h> -
trunk/zoo-project/zoo-kernel/service_internal_python.c
r917 r921 151 151 152 152 #ifdef WIN32 153 c har* os_pathsep = ";";153 const char* os_pathsep = ";"; 154 154 #else 155 c har* os_pathsep = ":";155 const char* os_pathsep = ":"; 156 156 #endif 157 157 -
trunk/zoo-project/zoo-kernel/sqlapi.c
r917 r921 58 58 * @return the OGR connection string 59 59 */ 60 c har* _createInitString(maps* conf,const char* key){60 const char* _createInitString(maps* conf,const char* key){ 61 61 char* res=NULL; 62 62 char keywords[6][14]={ -
trunk/zoo-project/zoo-kernel/sqlapi.h
r917 r921 53 53 54 54 #ifdef META_DB 55 ZOO_DLL_EXPORT c har* _createInitString(maps*,const char*);55 ZOO_DLL_EXPORT const char* _createInitString(maps*,const char*); 56 56 ZOO_DLL_EXPORT int _init_sql(maps*,const char*); 57 57 ZOO_DLL_EXPORT OGRLayer *fetchSql(maps*,int,const char*); -
trunk/zoo-project/zoo-kernel/ulinet.h
r917 r921 24 24 25 25 #ifndef _ULINET_H 26 #define _ULINET_H 26 #define _ULINET_H 1 27 27 28 #include "fcgi_stdio.h" 28 29 #include <stdlib.h> 29 30 #include <fcntl.h> -
trunk/zoo-project/zoo-kernel/zoo_service_loader.c
r917 r921 45 45 #endif 46 46 47 #ifdef USE_PYTHON 48 #include "service_internal_python.h" 49 #endif 50 47 51 #include "cgic.h" 48 52 … … 72 76 #ifdef META_DB 73 77 #include "meta_sql.h" 74 #endif75 76 #ifdef USE_PYTHON77 #include "service_internal_python.h"78 78 #endif 79 79
Note: See TracChangeset
for help on using the changeset viewer.