Commit 80b6c6cf authored by Curtis Rose's avatar Curtis Rose
Browse files

Fixed the Makefile and in cam2maps errors test to work with multiple filenames. References #1952. 

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

isis/src/base/apps/cam2map/cam2map.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void IsisMain() { 
  // Make sure the target name of the input cube and map file match.

  if (userGrp.hasKeyword("TargetName") && !icube->group("Instrument").findKeyword("TargetName").isNull()) {

    if (!PvlKeyword::stringEqual(incam->target()->name(), userGrp.findKeyword("TargetName")[0])) {

      QString msg = "The TargetName: [" + incam->target()->name() + "] of the input cube: [" + icube->fileName() + "\n"

      QString msg = "The TargetName: [" + incam->target()->name() + "] of the input cube: [" + icube->fileName() +

                    "] does not match the TargetName: [" + userGrp.findKeyword("TargetName")[0] + "] of the map file: [" +

                    ui.GetFileName("MAP") + "].";

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

isis/src/base/apps/cam2map/tsts/errors/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ commands: 
	  true; \

	fi;



	$(SED) 's+\[/.*/input/+\[input/+' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error.txt;

	$(SED) 's+\[/.*/\(input/.*\]\)\(.*\)\[/.*/\(input/.*\]\)+\[\1\2\[\3+' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error.txt;



	$(RM) $(OUTPUT)/error_temp.txt;

	$(RM) $(OUTPUT)/output.cub;