vlib: remove Vect_get_finfo_geometry_column()

      add Vect_get_finfo()
      update v.info & untabify


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52568 15284696-431f-4ddb-bdfa-cd5b030d7da7

include/defs/vector.h

@@ -164,7 +164,7 @@ const char *Vect_get_finfo_dsn_name(const struct Map_info *);
 char *Vect_get_finfo_layer_name(const struct Map_info *);
 const char *Vect_get_finfo_format_info(const struct Map_info *);
 const char *Vect_get_finfo_geometry_type(const struct Map_info *);
-const char *Vect_get_finfo_geometry_column(const struct Map_info *);
+const struct Format_info *Vect_get_finfo(const struct Map_info *);
 int Vect_is_3d(const struct Map_info *);
 int Vect_set_organization(struct Map_info *, const char *);
 const char *Vect_get_organization(const struct Map_info *);

lib/vector/Vlib/header_finfo.c

@@ -1,7 +1,8 @@
 /*!
    \file lib/vector/Vlib/header_finfo.c
 
-   \brief Vector library - header manipulation (external formats)
+   \brief Vector library - header manipulation (relevant for external
+   formats)
 
    Higher level functions for reading/writing/manipulating vectors.
 
@@ -12,7 +13,7 @@
 
    \author Original author CERL, probably Dave Gerdes or Mike Higgins.
    \author Update to GRASS 5.7 Radim Blazek and David D. Gray.
-   \author Update to GRASS 7 (OGR support) by Martin Landa <landa.martin gmail.com>
+   \author Update to GRASS 7 (OGR/PostGIS support) by Martin Landa <landa.martin gmail.com>
 */
 
 #include <grass/vector.h>
@@ -57,7 +58,7 @@ const char *Vect_get_finfo_dsn_name(const struct Map_info *Map)
 
    Returns:
     - layer name for OGR format (GV_FORMAT_OGR and GV_FORMAT_OGR_DIRECT)
-    - table name for PostGIS format (GV_FORMAT_POSTGIS)
+    - table name for PostGIS format (GV_FORMAT_POSTGIS) including schema (<schema>.<table>)
 
    Note: allocated string should be freed by G_free()
 
@@ -96,12 +97,10 @@ char *Vect_get_finfo_layer_name(const struct Map_info *Map)
 /*!
   \brief Get format info (relevant only for non-native formats)
 
-   Returns:
-    - layer name for OGR format (GV_FORMAT_OGR and GV_FORMAT_OGR_DIRECT)
-    
   \param Map pointer to Map_info structure
   
-  \return string containing name of OGR format (allocated by G_store())
+  \return string containing name of OGR format
+  \return "PostgreSQL" for PostGIS format (GV_FORMAT_POSTGIS)
   \return NULL on error (or on missing OGR/PostgreSQL support)
 */
 const char *Vect_get_finfo_format_info(const struct Map_info *Map)
@@ -201,22 +200,19 @@ const char *Vect_get_finfo_geometry_type(const struct Map_info *Map)
 }
 
 /*!
-  \brief Get geometry column (relevant only for non-native DB formats)
-
-  \param Map pointer to Map_info structure
+  \brief Get header info for non-native formats
 
-  \return allocated string with geometry column name
-  \return NULL on error (map format is native)
+  Prints a warning for native format.
+  
+  \param Map pointer to Ma_info structure
+  
+  \return pointer to Format_info structure
 */
-const char *Vect_get_finfo_geometry_column(const struct Map_info *Map)
+const struct Format_info* Vect_get_finfo(const struct Map_info *Map)
 {
-    if (Map->format == GV_FORMAT_POSTGIS) {
-#ifndef HAVE_POSTGRES
-        G_warning(_("GRASS is not compiled with PostgreSQL support"));
-#else
-        return Map->fInfo.pg.geom_column;
-#endif
-    }
-
-    return NULL;
+    if (Map->format == GV_FORMAT_NATIVE)
+        G_warning(_("Native vector format detected for <%s>"),
+                  Vect_get_full_name(Map));
+    
+    return &(Map->fInfo);
 }

vector/v.info/print.c

@@ -9,10 +9,10 @@
 
 #define printline(x) fprintf (stdout, " | %-74.74s |\n", x)
 #define divider(x) \
