qgis · Sep 13, 2007
diff --git a/‎debian/libqgis1.substvars
Lines changed: 0 additions & 1 deletion b/‎debian/libqgis1.substvars
Lines changed: 0 additions & 1 deletion
diff --git a/‎debian/qgis-plugin-grass.substvars
Lines changed: 0 additions & 1 deletion b/‎debian/qgis-plugin-grass.substvars
Lines changed: 0 additions & 1 deletion
diff --git a/‎debian/qgis.substvars
Lines changed: 0 additions & 1 deletion b/‎debian/qgis.substvars
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/core/qgsspatialrefsys.cpp
Lines changed: 19 additions & 2 deletions b/‎src/core/qgsspatialrefsys.cpp
Lines changed: 19 additions & 2 deletions
diff --git a/‎tests/src/core/testqgsvectorfilewriter.cpp
Lines changed: 9 additions & 5 deletions b/‎tests/src/core/testqgsvectorfilewriter.cpp
Lines changed: 9 additions & 5 deletions
@@ -189,6 +189,14 @@ bool QgsSpatialRefSys::createFromSrid(long theSrid)
   // Get the full path name to the sqlite3 spatial reference database.
   QString myDatabaseFileName = QgsApplication::srsDbFilePath();
 
+  QFileInfo myInfo (myDatabaseFileName);
+  if (!myInfo.exists())
+  {
+    QgsDebugMsg("QgsSpatialRefSys::createFromSrid failed : " + myDatabaseFileName + 
+        " does not exist!");
+    return false;
+  }
+
 
   sqlite3      *myDatabase;
   const char   *myTail;
@@ -582,6 +590,13 @@ QgsSpatialRefSys::RecordMap QgsSpatialRefSys::getRecord(QString theSql)
   QgsDebugMsg("QgsSpatialRefSys::getRecord...running query: " + theSql);
   // Get the full path name to the sqlite3 spatial reference database.
   myDatabaseFileName = QgsApplication::srsDbFilePath();
+  QFileInfo myInfo (myDatabaseFileName);
+  if (!myInfo.exists())
+  {
+    QgsDebugMsg("QgsSpatialRefSys::createFromSrid failed : " + myDatabaseFileName + 
+        " does not exist!");
+    return myMap;
+  }
 
   //check the db is available
   myResult = openDb(myDatabaseFileName, &myDatabase);
@@ -594,6 +609,7 @@ QgsSpatialRefSys::RecordMap QgsSpatialRefSys::getRecord(QString theSql)
   // XXX Need to free memory from the error msg if one is set
   if(myResult == SQLITE_OK && sqlite3_step(myPreparedStatement) == SQLITE_ROW)
   {
+    QgsDebugMsg("QgsSpatialRefSys::getRecord...trying system srs.db");
     int myColumnCount = sqlite3_column_count(myPreparedStatement);
     //loop through each column in the record adding its field name and vvalue to the map
     for (int myColNo=0;myColNo < myColumnCount;myColNo++)
@@ -605,7 +621,7 @@ QgsSpatialRefSys::RecordMap QgsSpatialRefSys::getRecord(QString theSql)
   }
   else
   {
-    QgsDebugMsg("QgsSpatialRefSys::getRecord...trying system users.db");
+    QgsDebugMsg("QgsSpatialRefSys::getRecord...trying system qgis.db");
     sqlite3_finalize(myPreparedStatement);
     sqlite3_close(myDatabase);
 
@@ -924,7 +940,8 @@ long QgsSpatialRefSys::findMatchingProj()
       }
     }
   }
-  //std::cout << "QgsSpatialRefSys::findMatchingProj -------> no match found in srs.db, trying user db now!" << std::endl;
+  QgsLogger::warning("QgsSpatialRefSys::findMatchingProj ------->"
+                      "\n no match found in srs.db, trying user db now!");
   // close the sqlite3 statement
   sqlite3_finalize(myPreparedStatement);
   sqlite3_close(myDatabase);
 
