[GRASS-SVN] r64949 - in grass/branches/releasebranch_7_0: demolocation lib/init lib/python/script

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-03-30 14:45:34 -0700 (Mon, 30 Mar 2015)
New Revision: 64949

Modified:
   grass/branches/releasebranch_7_0/demolocation/grassrc.tmpl
   grass/branches/releasebranch_7_0/lib/init/variables.html
   grass/branches/releasebranch_7_0/lib/python/script/core.py
Log:
GRASS_DB_ENCODING is environmental variable (merge r64948 from trunk)

Modified: grass/branches/releasebranch_7_0/demolocation/grassrc.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/demolocation/grassrc.tmpl	2015-03-30 21:43:19 UTC (rev 64948)
+++ grass/branches/releasebranch_7_0/demolocation/grassrc.tmpl	2015-03-30 21:45:34 UTC (rev 64949)
@@ -1,6 +1,4 @@
 GISDBASE: @GISDBASE@
 LOCATION_NAME: demolocation
 MAPSET: PERMANENT
-GRASS_DB_ENCODING: utf-8
-DEBUG: 0
 GUI: text

Modified: grass/branches/releasebranch_7_0/lib/init/variables.html
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/variables.html	2015-03-30 21:43:19 UTC (rev 64948)
+++ grass/branches/releasebranch_7_0/lib/init/variables.html	2015-03-30 21:45:34 UTC (rev 64949)
@@ -107,6 +107,10 @@
   <dd>defines the name (path) of a shell script to be processed as
   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>
   <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'
@@ -457,10 +461,6 @@
   <dd>lock ID to prevent parallel GRASS use,
     <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>
   <dd>See <tt>GRASS_GUI</tt> environmental variable for details.</dd>
   

Modified: grass/branches/releasebranch_7_0/lib/python/script/core.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/core.py	2015-03-30 21:43:19 UTC (rev 64948)
+++ grass/branches/releasebranch_7_0/lib/python/script/core.py	2015-03-30 21:45:34 UTC (rev 64949)
@@ -322,7 +322,6 @@
     GISDBASE='/opt/grass-data';
     LOCATION_NAME='spearfish60';
     MAPSET='glynn';
-    GRASS_DB_ENCODING='ascii';
     GUI='text';
     MONITOR='x0';
 
@@ -386,7 +385,6 @@
     GISDBASE='/opt/grass-data';
     LOCATION_NAME='spearfish60';
     MAPSET='glynn';
-    GRASS_DB_ENCODING='ascii';
     GUI='text';
     MONITOR='x0';