QGIS » QGIS Application

Index: src/core/qgscoordinatereferencesystem.cpp

===================================================================

--- src/core/qgscoordinatereferencesystem.cpp	(revision 13139)

+++ src/core/qgscoordinatereferencesystem.cpp	(working copy)

@@ -203,12 +203,15 @@

     ellipsoid_acronym NOT NULL,

     parameters text NOT NULL,

     srid integer NOT NULL,

-    auth_name varchar NOT NULL,

-    auth_id integer NOT NULL,

+    epsg integer,

+    //auth_name varchar NOT NULL,

+    //auth_id integer NOT NULL,

     is_geo integer NOT NULL);

   */

-  QString mySql = "select srs_id,description,projection_acronym,ellipsoid_acronym,parameters,srid,auth_name||':'||auth_id,is_geo from tbl_srs where " + expression + "='" + value + "'";

+  // auth_id & auth_name no longer in table

+  //QString mySql = "select srs_id,description,projection_acronym,ellipsoid_acronym,parameters,srid,auth_name||':'||auth_id,is_geo from tbl_srs where " + expression + "='" + value + "'";

+  QString mySql = "select srs_id,description,projection_acronym,ellipsoid_acronym,parameters,srid,epsg,is_geo from tbl_srs where " + expression + "='" + value + "'";

   myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );

   // XXX Need to free memory from the error msg if one is set

   if ( myResult == SQLITE_OK && sqlite3_step( myPreparedStatement ) == SQLITE_ROW )

@@ -219,7 +222,8 @@

     mEllipsoidAcronym = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 3 ) );

     QString toProj4 = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) );

     mSRID = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 5 ) ).toLong();

-    mAuthId = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 6 ) );

+    // AuthID no longer in table

+    //mAuthId = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 6 ) );

     int geo = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 7 ) ).toInt();

     mGeoFlag = ( geo == 0 ? false : true );

     setProj4String( toProj4 );