[GRASS-SVN] r54011 - grass/trunk/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-24 05:18:35 -0800 (Sat, 24 Nov 2012)
New Revision: 54011

Modified:
   grass/trunk/lib/vector/Vlib/write_pg.c
Log:
vlib/PostGIS Topology: insert topological element with defined id (=line)


Modified: grass/trunk/lib/vector/Vlib/write_pg.c
===================================================================
--- grass/trunk/lib/vector/Vlib/write_pg.c	2012-11-24 12:40:22 UTC (rev 54010)
+++ grass/trunk/lib/vector/Vlib/write_pg.c	2012-11-24 13:18:35 UTC (rev 54011)
@@ -55,7 +55,7 @@
                          const struct P_line *,
                          int, const struct field_info *);
 static char *build_insert_stmt(const struct Format_info_pg *, const char *,
-                               int, const struct field_info *);
+                               int, int, const struct field_info *);
 static char *build_topo_stmt(struct Map_info *, int,
                              const struct P_line *, const char *);
 static int execute_topo(PGconn *, const char *);
@@ -834,6 +834,7 @@
                   const struct P_line *Line,
                   int cat, const struct field_info *Fi)
 {
+    int fid;
     int byte_order, nbytes, nsize;
     unsigned int sf_type;
     unsigned char *wkb_data;
@@ -932,7 +933,12 @@
     /* build INSERT statement
        simple feature geometry + attributes
     */
-    stmt = build_insert_stmt(pg_info, text_data, cat, Fi);
+    fid = -1;
+    if (pg_info->toposchema_name) {
+        /* use defined fid (=line) for topological access */
+        fid = Vect_get_num_primitives(Map, type); /* write next fid */
+    }
+    stmt = build_insert_stmt(pg_info, text_data, fid, cat, Fi);
     G_debug(2, "SQL: %s", stmt);
 
     if (!pg_info->inTransaction) {
@@ -981,13 +987,14 @@
    
    \param pg_info pointer to Format_info_pg structure
    \param geom_data geometry data
+   \param fid feature id (=line)
    \param cat category number (or -1 for no category)
    \param Fi pointer to field_info structure (NULL for no attributes)
 
    \return allocated string with INSERT statement
  */
 char *build_insert_stmt(const struct Format_info_pg *pg_info,
-                        const char *geom_data,
+                        const char *geom_data, int fid,
                         int cat, const struct field_info *Fi)
 {
     char *stmt, buf[DB_SQL_MAX];
@@ -1106,13 +1113,14 @@
                 else {
                     /* PostGIS topology access, write geometry in
                      * topology schema, skip geometry at this point */
-                    G_asprintf(&stmt, "%s) VALUES (%s)",
-                               buf, buf_val);
+                    G_asprintf(&stmt, "%s,%s) VALUES (%s,%d)",
+                               buf, pg_info->fid_column, buf_val, fid);
                 }
             }
         }
     }
     else {
+        /* no attributes */
         if (!pg_info->toposchema_name) {
             /* no attributes (simple features access) */
             G_asprintf(&stmt, "INSERT INTO \"%s\".\"%s\" (%s) VALUES "
@@ -1122,9 +1130,9 @@
         }
         else if (cat > 0)
             /* no attributes (topology elements) */
-            G_asprintf(&stmt, "INSERT INTO \"%s\".\"%s\" (%s) VALUES (NULL)",
+            G_asprintf(&stmt, "INSERT INTO \"%s\".\"%s\" (%s) VALUES (%d)",
                        pg_info->schema_name, pg_info->table_name,
-                       pg_info->geom_column); 
+                       pg_info->fid_column, fid); 
     }
     
     return stmt;