fix getpointv

fit-uifs · Nov 4, 2014 · 1664294 · 1664294
1 parent 34fcbc1
commit 1664294
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/include/backends/vtapi_resultset.h b/include/backends/vtapi_resultset.h
@@ -571,7 +571,10 @@ class PGResultSet : public ResultSet {
     vector<float>* getFloatV(const int col);
     time_t getTimestamp(const int col);
     int getIntOid(const int col);
+    #if HAVE_POSTGRESQL
     PGpoint getPoint(const int col);
+    vector<PGpoint>*  getPointV(const int col);
+    #endif
 
     pair< TKeys*,vector<int>* > getKeysWidths(const int row = -1, bool get_widths = 1, const int arrayLimit = 0);
 
@@ -615,7 +618,10 @@ class SLResultSet : public ResultSet {
     vector<float>* getFloatV(const int col);
     time_t getTimestamp(const int col);
     int getIntOid(const int col);
+    #if HAVE_POSTGRESQL
     PGpoint getPoint(const int col);
+    vector<PGpoint>*  getPointV(const int col);
+    #endif
 
     pair< TKeys*,vector<int>* > getKeysWidths(const int row = -1, bool get_widths = 1, const int arrayLimit = 0);
 

diff --git a/src/backend_pg.cpp b/src/backend_pg.cpp
@@ -1179,8 +1179,7 @@ vector<float>* PGResultSet::getFloatV(const int col) {
 #ifdef HAVE_POSTGRESQL
 PGpoint PGResultSet::getPoint(const int col) {
     PGresult *pgres = (PGresult *) this->res;
-    PGpoint point;
-    memset(&point, 0, sizeof(PGpoint));
+    PGpoint point = {0.0, 0.0};
     if (! CALL_PQT(fmap, PQgetf, pgres, this->pos, "%point", col, &point)) {
         logger->warning(314, "Value is not a point", thisClass+"::getPoint()");
     }

diff --git a/src/backend_sl.cpp b/src/backend_sl.cpp
@@ -744,8 +744,8 @@ vector<float>* SLResultSet::getFloatV(const int col) {
     // =============== GETTERS - GEOMETRIC TYPES ===============================
 #ifdef HAVE_POSTGRESQL
 PGpoint SLResultSet::getPoint(const int col) {
-    PGpoint point;
-    memset(&point, 0, sizeof(PGpoint));
+    PGpoint point = { 0.0, 0.0 };
+//    memset(&point, 0, sizeof(PGpoint));
 //    if (! PQgetf(select->res, this->pos, "%point", col, &point)) {
 //        logger->warning(314, "Value is not a point");
 //    }