[QGIS Commit] r11373 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: homann
Date: 2009-08-14 06:54:01 -0400 (Fri, 14 Aug 2009)
New Revision: 11373

Modified:
   trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
Log:
Fixing globbing search after breaking it in r11366

Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2009-08-14 09:22:25 UTC (rev 11372)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2009-08-14 10:54:01 UTC (rev 11373)
@@ -425,12 +425,17 @@
     {
       // Last ditch attempt to piece together what we know of the projection to find a match...
       QgsDebugMsg( "globbing search for srsid from this proj string" );
+      setProj4String( theProj4String );
       mySrsId = findMatchingProj();
       QgsDebugMsg( "globbing search for srsid returned srsid: " + QString::number( mySrsId ) );
       if ( mySrsId > 0 )
       {
         createFromSrsId( mySrsId );
       }
+      else
+      {
+        mIsValidFlag = false;
+      }
     }
   }
 
@@ -771,7 +776,8 @@
   QgsDebugMsg( "entered." );
   if ( mEllipsoidAcronym.isNull() ||  mProjectionAcronym.isNull() || !mIsValidFlag )
   {
-    QgsDebugMsg( "QgsCoordinateReferenceSystem::findMatchingProj will only work if prj acr ellipsoid acr and proj4string are set!..." );
+    QgsDebugMsg( "QgsCoordinateReferenceSystem::findMatchingProj will only work if prj acr ellipsoid acr and proj4string are set"
+                 " and the current projection is valid!" );
     return 0;
   }