瀏覽代碼

place holder code for future use

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40366 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 15 年之前
父節點
當前提交
872b4db41b
共有 1 個文件被更改,包括 12 次插入2 次删除
  1. 12 2
      lib/vector/Vlib/field.c

+ 12 - 2
lib/vector/Vlib/field.c

@@ -721,12 +721,21 @@ int Vect_read_dblinks(struct Map_info *Map)
 
 	if (strlen(buf) == 0)
 	    continue;
- 
+
+#ifdef NOT_ABLE_TO_READ_GRASS_6
+	int ndef;
+	ndef = sscanf(buf, "%s|%s|%s|%s|%s", fldstr, tab, col, db, drv);
+
+        if (ndef < 2 || (ndef < 5 && rule < 1)) {
+            G_warning(_("Error in rule on row %d in <%s>"), row, file);
+            continue;
+        }
+#else
 	tokens = G_tokenize(buf, " |");
 	ntok = G_number_of_tokens(tokens);
 
 	if (ntok < 2 || (ntok < 5 && rule < 1)) {
-	    G_warning(_("Error in rule on row %d in %s"), row, file);
+	    G_warning(_("Error in rule on row %d in <%s>"), row, file);
 	    continue;
 	}
 
@@ -746,6 +755,7 @@ int Vect_read_dblinks(struct Map_info *Map)
 	    }
 	}
 	G_free_tokens(tokens);
+#endif
 
 	/* get field and field name */
 	fldname = strchr(fldstr, '/');