Ignore:
Timestamp:
Jul 16, 2011, 12:58:47 PM (13 years ago)
Author:
djay
Message:

Merge branch-1.2 to current rev. 267. Tag release-1.2.0-rc2.

Location:
branches/branch-1.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.2

  • branches/branch-1.2/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg

    r48 r268  
    88 serviceProvider = ogr2ogr_service.zo
    99 <MetaData>
    10    Title = My Demo
     10   title = My Demo
    1111 </MetaData>
    1212 <DataInputs>
  • branches/branch-1.2/zoo-services/ogr/ogr2ogr/service.c

    r49 r268  
    9595    const char  *pszSQLStatement = NULL;
    9696    int         eGType = -2;
    97     double       dfMaxSegmentLength = 0;
     97    double      dfMaxSegmentLength = 0;
    9898
    9999    /* Check strict compilation and runtime library version as we use C++ API */
     
    178178    }
    179179
    180     tmpMap=NULL;
    181     tmpMap=getMapFromMaps(inputs,"overwrite","value");
    182     if(tmpMap!=NULL){
    183           bOverwrite = TRUE;
    184     }
    185 
     180    /* if exist, overwrite the data with the same name */
     181    bOverwrite = TRUE;
     182   
    186183    tmpMap=NULL;
    187184    tmpMap=getMapFromMaps(inputs,"update","value");
     
    826823   
    827824#ifdef ZOO_SERVICE
    828         outputs=(maps*)malloc(sizeof(maps*));
    829     outputs->name="GeneratedFile";
    830825    outputs->content=createMap("value",(char*)pszwebDestData);
    831     addMapToMap(&outputs->content,createMap("dataType","string"));
    832     outputs->next=NULL;
    833826    return SERVICE_SUCCEEDED;
    834827#else
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