Unverified Commit d18c5558 authored by jcwbacker's avatar jcwbacker Committed by GitHub
Browse files

Merge pull request #229 from jcwbacker/hayabusa 

added pds4logicalid parameter to hayabusa1 export program.
parents 49ee253b ac70ea4b

isis/src/hayabusa/apps/hyb1pds4gen/hyb1pds4gen.cpp

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ void IsisMain() { 
  Cube *inputCube = process.SetInputCube("FROM");

  Pvl *inputLabel = inputCube->label();



  QString logicalId = ui.GetString("PDS4LOGICALIDENTIFIER");

  process.setLogicalId(logicalId);



  QDomDocument &pdsLabel = process.StandardPds4Label();

  /*

   * Add additional pds label data here

isis/src/hayabusa/apps/hyb1pds4gen/hyb1pds4gen.xml

+16 −0
Original line number Diff line number Diff line
@@ -91,6 +91,22 @@ 
        </filter>

      </parameter>

    </group>



    <group name="Keywords">

      <parameter name="PDS4LOGICALIDENTIFIER">

        <type>string</type>

        <brief>

          String value for the PDS4 logical_identifier keyword.

        </brief>

        <description>

          This value is used to set the required PDS4 value, logical_identifier. It should be a

          6-part colon separated string of the form 

          <b>urn:space_agency:archiving_agency:pds_approved_bundle_id:pds_approved_collection_id:product_id</b>.

          Note that space_agency is generally "nasa" and archiving_agency is generally "pds".

        </description>

      </parameter>

    </group>



  </groups>



</application>

isis/src/hayabusa/apps/hyb1pds4gen/tsts/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
BLANKS = "%-6s"    

LENGTH = "%-40s"



include $(ISISROOT)/make/isismake.tststree

isis/src/hayabusa/apps/hyb1pds4gen/tsts/amicaitokawa2diof/Makefile

0 → 100644
+25 −0
Original line number Diff line number Diff line 
APPNAME = hyb1pds4gen



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/corrected_iof_st_2459265790_w.cub \

		   to=$(OUTPUT)/corrected_iof_st_2459265790_w.img \

		   pds4logical="urn:nasa:pds:mybundle:mycollection:myproduct" \

		   > /dev/null;



	# Remove parts of output that can occur in any order and convert to txt for comparison

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

	       $(OUTPUT)/corrected_iof_st_2459265790_w.xml \

	       > $(OUTPUT)/tempLabel1.txt;

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

	       $(OUTPUT)/tempLabel1.txt \

	       > $(OUTPUT)/tempLabel2.txt;

	$(SED) 's+\<description>Created PDS4 output product from ISIS cube.*<+\<description>Created PDS4 output product from ISIS cube.<+' \

	       $(OUTPUT)/tempLabel2.txt \

	       > $(OUTPUT)/corrected_iof_st_2459265790_w.xmlLabel.txt;



	$(RM) $(OUTPUT)/corrected_iof_st_2459265790_w.xml > /dev/null; 

	$(RM) $(OUTPUT)/tempLabel1.txt > /dev/null; 

	$(RM) $(OUTPUT)/tempLabel2.txt > /dev/null;

isis/src/hayabusa/apps/hyb1pds4gen/tsts/mars/Makefile

0 → 100644
+25 −0
Original line number Diff line number Diff line 
APPNAME = hyb1pds4gen



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/st_0515854093_p.cub \

		   to=$(OUTPUT)/st_0515854093_p.img \

		   pds4logical="urn:nasa:pds:mybundle:mycollection:myproduct" \

		   > /dev/null;



	# Remove parts of output that can occur in any order and convert to txt for comparison

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

	       $(OUTPUT)/st_0515854093_p.xml \

	       > $(OUTPUT)/tempLabel1.txt;

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

	       $(OUTPUT)/tempLabel1.txt \

	       > $(OUTPUT)/tempLabel2.txt;

	$(SED) 's+\<description>Created PDS4 output product from ISIS cube.*<+\<description>Created PDS4 output product from ISIS cube.<+' \

	       $(OUTPUT)/tempLabel2.txt \

	       > $(OUTPUT)/st_0515854093_p.xmlLabel.txt;



	$(RM) $(OUTPUT)/st_0515854093_p.xml > /dev/null; 

	$(RM) $(OUTPUT)/tempLabel1.txt > /dev/null; 

	$(RM) $(OUTPUT)/tempLabel2.txt > /dev/null;