@@ -23,6 +23,12 @@ class TestQgsVectorFileWriter: public QObject
   private slots:
     void createVectorFile()
     {
+      qDebug("\n\n **************\n"
+          "Note: if you get a message like \n"
+          "ERROR 1: /tmp/testshp.shp is not a directory.\n"
+          "It is caused by the /tmp/testshp.* files already existing\n"
+          "(the ERROR comes from OGR and is not very intuitive)\n"
+          "******************\n");
       // init QGIS's paths - true means that all path will be inited from prefix
       QString qgisPath = QCoreApplication::applicationDirPath ();
       QgsApplication::setPrefixPath(qgisPath, TRUE);
@@ -75,24 +81,22 @@ class TestQgsVectorFileWriter: public QObject
       //
       // Write the featyre to the filewriter
       //
-      myWriter.addFeature(myFeature);
+      QVERIFY(myWriter.addFeature(myFeature));
       myError = myWriter.hasError();
       if(myError==QgsVectorFileWriter::ErrDriverNotFound)
       {
         std::cout << "Driver not found error" << std::endl;
       }
-      
-      if (myError==QgsVectorFileWriter::ErrCreateDataSource)
+      else if (myError==QgsVectorFileWriter::ErrCreateDataSource)
       {
         std::cout << "Create data source error" << std::endl;
       }
-      if (myError==QgsVectorFileWriter::ErrCreateLayer)
+      else if (myError==QgsVectorFileWriter::ErrCreateLayer)
       {
         std::cout << "Create layer error" << std::endl;
       }
       QVERIFY(myError==QgsVectorFileWriter::NoError);
       // other possible outcomes...
-      delete mypGeometry;
     }
 };
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,12 @@ class TestQgsVectorFileWriter: public QObject`
`23`	`23`	`private slots:`
`24`	`24`	`void createVectorFile()`
`25`	`25`	`{`
	`26`	`+ qDebug("\n\n **************\n"`
	`27`	`+ "Note: if you get a message like \n"`
	`28`	`+ "ERROR 1: /tmp/testshp.shp is not a directory.\n"`
	`29`	`+ "It is caused by the /tmp/testshp.* files already existing\n"`
	`30`	`+ "(the ERROR comes from OGR and is not very intuitive)\n"`
	`31`	`+ "******************\n");`
`26`	`32`	`// init QGIS's paths - true means that all path will be inited from prefix`
`27`	`33`	`QString qgisPath = QCoreApplication::applicationDirPath ();`
`28`	`34`	`QgsApplication::setPrefixPath(qgisPath, TRUE);`
`@@ -75,24 +81,22 @@ class TestQgsVectorFileWriter: public QObject`
`75`	`81`	`//`
`76`	`82`	`// Write the featyre to the filewriter`
`77`	`83`	`//`
`78`		`- myWriter.addFeature(myFeature);`
	`84`	`+ QVERIFY(myWriter.addFeature(myFeature));`
`79`	`85`	`myError = myWriter.hasError();`
`80`	`86`	`if(myError==QgsVectorFileWriter::ErrDriverNotFound)`
`81`	`87`	`{`
`82`	`88`	`std::cout << "Driver not found error" << std::endl;`
`83`	`89`	`}`
`84`		`-`
`85`		`- if (myError==QgsVectorFileWriter::ErrCreateDataSource)`
	`90`	`+ else if (myError==QgsVectorFileWriter::ErrCreateDataSource)`
`86`	`91`	`{`
`87`	`92`	`std::cout << "Create data source error" << std::endl;`
`88`	`93`	`}`
`89`		`- if (myError==QgsVectorFileWriter::ErrCreateLayer)`
	`94`	`+ else if (myError==QgsVectorFileWriter::ErrCreateLayer)`
`90`	`95`	`{`
`91`	`96`	`std::cout << "Create layer error" << std::endl;`
`92`	`97`	`}`
`93`	`98`	`QVERIFY(myError==QgsVectorFileWriter::NoError);`
`94`	`99`	`// other possible outcomes...`
`95`		`- delete mypGeometry;`
`96`	`100`	`}`
`97`	`101`	`};`
`98`	`102`