Ignore:
Timestamp:
May 7, 2019, 2:17:08 PM (3 years ago)
Author:
djay
Message:

Merge prototype-v0 branch in trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/zoo-project/zoo-kernel/sqlapi.h

    r784 r917  
    2525#ifndef ZOO_SQLAPI_H
    2626#define ZOO_SQLAPI_H 1
    27 #ifdef RELY_ON_DB
     27
     28#ifdef META_DB
     29#include "ogrsf_frmts.h"
     30#include "ogr_p.h"
     31#if GDAL_VERSION_MAJOR >= 2
     32#include <gdal_priv.h>
     33#endif
     34#endif
     35
    2836#include "service.h"
    2937#include "service_internal.h"
     38
     39#ifdef META_DB
     40extern "C"
     41#if GDAL_VERSION_MAJOR >=2
     42  GDALDataset
     43#else
     44  OGRDataSource
     45#endif
     46  **zoo_DS;
     47#endif
    3048
    3149#ifdef __cplusplus
    3250extern "C" {
    3351#endif
    34   ZOO_DLL_EXPORT void init_sql(maps*);
    35   ZOO_DLL_EXPORT void close_sql(maps*);
    36   ZOO_DLL_EXPORT int execSql(maps*,const char*);
     52
     53 
     54#ifdef META_DB
     55  ZOO_DLL_EXPORT char* _createInitString(maps*,const char*);
     56  ZOO_DLL_EXPORT int _init_sql(maps*,const char*);
     57  ZOO_DLL_EXPORT OGRLayer *fetchSql(maps*,int,const char*);
     58  ZOO_DLL_EXPORT void cleanFetchSql(maps*,int,OGRLayer*);
     59#endif
     60#ifdef RELY_ON_DB
     61  ZOO_DLL_EXPORT int init_sql(maps*);
     62  ZOO_DLL_EXPORT void close_sql(maps*,int);
     63  ZOO_DLL_EXPORT int execSql(maps*,int,const char*);
    3764  ZOO_DLL_EXPORT void recordStoredFile(maps*,const char*,const char*,const char*);
    3865  ZOO_DLL_EXPORT void recordServiceStatus(maps*);
     
    4269  ZOO_DLL_EXPORT char* getStatusId(maps*,char*);
    4370  ZOO_DLL_EXPORT void removeService(maps*,char*);
     71  ZOO_DLL_EXPORT void end_sql();
     72#endif
    4473
    4574#ifdef __cplusplus
     
    4877
    4978#endif
    50 #endif
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