-	fprintf (stdout, " %c", x); \
-	for (i = 0; i < 76; i++ ) \
-		fprintf ( stdout, "-" ); \
-	fprintf (stdout, "%c\n", x)
+        fprintf (stdout, " %c", x); \
+        for (i = 0; i < 76; i++ ) \
+                fprintf ( stdout, "-" ); \
+        fprintf (stdout, "%c\n", x)
 
 /* cloned from lib/gis/wind_format.c */
 void format_double(double value, char *buf)
@@ -27,7 +27,7 @@ void print_region(const struct Map_info *Map)
     
     struct bound_box box;
 
-    /*Print the spatial extent as double values*/
+    /* print the spatial extent as double values */
     Vect_get_map_box(Map, &box);
     G_format_northing(box.N, tmp1, -1);
     G_format_northing(box.S, tmp2, -1);
@@ -56,61 +56,61 @@ void print_topo(const struct Map_info *Map)
     nprimitives += Vect_get_num_primitives(Map, GV_CENTROID);
 
     if (with_z) {
-	nprimitives += Vect_get_num_primitives(Map, GV_FACE);
-	nprimitives += Vect_get_num_primitives(Map, GV_KERNEL);
+        nprimitives += Vect_get_num_primitives(Map, GV_FACE);
+        nprimitives += Vect_get_num_primitives(Map, GV_KERNEL);
     }
     
 
     fprintf(stdout, "nodes=%d\n",
-	    Vect_get_num_nodes(Map));
+            Vect_get_num_nodes(Map));
     fflush(stdout);
 
     fprintf(stdout, "points=%d\n",
-	    Vect_get_num_primitives(Map, GV_POINT));
+            Vect_get_num_primitives(Map, GV_POINT));
     fflush(stdout);
     
     fprintf(stdout, "lines=%d\n",
-	    Vect_get_num_primitives(Map, GV_LINE));
+            Vect_get_num_primitives(Map, GV_LINE));
     fflush(stdout);
     
     fprintf(stdout, "boundaries=%d\n",
-	    Vect_get_num_primitives(Map, GV_BOUNDARY));
+            Vect_get_num_primitives(Map, GV_BOUNDARY));
     fflush(stdout);
     
     fprintf(stdout, "centroids=%d\n",
-	    Vect_get_num_primitives(Map, GV_CENTROID));
+            Vect_get_num_primitives(Map, GV_CENTROID));
     fflush(stdout);
     
     fprintf(stdout, "areas=%d\n", Vect_get_num_areas(Map));
     fflush(stdout);
     
     fprintf(stdout, "islands=%d\n",
-	    Vect_get_num_islands(Map));
+            Vect_get_num_islands(Map));
     fflush(stdout);
     
     if (with_z) {
-	fprintf(stdout, "faces=%d\n",
-		Vect_get_num_primitives(Map, GV_FACE));
-	fflush(stdout);
-	
-	fprintf(stdout, "kernels=%d\n",
-		Vect_get_num_primitives(Map, GV_KERNEL));
-	fflush(stdout);
-	
-	fprintf(stdout, "volumes=%d\n",
-		Vect_get_num_primitives(Map, GV_VOLUME));
-	fflush(stdout);
-	
-	fprintf(stdout, "holes=%d\n",
-		Vect_get_num_holes(Map));
-	fflush(stdout);
+        fprintf(stdout, "faces=%d\n",
+                Vect_get_num_primitives(Map, GV_FACE));
+        fflush(stdout);
+        
+        fprintf(stdout, "kernels=%d\n",
+                Vect_get_num_primitives(Map, GV_KERNEL));
+        fflush(stdout);
+        
+        fprintf(stdout, "volumes=%d\n",
+                Vect_get_num_primitives(Map, GV_VOLUME));
+        fflush(stdout);
+        
+        fprintf(stdout, "holes=%d\n",
+                Vect_get_num_holes(Map));
+        fflush(stdout);
     }
 
     fprintf(stdout, "primitives=%ld\n", nprimitives);
     fflush(stdout);
 
     fprintf(stdout, "map3d=%d\n",
-	    Vect_is_3d(Map) ? 1 : 0);
+            Vect_is_3d(Map) ? 1 : 0);
     fflush(stdout);
 }
 
