[GRASS-SVN] r60825 - grass/trunk/lib/python/temporal

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-06-14 04:58:11 -0700 (Sat, 14 Jun 2014)
New Revision: 60825

Modified:
   grass/trunk/lib/python/temporal/core.py
Log:
temporal: attempt to clarify temporal database version mismatch error message

Modified: grass/trunk/lib/python/temporal/core.py
===================================================================
--- grass/trunk/lib/python/temporal/core.py	2014-06-13 21:29:09 UTC (rev 60824)
+++ grass/trunk/lib/python/temporal/core.py	2014-06-14 11:58:11 UTC (rev 60825)
@@ -560,15 +560,15 @@
         if dbif.cursor.fetchone()[0]:
             db_exists = True
 
-    backup_howto = "Your temporal database format is not supported any more. "\
-                   "Unfortunately you have to restore your previous grass version "\
-                   "to make a backup of your existing temporal database and to avoid the loss of your temporal data. "\
-                   "You can use t.rast.export and t.vect.export to make a backup of your existing space time datasets. "\
-                   "Use t.rast.list, t.vect.list and t.rast3d.list to safe the time "\
-                   "stamps of your existing maps and space time datasets. "\
-                   "You can register the exitsing time stamped maps easily if you write columns=id,start_time,end_time "\
+    backup_howto = "The format of your actual temporal database is not supported any more.\n"\
+                   "Solution: You need to export it by restoring the GRASS GIS version used for creating this DB. "\
+                   "   From there, create a backup of your temporal database to avoid the loss of your temporal data.\n"\
+                   "Notes: Use t.rast.export and t.vect.export to make a backup of your existing space time datasets."\
+                   "To safe the timestamps of your existing maps and space time datasets, use t.rast.list, "\
+                   "t.vect.list and t.rast3d.list. "\
+                   "You can register the existing time stamped maps easily if you export columns=id,start_time,end_time "\
                    "into text files and use t.register to register them again in new created space time datasets (t.create). "\
-                   "After the backup remove the existing temporal database, a new one will be created automatically. "
+                   "After the backup remove the existing temporal database, a new one will be created automatically.\n"
 
 
     if db_exists == True:
@@ -582,13 +582,13 @@
                          "Current temporal database info:%(info)s")%({"info":get_database_info_string()}))
         for entry in metadata:
             if "tgis_version" in entry and entry[1] != str(get_tgis_version()):
-                msgr.fatal(_("Unsupported temporal database. Version mismatch.\n %(backup)s"
+                msgr.fatal(_("Unsupported temporal database: version mismatch.\n %(backup)s"
                              "Supported temporal API version is: %(api)i.\n"
-                             "Please update your GRASS installation to the latest svn version.\n"
+                             "Please update your GRASS GIS installation.\n"
                              "Current temporal database info:%(info)s")%({"backup":backup_howto, "api":get_tgis_version(),
                                                                           "info":get_database_info_string()}))
             if "tgis_db_version" in entry and entry[1] != str(get_tgis_db_version()):
-                msgr.fatal(_("Unsupported temporal database. Version mismatch.\n %(backup)s"
+                msgr.fatal(_("Unsupported temporal database: version mismatch.\n %(backup)s"
                              "Supported temporal database version is: %(tdb)i\n"
                              "Current temporal database info:%(info)s")%({"backup":backup_howto,"tdb":get_tgis_version(),
                                                                           "info":get_database_info_string()}))