[GRASS-SVN] r60668 - grass/branches/releasebranch_6_4/vector/v.vol.rst

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-06-02 05:23:54 -0700 (Mon, 02 Jun 2014)
New Revision: 60668

Modified:
   grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c
   grass/branches/releasebranch_6_4/vector/v.vol.rst/user1.c
Log:
v.vol.rst: more messages about maps which are actually created

Modified: grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c	2014-06-02 12:23:24 UTC (rev 60667)
+++ grass/branches/releasebranch_6_4/vector/v.vol.rst/main.c	2014-06-02 12:23:54 UTC (rev 60668)
@@ -531,14 +531,14 @@
 
     if ((data =
 	 data_new(x_orig, y_orig, z_orig, n_rows, n_cols, n_levs, 0)) == NULL)
-	G_fatal_error("cannot create octdata");
+	G_fatal_error("Unable to create octdata");
     if ((functions =
 	 OT_functions_new(oct_compare, oct_divide_data, oct_add_data,
 			  oct_intersect, oct_division_check,
 			  oct_get_points)) == NULL)
-	G_fatal_error("cannot create octfunc");
+	G_fatal_error("Unable to create octfunc");
     if ((tree = OT_tree_new(data, NULL, NULL, functions, 0)) == NULL)
-	G_fatal_error("cannot create octtree");
+	G_fatal_error("Unable to create octtree");
 
     root = tree;
 
@@ -547,7 +547,7 @@
      */
     if (TESTOUT) {
 	if ((fd4 = fopen("testout", "w+")) == NULL)
-	    G_fatal_error("Cannot open testout");
+	    G_fatal_error("Unable to open testout");
     }
 
     Vect_set_open_level(1);
@@ -628,7 +628,8 @@
 		    clean_fatal_error
 			("Not enough disk space--cannot write temp files");
 	    }
-	}
+	} else
+	  G_warning("Unable to create cellout raster map without cellinp");
 	ertot = 0.;
 	if (per)
 	    fprintf(stderr, "Percent complete: ");
@@ -822,6 +823,8 @@
 
 		    G_command_history(&hist);
 		    G_write_history(cellout, &hist);
+		    G_message(_("Raster map <%s> created"), cellout);
+
 		    fclose(Tmp_fd_cell);
 		    unlink(Tmp_file_cell);
 		}
@@ -860,6 +863,7 @@
 		db_close_database_shutdown_driver(driver);
 		Vect_build(&Map);
 		Vect_close(&Map);
+		G_message(_("Vector map <%s> created"), cvdev);
 	    }
 
 	    fprintf(stderr, "\n");
@@ -874,12 +878,12 @@
 
 	}
 	else
-	    clean_fatal_error("Interp_call failed!");
+	    clean_fatal_error(_("Interpolation failed"));
     }
     else
-	clean_fatal_error("input failed!");
+	clean_fatal_error(_("Input failed"));
     if (fd4 != NULL)
 	fclose(fd4);
 
-    return 0;
+    return EXIT_SUCCESS;
 }

Modified: grass/branches/releasebranch_6_4/vector/v.vol.rst/user1.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.vol.rst/user1.c	2014-06-02 12:23:24 UTC (rev 60667)
+++ grass/branches/releasebranch_6_4/vector/v.vol.rst/user1.c	2014-06-02 12:23:54 UTC (rev 60668)
@@ -467,7 +467,8 @@
 	if (G3d_closeCell(cf1) == 0) {
 	    sprintf(buff, "Error closing output file %s ", outz);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), outz);
     }
 
   /*** Write out the gradient results ***/
@@ -518,7 +519,8 @@
 	if (G3d_closeCell(cf2) == 0) {
 	    sprintf(buff, "Error closing output file %s ", gradient);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), gradient);
     }
 
   /*** Write out aspect1 results ***/
@@ -569,7 +571,8 @@
 	if (G3d_closeCell(cf3) == 0) {
 	    sprintf(buff, "Error closing output file %s ", aspect1);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), aspect1);
     }
 
   /*** Write out aspect2 results ***/
@@ -620,7 +623,8 @@
 	if (G3d_closeCell(cf4) == 0) {
 	    sprintf(buff, "Error closing output file %s ", aspect2);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), aspect2);
     }
 
   /*** Write out ncurv results ***/
@@ -671,7 +675,8 @@
 	if (G3d_closeCell(cf5) == 0) {
 	    sprintf(buff, "Error closing output file %s ", ncurv);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), ncurv);
     }
 
   /*** Write out gcurv results ***/
@@ -722,7 +727,8 @@
 	if (G3d_closeCell(cf6) == 0) {
 	    sprintf(buff, "Error closing output file %s ", gcurv);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), gcurv);
     }
 
   /*** Write mcurv results ***/
@@ -773,7 +779,8 @@
 	if (G3d_closeCell(cf7) == 0) {
 	    sprintf(buff, "Error closing output file %s ", mcurv);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), mcurv);
     }
 
     G_free(data);