@@ -127,39 +127,39 @@ void print_columns(const struct Map_info *Map, const char *input_opt, const char
     num_dblinks = Vect_get_num_dblinks(Map);
 
     if (num_dblinks <= 0) {
-	G_fatal_error(_("Database connection for map <%s> is not defined in DB file"),
-		      input_opt);
+        G_fatal_error(_("Database connection for map <%s> is not defined in DB file"),
+                      input_opt);
     }
 
     G_message(_("Displaying column types/names for database connection of layer <%s>:"),
-	      field_opt);
+              field_opt);
 
     if ((fi = Vect_get_field2(Map, field_opt)) == NULL)
-	G_fatal_error(_("Database connection not defined for layer <%s>"),
-		      field_opt);
+        G_fatal_error(_("Database connection not defined for layer <%s>"),
+                      field_opt);
     driver = db_start_driver(fi->driver);
     if (driver == NULL)
-	G_fatal_error(_("Unable to open driver <%s>"),
-		      fi->driver);
+        G_fatal_error(_("Unable to open driver <%s>"),
+                      fi->driver);
     db_init_handle(&handle);
     db_set_handle(&handle, fi->database, NULL);
     if (db_open_database(driver, &handle) != DB_OK)
-	G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
-		      fi->database, fi->driver);
+        G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+                      fi->database, fi->driver);
     db_init_string(&table_name);
     db_set_string(&table_name, fi->table);
     if (db_describe_table(driver, &table_name, &table) != DB_OK)
-	G_fatal_error(_("Unable to describe table <%s>"),
-		      fi->table);
+        G_fatal_error(_("Unable to describe table <%s>"),
+                      fi->table);
     
     ncols = db_get_table_number_of_columns(table);
     for (col = 0; col < ncols; col++)
-	fprintf(stdout, "%s|%s\n",
-		db_sqltype_name(db_get_column_sqltype
-				(db_get_table_column
-				 (table, col))),
-		db_get_column_name(db_get_table_column
-				   (table, col)));
+        fprintf(stdout, "%s|%s\n",
+                db_sqltype_name(db_get_column_sqltype
+                                (db_get_table_column
+                                 (table, col))),
+                db_get_column_name(db_get_table_column
+                                   (table, col)));
     
     db_close_database(driver);
     db_shutdown_driver(driver);
@@ -172,7 +172,7 @@ void print_shell(const struct Map_info *Map)
     char timebuff[256];
     
     struct TimeStamp ts;
-	
+        
     time_ok = first_time_ok = second_time_ok = FALSE;
     
     /* Check the Timestamp */
