Changeset 736


Ignore:
Timestamp:
Jul 10, 2015, 2:39:24 PM (4 years ago)
Author:
djay
Message:

Merge trunk in branch-1.5 and created tag for the 1.5.0 release

Location:
branches/branch-1.5
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.5

  • branches/branch-1.5/docs/contribute/release.rst

    r725 r736  
    7777    cd zoo-project/zoo-kernel
    7878    autoconf
     79    # In case you did not build ZOO-Kernel
    7980    cd ../../..
     81    # In case you built ZOO-Kernel, then remove the generated file from the archive
     82    make clean
     83    rm -f  {Makefile,ZOOMakefile.opts}
     84    cd ../../..
     85    # In case you built one or more ZOO-Services, then remove the generated file from the archive
     86    rm $(find ./zoo-project-$VERSION/zoo-project/zoo-services -name "*zo")
    8087    # Remove documentation from the archive
    81     rm -rf ./zoo-project-$VERSION/docs
     88    rm -rf ./zoo-project-$VERSION/{docs,workshop}
    8289    tar -cvjf ./zoo-project-$VERSION.tar.bz2 ./zoo-project-$VERSION
    8390    zip -r ./zoo-project-$VERSION.zip ./zoo-project-$VERSION
  • branches/branch-1.5/zoo-project/zoo-kernel/Makefile.in

    r673 r736  
    4040
    4141sqlapi.o: sqlapi.c sqlapi.h
    42         g++ -fPIC ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
     42        g++ -fPIC ${GDAL_CFLAGS} ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
    4343
    4444caching.o: caching.c
     
    112112         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
    113113        install -d ${DESTDIR}${INST_INCLUDE}/zoo
    114         install service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
     114        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
    115115
    116116clean:
  • branches/branch-1.5/zoo-project/zoo-kernel/sqlapi.c

    r654 r736  
    183183    sprintf(sqlQuery,"INSERT INTO %s.files (uuid,filename,nature,name) VALUES ('%s','%s','%s',NULL);",schema->value,uusid->value,filename,type);
    184184  execSql(conf,sqlQuery);
     185  free(sqlQuery);
    185186  cleanUpResultSet(conf);
    186187}
     
    206207          uusid->value,sid->value,osid->value);
    207208  execSql(conf,sqlQuery);
     209  free(sqlQuery);
    208210  cleanUpResultSet(conf);
    209211}
     
    229231  sprintf(sqlQuery,"INSERT INTO %s.responses (content,uuid) VALUES ($$%s$$,$$%s$$);",schema->value,tmps,sid->value);
    230232  execSql(conf,sqlQuery);
     233  free(sqlQuery);
     234  free(tmps);
    231235  cleanUpResultSet(conf);
    232236}
     
    250254  execSql(conf,sqlQuery);
    251255  cleanUpResultSet(conf);
     256  free(sqlQuery);
    252257  return 0;
    253258}
     
    280285  }
    281286  cleanUpResultSet(conf);
     287  free(sqlQuery);
    282288  return (char*)tmp1;
    283289}
     
    316322    tmp1=NULL;
    317323  cleanUpResultSet(conf);
     324  free(sqlQuery);
    318325  return (char*)tmp1;
    319326}
     
    338345  cleanUpResultSet(conf);
    339346  close_sql(conf);
     347  free(sqlQuery);
    340348  end_sql();
    341349}
     
    363371  cleanUpResultSet(conf);
    364372  close_sql(conf);
     373  free(sqlQuery);
    365374  end_sql();
    366375}
     
    397406  if(hasRes<0)
    398407    tmp1=NULL;
     408  free(sqlQuery);
    399409  return (char*)tmp1;
    400410}
     
    429439  if(hasRes<0)
    430440    addToMap(statusInfo,"Status","Failed");
     441  free(sqlQuery);
    431442  return;
    432443}
     
    460471  }
    461472  cleanUpResultSet(conf);
     473  free(sqlQuery);
    462474  return res;
    463475}
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