Commit 734428fe authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Modified error throw to not append a caught message to the current message.... 

Modified error throw to not append a caught message to the current message. This was printing non UTF-8 characters on some platforms. Updated truth data. References #2407

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6654 41f8697f-d340-4b68-9986-7bafba869bb8
parent 2e94b01b

isis/src/galileo/apps/gllnims2isis/gllnims2isis.cpp

+4 −4
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ void importQubs(QString coreParamName, QString suffixParamName) { 
  FileName inFile = ui.GetFileName("FROM");

  QFileInfo fi(inFile.expanded());



  //cout << "Processing:  " << inFile.expanded() << endl;



  //Fix the broken XML tags in the pvl file

  QByteArray pvlData= pvlFix(inFile.expanded());

  QTextStream pvlTextStream(&pvlData);
@@ -147,8 +145,10 @@ void importQubs(QString coreParamName, QString suffixParamName) { 
  catch(IException &e) {

    QString msg = "Input file [" + inFile.expanded() +

                 "] is not a valid PVL file.";



    throw IException(e, IException::User, msg, _FILEINFO_);

    // not appending the caught exception to this message.

    // we were picking up non-utf8 characters in the message

    // throw IException(e, IException::User, msg, _FILEINFO_);

    throw IException(IException::User, msg, _FILEINFO_);

  }

isis/src/galileo/apps/gllnims2isis/gllnims2isis.xml

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ xsi:noNamespaceSchemaLocation= 
    <change name="Tyler Wilson" date="2016-02-25">

      Original version

    </change>

    <change name="Jeannie Backer" date="2016-03-15">

      Modified error throw to not append a caught message to the current message.

      This was printing non UTF-8 characters on some platforms. Updated truth data. 

    </change>



  </history>