@@ -180,88 +180,98 @@ void print_shell(const struct Map_info *Map)
     
     /* Check for valid entries, show none if no timestamp available */
     if (time_ok == TRUE) {
-	if (ts.count > 0)
-	    first_time_ok = TRUE;
-	if (ts.count > 1)
-	    second_time_ok = TRUE;
+        if (ts.count > 0)
+            first_time_ok = TRUE;
+        if (ts.count > 1)
+            second_time_ok = TRUE;
     }
 
     map_type = Vect_maptype(Map);
     
     fprintf(stdout, "name=%s\n",
-	    Vect_get_name(Map));
+            Vect_get_name(Map));
     fprintf(stdout, "mapset=%s\n",
-	    Vect_get_mapset(Map));
+            Vect_get_mapset(Map));
     fprintf(stdout, "location=%s\n",
-	    G_location());
+            G_location());
     fprintf(stdout, "database=%s\n",
-	    G_gisdbase());
+            G_gisdbase());
     fprintf(stdout, "title=%s\n",
-	    Vect_get_map_name(Map));
+            Vect_get_map_name(Map));
     fprintf(stdout, "scale=1:%d\n",
-	    Vect_get_scale(Map));
+            Vect_get_scale(Map));
     fprintf(stdout, "creator=%s\n",
-	    Vect_get_person(Map));
+            Vect_get_person(Map));
     fprintf(stdout, "organization=%s\n",
-	    Vect_get_organization(Map));
+            Vect_get_organization(Map));
     fprintf(stdout, "source_date=%s\n",
-	    Vect_get_map_date(Map));
+            Vect_get_map_date(Map));
     /* This shows the TimeStamp (if present) */
     if (time_ok  == TRUE && (first_time_ok || second_time_ok)) {
-	G_format_timestamp(&ts, timebuff);
-	fprintf(stdout, "timestamp=%s\n", timebuff);
+        G_format_timestamp(&ts, timebuff);
+        fprintf(stdout, "timestamp=%s\n", timebuff);
     }
     else {
-	fprintf(stdout, "timestamp=none\n");
+        fprintf(stdout, "timestamp=none\n");
     }
 
     if (map_type == GV_FORMAT_OGR ||
-	map_type == GV_FORMAT_OGR_DIRECT) {
-	fprintf(stdout, "format=%s,%s\n",
-		Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
-	fprintf(stdout, "ogr_layer=%s\n",
-		Vect_get_finfo_layer_name(Map));
-	fprintf(stdout, "ogr_dsn=%s\n",
-		Vect_get_finfo_dsn_name(Map));
-	fprintf(stdout, "feature_type=%s\n",
-		Vect_get_finfo_geometry_type(Map));
+        map_type == GV_FORMAT_OGR_DIRECT) {
+        fprintf(stdout, "format=%s,%s\n",
+                Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
+        fprintf(stdout, "ogr_layer=%s\n",
+                Vect_get_finfo_layer_name(Map));
+        fprintf(stdout, "ogr_dsn=%s\n",
+                Vect_get_finfo_dsn_name(Map));
+        fprintf(stdout, "feature_type=%s\n",
+                Vect_get_finfo_geometry_type(Map));
 
     }
     else if (map_type == GV_FORMAT_POSTGIS) {
-	fprintf(stdout, "format=%s,%s\n",
-		Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
-	fprintf(stdout, "pg_table=%s\n",
-		Vect_get_finfo_layer_name(Map));
-	fprintf(stdout, "pg_dbname=%s\n",
-		Vect_get_finfo_dsn_name(Map));
-	fprintf(stdout, "geometry_column=%s\n",
-		Vect_get_finfo_geometry_column(Map));
-	fprintf(stdout, "feature_type=%s\n",
-		Vect_get_finfo_geometry_type(Map));
+        const struct Format_info *finfo;
+        
+        finfo = Vect_get_finfo(Map);
+        
+        fprintf(stdout, "format=%s,%s\n",
+                Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
+        fprintf(stdout, "pg_table=%s\n",
+                Vect_get_finfo_layer_name(Map));
+        fprintf(stdout, "pg_dbname=%s\n",
+                Vect_get_finfo_dsn_name(Map));
+        fprintf(stdout, "geometry_column=%s\n",
+                finfo->pg.geom_column);
+        fprintf(stdout, "feature_type=%s\n",
+                Vect_get_finfo_geometry_type(Map));
+        if (finfo->pg.toposchema_name) {
+            fprintf(stdout, "pg_topo_schema=%s\n",
+                    finfo->pg.toposchema_name);
+            fprintf(stdout, "pg_topo_column=%s\n",
+                    finfo->pg.topogeom_column);
+        }
     }
     else {
-	fprintf(stdout, "format=%s\n",
-		Vect_maptype_info(Map));
+        fprintf(stdout, "format=%s\n",
+                Vect_maptype_info(Map));
     }
 
     fprintf(stdout, "level=%d\n", 
-	    Vect_level(Map));
+            Vect_level(Map));
     
     if (Vect_level(Map) > 0) {
-	fprintf(stdout, "num_dblinks=%d\n",
-		Vect_get_num_dblinks(Map));
+        fprintf(stdout, "num_dblinks=%d\n",
+                Vect_get_num_dblinks(Map));
     }
 
     fprintf(stdout, "projection=%s\n",
-	    Vect_get_proj_name(Map));
+            Vect_get_proj_name(Map));
     if (G_projection() == PROJECTION_UTM) {
-	fprintf(stdout, "zone=%d\n",
-		Vect_get_zone(Map));
+        fprintf(stdout, "zone=%d\n",
+                Vect_get_zone(Map));
     }
     fprintf(stdout, "digitization_threshold=%f\n",
-	    Vect_get_thresh(Map));
+            Vect_get_thresh(Map));
     fprintf(stdout, "comment=%s\n",
-	    Vect_get_comment(Map));
+            Vect_get_comment(Map));
 }
 
 void print_info(const struct Map_info *Map)
