Changeset 03ff056 in tol

Timestamp:

Sep 23, 2016, 12:04:03 PM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

6cd7a48

Parents:

4644707

Message:

Refs #1077, #708
Se incorpora el tipo date al driver nativo de postgres.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7321 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/dbdrivers/libtolpgsql.c (modified) (1 diff)

tol/dbdrivers/libtolpgsql.c

@@ -381 +381 @@
     
     switch(oid)
+    {
+      case 1114: // timestamp  
+      //no: case 1184: // timestamptz
+          {
+            tmp=(char*)malloc(5*sizeof(char));
+            auxTmp=PQgetvalue(dbd->result, dbd->current_tuple, nfield);
+            tmp=strncpy(tmp, auxTmp,4);
+            tmp[4]='\0';
+            (*dateval)->year = (unsigned short)atoi(tmp);
+            auxTmp = auxTmp+(5*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp,2);
+            tmp[2]='\0';
+            (*dateval)->month = (unsigned short)atoi(tmp);
+            auxTmp=auxTmp+(3*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp, 2);
+            (*dateval)->day = (unsigned short)atoi(tmp);
+            auxTmp=auxTmp+(3*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp, 2);
+            (*dateval)->hour = (unsigned short)atoi(tmp);
+            auxTmp=auxTmp+(3*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp, 2);
+            (*dateval)->minute = (unsigned short)atoi(tmp);
+            auxTmp=auxTmp+(3*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp, 2);
+            (*dateval)->second = (unsigned short)atoi(tmp);
+            (*dateval)->msecond = 0;
+            free(tmp);
+            return 1;     
+          }
+      case 1082: // date
       {
-      case 1114: // timestamp, timestamptz
-        {
-          tmp=(char*)malloc(5*sizeof(char));
-          auxTmp=PQgetvalue(dbd->result, dbd->current_tuple, nfield);
-          tmp=strncpy(tmp, auxTmp,4);
-          tmp[4]='\0';
-          (*dateval)->year = (unsigned short)atoi(tmp);
-          auxTmp = auxTmp+(5*sizeof(char));
-          tmp=(char *)strncpy(tmp, auxTmp,2);
-          tmp[2]='\0';
-          (*dateval)->month = (unsigned short)atoi(tmp);
-          auxTmp=auxTmp+(3*sizeof(char));
-          tmp=(char *)strncpy(tmp, auxTmp, 2);
-          (*dateval)->day = (unsigned short)atoi(tmp);
-          auxTmp=auxTmp+(3*sizeof(char));
-          tmp=(char *)strncpy(tmp, auxTmp, 2);
-          (*dateval)->hour = (unsigned short)atoi(tmp);
-          auxTmp=auxTmp+(3*sizeof(char));
-          tmp=(char *)strncpy(tmp, auxTmp, 2);
-          (*dateval)->minute = (unsigned short)atoi(tmp);
-          auxTmp=auxTmp+(3*sizeof(char));
-          tmp=(char *)strncpy(tmp, auxTmp, 2);
-          (*dateval)->second = (unsigned short)atoi(tmp);
-          (*dateval)->msecond = 0;
-          free(tmp);
-          return 1;       
-        }
-      }
+            tmp=(char*)malloc(5*sizeof(char));
+            auxTmp=PQgetvalue(dbd->result, dbd->current_tuple, nfield);
+            tmp=strncpy(tmp, auxTmp,4);
+            tmp[4]='\0';
+            (*dateval)->year = (unsigned short)atoi(tmp);
+            auxTmp = auxTmp+(5*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp,2);
+            tmp[2]='\0';
+            (*dateval)->month = (unsigned short)atoi(tmp);
+            auxTmp=auxTmp+(3*sizeof(char));
+            tmp=(char *)strncpy(tmp, auxTmp, 2);
+            (*dateval)->day = (unsigned short)atoi(tmp);
+            (*dateval)->hour = 0;
+            (*dateval)->minute = 0;
+            (*dateval)->second = 0;
+            (*dateval)->msecond = 0;
+            free(tmp);
+            return 1;     
+          }
+    }
   }