[Greater-commits] r395 - trunk/GREAT-ER-DB/impl/postgresql

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-07-11 11:32:40 +0200 (Mon, 11 Jul 2011)
New Revision: 395

Modified:
   trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc
Log:
Always set filesize when a bin_obj is returned
Before it was only set if the file itself was requested


Modified: trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc
===================================================================
--- trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc	2011-07-11 09:04:17 UTC (rev 394)
+++ trunk/GREAT-ER-DB/impl/postgresql/gdagreater_pg.pgc	2011-07-11 09:32:40 UTC (rev 395)
@@ -9187,20 +9187,14 @@
                    v_root_lst_ptr = v_new_elem_ptr;
                  else
                    v_last_elem_ptr->next_element = v_new_elem_ptr;
-    
+
                  /* copy result record into allocated list element */
                  *v_new_elem_ptr = v_bin_obj_buf;
 
                  /* pass pointer + size to/of allocated memory for loaded BLOB */
                  v_new_elem_ptr->file_obj   = v_file_obj_ptr;
-                 if (vp_get_file_obj == DA_YES)
-                 {
-                   v_new_elem_ptr->file_size  = v_bin_obj_buf.file_size;
-                 }
-                 else {
-                     v_new_elem_ptr->file_size = 0;
-                 }
-  
+                 v_new_elem_ptr->file_size  = v_bin_obj_buf.file_size;
+
                  /* reset pointer to next list element */
                  v_new_elem_ptr->next_element = NULL;