Commit 94c00240 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Fixed issue with Feature Nomenclature Tool sending an incorrect query, causing... 

Fixed issue with Feature Nomenclature Tool sending an incorrect query, causing an error message (Qt5).

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/v006LibrariesV2@6734 41f8697f-d340-4b68-9986-7bafba869bb8
parent 2c04b219

isis/src/qisis/objs/FeatureNomenclature/FeatureNomenclature.cpp

+4 −4
Original line number Diff line number Diff line
@@ -823,14 +823,14 @@ namespace Isis { 
                           "from the nomenclature database. "

                           "The XML result was invalid. The parse is [" +

                           errorMsg + "] on line [" +

                           QString(errorLine) +"], column [" +

                           QString(errorCol) + "]");

                           QString::number(errorLine) +"], column [" +

                           QString::number(errorCol) + "]");

      }

    }

    else {

      QMessageBox::warning(NULL, "Failed to query nomenclature database",

                           "An error occurred when querying the nomenclature "

                           "database for features that intersect the qeuried "

                           "database for features that intersect the queried "

                           "ground range. Please make sure you have an active "

                           "internet connection. The error returned was [" +

                           reply->errorString() + "]");
@@ -957,6 +957,6 @@ namespace Isis { 
    formQuery.addQueryItem("southernLatitude",

                                 QString::number(startLat.degrees()));



    m_networkMgr->post(*m_request, QUrl::toPercentEncoding(formQuery.query()));

    m_networkMgr->post(*m_request, formQuery.query(QUrl::FullyEncoded).toUtf8()); 

  }

}

isis/src/qisis/objs/FeatureNomenclature/FeatureNomenclature.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ namespace Isis { 
       *   @history 2012-06-06 Steven Lambright and Kimberly Oyama - Added approval status to the

       *                           list of characteristics of the feature and added the accessor

       *                           (status()). Fixes #852. Fixes #892.

       *   @history 2016-05-23 Ian Humphrey - Modified runQuery() to correctly send POST request

       *                           to find the features for the feature nomenclature tool (Qt5).

       */

      class Feature {

      public: