瀏覽代碼

db.connect: enhance default answers

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72943 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 6 年之前
父節點
當前提交
4930cc4fd9
共有 1 個文件被更改,包括 14 次插入4 次删除
  1. 14 4
      db/db.connect/main.c

+ 14 - 4
db/db.connect/main.c

@@ -69,15 +69,25 @@ int main(int argc, char *argv[])
     def->description = _("Overwrite current settings if already initialized");
     def->guisection = _("Set");
 
-    /* the default answers below for driver, database, schema, and group
-     * are current settings, not GRASS default settings */
+    /* the default answers below are GRASS default settings,
+     * not current settings */
     driver = G_define_standard_option(G_OPT_DB_DRIVER);
     driver->options = db_list_drivers();
-    driver->answer = "sqlite";
+    if (strcmp(DB_DEFAULT_DRIVER, "sqlite") == 0) {
+	driver->answer = "sqlite";
+    }
+    else {
+	driver->answer = "dbf";
+    }
     driver->guisection = _("Set");
 
     database = G_define_standard_option(G_OPT_DB_DATABASE);
-    database->answer = "$GISDBASE/$LOCATION_NAME/$MAPSET/sqlite/sqlite.db";
+    if (strcmp(DB_DEFAULT_DRIVER, "sqlite") == 0) {
+	database->answer = "$GISDBASE/$LOCATION_NAME/$MAPSET/sqlite/sqlite.db";
+    }
+    else {
+	database->answer = "$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/";
+    }
     database->guisection = _("Set");
 
     schema = G_define_standard_option(G_OPT_DB_SCHEMA);