- run tests with temporary copy of srs.db

jef-n · jef-n · commit cfa85f37ab5e · 2012-04-20T20:04:56.000+02:00
- sync srs.db in a single transaction
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -21,6 +21,7 @@
 #include "qgsgeometry.h"
 
 #include <QDir>
+#include <QFile>
 #include <QFileOpenEvent>
 #include <QMessageBox>
 #include <QPalette>
@@ -454,6 +455,23 @@ const QString QgsApplication::iconsPath()
 */
 const QString QgsApplication::srsDbFilePath()
 {
+  if ( ABISYM( mRunningFromBuildDir ) )
+  {
+    QString tempCopy = QDir::tempPath() + "/srs.db";
+
+    if ( !QFile( tempCopy ).exists() )
+    {
+      QFile f( ABISYM( mPkgDataPath ) + "/resources/srs.db" );
+      if ( !f.copy( tempCopy ) )
+      {
+        qFatal( "Could not create temporary copy" );
+      }
+    }
+
+    return tempCopy;
+  }
+
+  QString svgSubDir( ABISYM( mRunningFromBuildDir ) ? "/images/svg/" : "/svg/" );
   return ABISYM( mPkgDataPath ) + QString( "/resources/srs.db" );
 }
 
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -20,6 +20,7 @@
 #include <cmath>
 
 #include <QDir>
+#include <QTemporaryFile>
 #include <QDomNode>
 #include <QDomElement>
 #include <QFileInfo>
@@ -1423,10 +1424,17 @@ QString QgsCoordinateReferenceSystem::quotedValue( QString value )
 int QgsCoordinateReferenceSystem::syncDb()
 {
   int updated = 0, errors = 0;
+
   sqlite3 *database;
   if ( sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &database ) != SQLITE_OK )
   {
-    qCritical( "Can't open database: %s [%s]\n", QgsApplication::srsDbFilePath().toLocal8Bit().constData(), sqlite3_errmsg( database ) );
+    qCritical( "Could not open database: %s [%s]\n", QgsApplication::srsDbFilePath().toLocal8Bit().constData(), sqlite3_errmsg( database ) );
+    return -1;
+  }
+
+  if ( sqlite3_exec( database, "BEGIN TRANSACTION", 0, 0, 0 ) != SQLITE_OK )
+  {
+    qCritical( "Could not begin transaction: %s [%s]\n", QgsApplication::srsDbFilePath().toLocal8Bit().constData(), sqlite3_errmsg( database ) );
     return -1;
   }
 
@@ -1520,7 +1528,6 @@ int QgsCoordinateReferenceSystem::syncDb()
     if ( proj4 != params )
     {
       char *errMsg = NULL;
-
       sql = QString( "UPDATE tbl_srs SET parameters=%1 WHERE auth_name=%2 AND auth_id=%3" )
             .arg( quotedValue( proj4 ) )
             .arg( quotedValue( auth_name ) )
@@ -1548,6 +1555,13 @@ int QgsCoordinateReferenceSystem::syncDb()
   OSRDestroySpatialReference( crs );
 
   sqlite3_finalize( select );
+
+  if ( sqlite3_exec( database, "COMMIT", 0, 0, 0 ) != SQLITE_OK )
+  {
+    qCritical( "Could not commit transaction: %s [%s]\n", QgsApplication::srsDbFilePath().toLocal8Bit().constData(), sqlite3_errmsg( database ) );
+    return -1;
+  }
+
   sqlite3_close( database );
 
   if ( errors > 0 )
diff --git a/src/crssync/main.cpp b/src/crssync/main.cpp
@@ -65,5 +65,5 @@ int main( int argc, char ** argv )
     std::cout << -res << " CRSs could not be updated." << std::endl;
   }
 
-  return 0;
+  exit( 0 );
 }

Original file line number	Diff line number	Diff line change
`@@ -65,5 +65,5 @@ int main( int argc, char ** argv )`
`65`	`65`	`std::cout << -res << " CRSs could not be updated." << std::endl;`
`66`	`66`	`}`
`67`	`67`
`68`		`- return 0;`
	`68`	`+ exit( 0 );`
`69`	`69`	`}`