Commit fd7e7edf authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Added test and changed paramter name to ProductID.

parent 2c642688

isis/src/tgo/apps/tgocassisrdrgen/tgocassisrdrgen.cpp

+3 −3
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ void IsisMain() { 
    throw  IException(IException::User, msg, _FILEINFO_);

  }



  if ( ui.WasEntered("PRODID") ) {

  if ( ui.WasEntered("PRODUCTID") ) {

    PvlGroup &archiveGroup = label->findObject("IsisCube").findGroup("Archive");

    try {

      PvlKeyword &prodId = archiveGroup.findKeyword("ProductId");

      prodId.setValue( ui.GetString("PRODID") );

      prodId.setValue( ui.GetString("PRODUCTID") );

    }

    catch (IException &e) {

      archiveGroup.addKeyword( PvlKeyword("ProductId", ui.GetString("PRODID")) );

      archiveGroup.addKeyword( PvlKeyword("ProductId", ui.GetString("PRODUCTID")) );

    }

  }

isis/src/tgo/apps/tgocassisrdrgen/tgocassisrdrgen.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
      Moved code to write out .img and .xml PDS4 data to WritePds4 in ProcessExportPds4.

    </change>

    <change name="Kaitlyn Lee" date="2018-05-16">

      Added parameter PRODID to set the ProductId keyword. If the keyword does

      Added parameter PRODUCTID to set the ProductId keyword. If the keyword does

      not exist in the label, it will add it.

    </change>

  </history>
@@ -71,9 +71,9 @@ 
    </group>



    <group name="Keywords">

      <parameter name="PRODID">

      <parameter name="PRODUCTID">

        <type>string</type>

        <internalDefault>No Value</internalDefault>

        <internalDefault>None</internalDefault>

        <brief>

          Poduct ID value

        </brief>

isis/src/tgo/apps/tgocassisrdrgen/tsts/default/Makefile

+26 −1
Original line number Diff line number Diff line
@@ -41,3 +41,28 @@ commands: 
	      $(OUTPUT)/templabel1.txt \

	      $(OUTPUT)/templabel2.txt \

	      $(OUTPUT)/templabel3.txt;



	# Test PRODUCTID parameter with same input

	$(APPNAME) from=$(INPUT)/CAS-MCO-2016-11-26T22.32.39.582-BLU-03025-00.cub \

	           to=$(OUTPUT)/CAS-MCO-2016-11-26T22.32.39.582-BLU-03025-00_modifiedId.img \

						 PRODUCTID=placeholderId \

		   > /dev/null;



	$(SED) 's+\Product_Observational.*>+\Product_Observational>+' \

	       $(OUTPUT)/CAS-MCO-2016-11-26T22.32.39.582-BLU-03025-00_modifiedId.xml \

	       > $(OUTPUT)/templabel1.txt;

	$(SED) 's+\FSW_HEADER.*>+\FSW_HEADER>+' \

	       $(OUTPUT)/templabel1.txt \

	       > $(OUTPUT)/templabel2.txt;

	$(SED) 's+\PEHK_HEADER.*>+\PEHK_HEADER>+' \

	       $(OUTPUT)/templabel2.txt \

	       > $(OUTPUT)/templabel3.txt;

	$(SED) 's+\Modification_Detail.*>+\Modification_Detail>+' \

	       $(OUTPUT)/templabel3.txt \

	       > $(OUTPUT)/CAS-MCO-2016-11-26T22.32.39.582-BLU-03025-00_modifiedId.xmlLabel.txt;





	$(RM) $(OUTPUT)/CAS-MCO-2016-11-26T22.32.39.582-BLU-03025-00_modifiedId.xml \

	      $(OUTPUT)/templabel1.txt \

	      $(OUTPUT)/templabel2.txt \

	      $(OUTPUT)/templabel3.txt;