[GRASS-SVN] r41789 - in grass/branches/develbranch_6/vector: v.net.allpairs v.net.bridge v.net.centrality v.net.components v.net.connectivity v.net.distance v.net.flow v.net.spanningtree v.net.timetable

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-04-10 15:34:05 -0400 (Sat, 10 Apr 2010)
New Revision: 41789

Modified:
   grass/branches/develbranch_6/vector/v.net.allpairs/main.c
   grass/branches/develbranch_6/vector/v.net.bridge/main.c
   grass/branches/develbranch_6/vector/v.net.centrality/main.c
   grass/branches/develbranch_6/vector/v.net.components/main.c
   grass/branches/develbranch_6/vector/v.net.connectivity/main.c
   grass/branches/develbranch_6/vector/v.net.distance/main.c
   grass/branches/develbranch_6/vector/v.net.flow/main.c
   grass/branches/develbranch_6/vector/v.net.spanningtree/main.c
   grass/branches/develbranch_6/vector/v.net.timetable/main.c
Log:
some backport fixes

Modified: grass/branches/develbranch_6/vector/v.net.allpairs/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.allpairs/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.allpairs/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/neta.h>
@@ -51,9 +51,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("shortest path"));
+    module->keywords = _("vector, network, shortest path");
     module->description =
 	_("Computes the shortest path between all pairs of nodes in the network.");
 

Modified: grass/branches/develbranch_6/vector/v.net.bridge/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.bridge/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.bridge/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/neta.h>
 
@@ -42,9 +42,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("articulation points"));
+    module->keywords = _("vector, network, articulation points");
     module->description =
 	_("Computes bridges and articulation points in the network.");
 

Modified: grass/branches/develbranch_6/vector/v.net.centrality/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.centrality/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.centrality/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/neta.h>
@@ -92,9 +92,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("centrality measures"));
+    module->keywords = _("vector, network, centrality measures");
     module->description =
 	_("Computes degree, centrality, betweeness, closeness and eigenvector "
 	 "centrality measures in the network.");

Modified: grass/branches/develbranch_6/vector/v.net.components/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.components/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.components/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/neta.h>
@@ -66,9 +66,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("components"));
+    module->keywords = _("vector, network, components");
     module->description =
 	_("Computes strongly and weakly connected components in the network.");
 

Modified: grass/branches/develbranch_6/vector/v.net.connectivity/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.connectivity/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.connectivity/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/neta.h>
@@ -50,9 +50,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("connectivity"));
+    module->keywords = _("vector, network, connectivity");
     module->description =
 	_("Computes vertex connectivity between two sets of nodes in the network.");
 

Modified: grass/branches/develbranch_6/vector/v.net.distance/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.distance/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.distance/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/neta.h>
@@ -57,9 +57,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("shortest path"));
+    module->keywords = _("vector, network, shortest path");
     module->label = _("Computes shortest distance via the network between "
 		      "the given sets of features.");
     module->description =

Modified: grass/branches/develbranch_6/vector/v.net.flow/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.flow/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.flow/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/neta.h>
@@ -55,9 +55,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("flow"));
+    module->keywords = _("vector, network, flow");
     module->description =
 	_("Computes the maximum flow between two sets of nodes in the network.");
 

Modified: grass/branches/develbranch_6/vector/v.net.spanningtree/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.spanningtree/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.spanningtree/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/neta.h>
 
@@ -43,9 +43,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("spanning tree"));
+    module->keywords = _("vector, network, spanning tree");
     module->description =
 	_("Computes minimum spanning tree for the network.");
 

Modified: grass/branches/develbranch_6/vector/v.net.timetable/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.timetable/main.c	2010-04-10 19:19:28 UTC (rev 41788)
+++ grass/branches/develbranch_6/vector/v.net.timetable/main.c	2010-04-10 19:34:05 UTC (rev 41789)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/vector.h>
+#include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/neta.h>
 
@@ -251,9 +251,7 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_("vector"));
-    G_add_keyword(_("network"));
-    G_add_keyword(_("shortest path"));
+    module->keywords = _("vector, network, shortest path");
     module->description = _("Finds shortest path using timetables.");
 
     /* Define the different options as defined in gis.h */