浏览代码

GRASS_DB_ENCODING is environmental variable (merge https://trac.osgeo.org/grass/changeset/64948 from trunk)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64949 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父节点
当前提交
162437c0df
共有 3 个文件被更改,包括 4 次插入8 次删除
  1. 0 2
      demolocation/grassrc.tmpl
  2. 4 4
      lib/init/variables.html
  3. 0 2
      lib/python/script/core.py

+ 0 - 2
demolocation/grassrc.tmpl

@@ -1,6 +1,4 @@
 GISDBASE: @GISDBASE@
 GISDBASE: @GISDBASE@
 LOCATION_NAME: demolocation
 LOCATION_NAME: demolocation
 MAPSET: PERMANENT
 MAPSET: PERMANENT
-GRASS_DB_ENCODING: utf-8
-DEBUG: 0
 GUI: text
 GUI: text

+ 4 - 4
lib/init/variables.html

@@ -107,6 +107,10 @@ PERMANENT
   <dd>defines the name (path) of a shell script to be processed as
   <dd>defines the name (path) of a shell script to be processed as
   batch job.</dd>
   batch job.</dd>
 
 
+  <dt>GRASS_DB_ENCODING</dt>
+  <dd>[various modules, wxGUI]<br>
+    encoding for vector attribute data (utf-8, ascii, iso8859-1, koi8-r)</dd>
+  
   <dt>GIS_ERROR_LOG</dt>
   <dt>GIS_ERROR_LOG</dt>
   <dd>If set, GIS_ERROR_LOG should be the absolute path to the log
   <dd>If set, GIS_ERROR_LOG should be the absolute path to the log
    file (a relative path will be interpreted relative to the process'
    file (a relative path will be interpreted relative to the process'
@@ -457,10 +461,6 @@ g.gisenv set=DEBUG=0
   <dd>lock ID to prevent parallel GRASS use,
   <dd>lock ID to prevent parallel GRASS use,
     <br>process id of the start-up shell script</dd>
     <br>process id of the start-up shell script</dd>
   
   
-  <dt>GRASS_DB_ENCODING</dt>
-  <dd>[d.what.vect/forms library]<br>
-    encoding of query form (utf-8, ascii, iso8859-1, koi8-r)</dd>
-  
   <dt>GUI</dt>
   <dt>GUI</dt>
   <dd>See <tt>GRASS_GUI</tt> environmental variable for details.</dd>
   <dd>See <tt>GRASS_GUI</tt> environmental variable for details.</dd>
   
   

+ 0 - 2
lib/python/script/core.py

@@ -322,7 +322,6 @@ def start_command(prog, flags="", overwrite=False, quiet=False,
     GISDBASE='/opt/grass-data';
     GISDBASE='/opt/grass-data';
     LOCATION_NAME='spearfish60';
     LOCATION_NAME='spearfish60';
     MAPSET='glynn';
     MAPSET='glynn';
-    GRASS_DB_ENCODING='ascii';
     GUI='text';
     GUI='text';
     MONITOR='x0';
     MONITOR='x0';
 
 
@@ -386,7 +385,6 @@ def pipe_command(*args, **kwargs):
     GISDBASE='/opt/grass-data';
     GISDBASE='/opt/grass-data';
     LOCATION_NAME='spearfish60';
     LOCATION_NAME='spearfish60';
     MAPSET='glynn';
     MAPSET='glynn';
-    GRASS_DB_ENCODING='ascii';
     GUI='text';
     GUI='text';
     MONITOR='x0';
     MONITOR='x0';