Commit 06d83b92 authored by Adam Paquette's avatar Adam Paquette
Browse files

Corrected error stacking in lronac2isis, it should now properly stack error messages. Fixes #4036. 

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

isis/src/lro/apps/lronac2isis/lronac2isis.cpp

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ void IsisMain() { 


    //Checks if in file is rdr

    bool projected = lab.hasObject("IMAGE_MAP_PROJECTION");

    std::cout << projected << std::endl;

    if(projected) {

      QString msg = "[" + inFile.name() + "] appears to be an rdr file.";

      msg += " Use pds2isis.";
@@ -75,7 +76,9 @@ void IsisMain() { 
  }

  catch(IException &e) {

    QString msg = "The PDS header is missing important keyword(s).";

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

    IException finalException(IException::Io, msg, _FILEINFO_);

    finalException.append(e);

    throw finalException;

  }



  id = id.simplified().trimmed();

isis/src/lro/apps/lronac2isis/lronac2isis.xml

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ 
        <change name="Jacob Danton" date="2008-12-15">

            Original Version

        </change>

      	<change name="Adam Paquette" date="2016-07-11">

      	    Updated error messages to stack when necessary.

      	</change>

        <change name="Adam Paquette" date="2017-04-27">

            Corrected error message stacking in lronac2isis, was not correctly dealt with on

            2016-07-11

        </change>

    </history>



    <category>

isis/src/lro/apps/lronac2isis/tsts/nac-fail/Makefile

0 → 100644
+12 −0
Original line number Diff line number Diff line 
APPNAME = lronac2isis

FILE=nacl00015d79Edit



include $(ISISROOT)/make/isismake.tsts



commands:

#    TEST A: Check that lronac2isis is returning the correct error messages

	if [ `$(APPNAME) from=$(INPUT)/$(FILE).img \

	  to=$(OUTPUT)/$(FILE).cub > /dev/null \

	  2>> $(OUTPUT)/error_message_temp.txt > /dev/null` ]; \

	  then true; \

	fi;
 
 No newline at end of file