@@ -284,177 +294,193 @@ void print_info(const struct Map_info *Map)
 
     /* Check for valid entries, show none if no timestamp available */
     if (time_ok == TRUE) {
-	if (ts.count > 0)
-	    first_time_ok = TRUE;
-	if (ts.count > 1)
-	    second_time_ok = TRUE;
+        if (ts.count > 0)
+            first_time_ok = TRUE;
+        if (ts.count > 1)
+            second_time_ok = TRUE;
     }
 
     divider('+');
     sprintf(line, "%-17s%s", _("Name:"),
-	    Vect_get_name(Map));
+            Vect_get_name(Map));
     printline(line);
     sprintf(line, "%-17s%s", _("Mapset:"),
-	    Vect_get_mapset(Map));
+            Vect_get_mapset(Map));
     printline(line);
     
     sprintf(line, "%-17s%s", _("Location:"),
-	    G_location());
+            G_location());
     printline(line);
     sprintf(line, "%-17s%s", _("Database:"),
-	    G_gisdbase());
+            G_gisdbase());
     printline(line);
 
     sprintf(line, "%-17s%s", _("Title:"),
-	    Vect_get_map_name(Map));
+            Vect_get_map_name(Map));
     printline(line);
     sprintf(line, "%-17s1:%d", _("Map scale:"),
-	    Vect_get_scale(Map));
+            Vect_get_scale(Map));
     printline(line);
 
     sprintf(line, "%-17s%s", _("Name of creator:"),
-	    Vect_get_person(Map));
+            Vect_get_person(Map));
     printline(line);
     sprintf(line, "%-17s%s", _("Organization:"),
-	    Vect_get_organization(Map));
+            Vect_get_organization(Map));
     printline(line);
     sprintf(line, "%-17s%s", _("Source date:"),
-	    Vect_get_map_date(Map));
+            Vect_get_map_date(Map));
     printline(line);
 
     /* This shows the TimeStamp (if present) */
     if (time_ok  == TRUE && (first_time_ok || second_time_ok)) {
-	G_format_timestamp(&ts, timebuff);
-	sprintf(line, "%-17s%s", _("Timestamp (first layer): "), timebuff);
-	printline(line);
+        G_format_timestamp(&ts, timebuff);
+        sprintf(line, "%-17s%s", _("Timestamp (first layer): "), timebuff);
+        printline(line);
     }
     else {
-	strcpy(line, _("Timestamp (first layer): none"));
-	printline(line);
+        strcpy(line, _("Timestamp (first layer): none"));
+        printline(line);
     }
     
     divider('|');
     
     if (map_type == GV_FORMAT_OGR ||
-	map_type == GV_FORMAT_OGR_DIRECT) {
-	sprintf(line, "%-17s%s (%s)", _("Map format:"),
-		Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
-	printline(line);
-	
-	/* for OGR format print also datasource and layer */
-	sprintf(line, "%-17s%s", _("OGR layer:"),
-		Vect_get_finfo_layer_name(Map));
-	printline(line);
-	sprintf(line, "%-17s%s", _("OGR datasource:"),
-		Vect_get_finfo_dsn_name(Map));
-	printline(line);
-	sprintf(line, "%-17s%s", _("Feature type:"),
-		Vect_get_finfo_geometry_type(Map));
-	printline(line);
+        map_type == GV_FORMAT_OGR_DIRECT) {
+        sprintf(line, "%-17s%s (%s)", _("Map format:"),
+                Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
+        printline(line);
+        
+        /* for OGR format print also datasource and layer */
+        sprintf(line, "%-17s%s", _("OGR layer:"),
+                Vect_get_finfo_layer_name(Map));
+        printline(line);
+        sprintf(line, "%-17s%s", _("OGR datasource:"),
+                Vect_get_finfo_dsn_name(Map));
+        printline(line);
+        sprintf(line, "%-17s%s", _("Feature type:"),
+                Vect_get_finfo_geometry_type(Map));
+        printline(line);
     }
     else if (map_type == GV_FORMAT_POSTGIS) {
-	sprintf(line, "%-17s%s (%s)", _("Map format:"),
-		Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
-	printline(line);
-	
-	/* for PostGIS format print also datasource and layer */
-	sprintf(line, "%-17s%s", _("DB table:"),
-		Vect_get_finfo_layer_name(Map));
-	printline(line);
-	sprintf(line, "%-17s%s", _("DB name:"),
-		Vect_get_finfo_dsn_name(Map));
-	printline(line);
-	sprintf(line, "%-17s%s", _("Geometry column:"),
-		Vect_get_finfo_geometry_column(Map));
-	printline(line);
-
-	sprintf(line, "%-17s%s", _("Feature type:"),
-		Vect_get_finfo_geometry_type(Map));
-	printline(line);
+        const struct Format_info *finfo;
+
+        finfo = Vect_get_finfo(Map);
+        
+        sprintf(line, "%-17s%s (%s)", _("Map format:"),
+                Vect_maptype_info(Map), Vect_get_finfo_format_info(Map));
+        printline(line);
+        
+        /* for PostGIS format print also datasource and layer */
+        sprintf(line, "%-17s%s", _("DB table:"),
+                Vect_get_finfo_layer_name(Map));
+        printline(line);
+        sprintf(line, "%-17s%s", _("DB name:"),
+                Vect_get_finfo_dsn_name(Map));
+        printline(line);
+        sprintf(line, "%-17s%s", _("Geometry column:"),
+                finfo->pg.geom_column);
+        printline(line);
+
+        sprintf(line, "%-17s%s", _("Feature type:"),
+                Vect_get_finfo_geometry_type(Map));
+        printline(line);
+        if (finfo->pg.toposchema_name) {
+            sprintf(line, "%-17s%s (%s %s)", _("Topology:"), "PostGIS",
+                    _("schema:"), finfo->pg.toposchema_name);
+            printline(line);
+
+            sprintf(line, "%-17s%s", _("Topology column:"),
+                    finfo->pg.topogeom_column);
+        }
+        else
+            sprintf(line, "%-17s%s", _("Topology:"), "pseudo (simple features)");
+        
+        printline(line);
     }
     else {
-	sprintf(line, "%-17s%s", _("Map format:"),
-		Vect_maptype_info(Map));
-	printline(line);
+        sprintf(line, "%-17s%s", _("Map format:"),
+                Vect_maptype_info(Map));
+        printline(line);
     }
     
 
     divider('|');
     
     sprintf(line, "  %s: %s (%s: %i)",
-	    _("Type of map"), _("vector"), _("level"), Vect_level(Map));
+            _("Type of map"), _("vector"), _("level"), Vect_level(Map));
     printline(line);
     
     if (Vect_level(Map) > 0) {
-	printline("");
-	sprintf(line,
-		"  %-24s%-9d       %-22s%-9d",
-		_("Number of points:"), 
-		Vect_get_num_primitives(Map, GV_POINT),
-		_("Number of centroids:"),
-		Vect_get_num_primitives(Map, GV_CENTROID));
-	printline(line);
-	sprintf(line,
-		"  %-24s%-9d       %-22s%-9d",
-		_("Number of lines:"),
-		Vect_get_num_primitives(Map, GV_LINE),
-		_("Number of boundaries:"),
-		Vect_get_num_primitives(Map, GV_BOUNDARY));
-	printline(line);
-	sprintf(line,
-		"  %-24s%-9d       %-22s%-9d",
-		_("Number of areas:"),
-		Vect_get_num_areas(Map),
-		_("Number of islands:"),
-		Vect_get_num_islands(Map));
-	printline(line);
-	if (Vect_is_3d(Map)) {
-	    sprintf(line,
-		    "  %-24s%-9d       %-22s%-9d",
-		    _("Number of faces:"),
-		    Vect_get_num_primitives(Map, GV_FACE),
-		    _("Number of kernels:"),
-		    Vect_get_num_primitives(Map, GV_KERNEL));
-	    printline(line);
-	    sprintf(line,
-		    "  %-24s%-9d       %-22s%-9d",
-		    _("Number of volumes:"),
-		    Vect_get_num_volumes(Map),
-		    _("Number of holes:"),
-		    Vect_get_num_holes(Map));
-	    printline(line);
-	}
-	printline("");
-
-	sprintf(line, "  %-24s%s",
-		_("Map is 3D:"),
-		Vect_is_3d(Map) ? _("Yes") : _("No"));
-	printline(line);
-	sprintf(line, "  %-24s%-9d",
-		_("Number of dblinks:"),
-		Vect_get_num_dblinks(Map));
-	printline(line);
+        printline("");
+        sprintf(line,
+                "  %-24s%-9d       %-22s%-9d",
+                _("Number of points:"), 
+                Vect_get_num_primitives(Map, GV_POINT),
+                _("Number of centroids:"),
+                Vect_get_num_primitives(Map, GV_CENTROID));
+        printline(line);
+        sprintf(line,
+                "  %-24s%-9d       %-22s%-9d",
+                _("Number of lines:"),
+                Vect_get_num_primitives(Map, GV_LINE),
+                _("Number of boundaries:"),
+                Vect_get_num_primitives(Map, GV_BOUNDARY));
+        printline(line);
+        sprintf(line,
+                "  %-24s%-9d       %-22s%-9d",
+                _("Number of areas:"),
+                Vect_get_num_areas(Map),
+                _("Number of islands:"),
+                Vect_get_num_islands(Map));
+        printline(line);
+        if (Vect_is_3d(Map)) {
+            sprintf(line,
+                    "  %-24s%-9d       %-22s%-9d",
+                    _("Number of faces:"),
+                    Vect_get_num_primitives(Map, GV_FACE),
+                    _("Number of kernels:"),
+                    Vect_get_num_primitives(Map, GV_KERNEL));
+            printline(line);
+            sprintf(line,
+                    "  %-24s%-9d       %-22s%-9d",
+                    _("Number of volumes:"),
+                    Vect_get_num_volumes(Map),
+                    _("Number of holes:"),
+                    Vect_get_num_holes(Map));
+            printline(line);
+        }
+        printline("");
+
+        sprintf(line, "  %-24s%s",
+                _("Map is 3D:"),
+                Vect_is_3d(Map) ? _("Yes") : _("No"));
+        printline(line);
+        sprintf(line, "  %-24s%-9d",
+                _("Number of dblinks:"),
+                Vect_get_num_dblinks(Map));
+        printline(line);
     }
 
     printline("");
     /* this differs from r.info in that proj info IS taken from the map here, not the location settings */
     /* Vect_get_proj_name() and _zone() are typically unset?! */
     if (G_projection() == PROJECTION_UTM) {
-	utm_zone = Vect_get_zone(Map);
-	if (utm_zone < 0 || utm_zone > 60)
-	    strcpy(tmp1, _("invalid"));
-	else if (utm_zone == 0)
-	    strcpy(tmp1, _("unspecified"));
-	else
-	    sprintf(tmp1, "%d", utm_zone);
-
-	sprintf(line, "  %s: %s (%s %s)",
-		_("Projection"), Vect_get_proj_name(Map),
-		_("zone"), tmp1);
+        utm_zone = Vect_get_zone(Map);
+        if (utm_zone < 0 || utm_zone > 60)
+            strcpy(tmp1, _("invalid"));
+        else if (utm_zone == 0)
+            strcpy(tmp1, _("unspecified"));
+        else
+            sprintf(tmp1, "%d", utm_zone);
+
+        sprintf(line, "  %s: %s (%s %s)",
+                _("Projection"), Vect_get_proj_name(Map),
+                _("zone"), tmp1);
     }
     else
-	sprintf(line, "  %s: %s",
-		_("Projection"), Vect_get_proj_name(Map));
+        sprintf(line, "  %s: %s",
+                _("Projection"), Vect_get_proj_name(Map));
 
     printline(line);
     printline("");
@@ -464,21 +490,21 @@ void print_info(const struct Map_info *Map)
     G_format_northing(box.N, tmp1, G_projection());
     G_format_northing(box.S, tmp2, G_projection());
     sprintf(line, "              %c: %17s    %c: %17s",
-	    'N', tmp1, 'S', tmp2);
+            'N', tmp1, 'S', tmp2);
     printline(line);
     
     G_format_easting(box.E, tmp1, G_projection());
     G_format_easting(box.W, tmp2, G_projection());
     sprintf(line, "              %c: %17s    %c: %17s",
-	    'E', tmp1, 'W', tmp2);
+            'E', tmp1, 'W', tmp2);
     printline(line);
     
     if (Vect_is_3d(Map)) {
-	format_double(box.B, tmp1);
-	format_double(box.T, tmp2);
-	sprintf(line, "              %c: %17s    %c: %17s",
-		'B', tmp1, 'T', tmp2);
-	printline(line);
+        format_double(box.B, tmp1);
+        format_double(box.T, tmp2);
+        sprintf(line, "              %c: %17s    %c: %17s",
+                'B', tmp1, 'T', tmp2);
+        printline(line);
     }
     printline("");