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

Merge pull request #230 from kberryUSGS/CaSSIS_Pipeline 

Added xml schema for img xmlns and fix mosaic reingestion.
parents d18c5558 4215774d

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp

+9 −0
Original line number Diff line number Diff line
@@ -410,6 +410,15 @@ namespace Isis { 
                "http://pds.nasa.gov/pds4/sp/v1"); 

    }



    if ( (imageObject.compare("Array_2D_Image") == 0) || 

         (imageObject.compare("Array_3D_Image") == 0) ) {

      // Add header info

      addSchema("PDS4_IMG_1900.sch", 

                "PDS4_IMG_1900.xsd",

                "xmlns:img", 

                "http://pds.nasa.gov/pds4/img/v1"); 

    }

    

    QString translationFile = "$base/translations/pds4ExportBandBin";

    translationFile += imageObject.remove(0,9); // remove first 9 characters: Array_2D_ or Array_3D_

    translationFile += ".trn";

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ namespace Isis { 
   *                           output name. 

   *   @history 2018-05-16 Christopher Combs - Fixed typo in xml namespaces and changed History 

   *                           attributes to elements. Matches pds validate tool specifations.

   *   @history 2018-06-12 Kristin Berry - Added schema associated with the img class when it is

   *                           used.

   */



  class ProcessExportPds4: public Isis::ProcessExport {

isis/src/tgo/apps/tgocassis2isis/tgocassis2isis.cpp

+4 −10
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ void translateCoreInfo(FileName &inputLabel, ProcessImport &importer) { 
    translateCoreInfo(labelXlater, importer);

  } 

  catch (IException &e) {

    e.print();

    // if exported, use this!

    transFile = FileName(missionDir + "/translations/tgoCassisRdr.trn"); 

    XmlToPvlTranslationManager labelXlater(inputLabel, transFile.expanded());
@@ -206,7 +205,6 @@ bool translateMappingLabel(FileName xmlFileName, Cube *outputCube) { 
 *                   updated.

 */

bool translateMosaicLabel(FileName xmlFileName, Cube *outputCube) {

  //Now retrieve the logical_identifier to see if this is a mosaic

  QDomDocument xmlDoc;

    

  QFile xmlFile(xmlFileName.expanded());
@@ -236,24 +234,20 @@ bool translateMosaicLabel(FileName xmlFileName, Cube *outputCube) { 
      if (!logicalId.isNull()) {

        QString logicalIdText = logicalId.text();

        QStringList logicalIdStringList = logicalIdText.split(":");

        if (logicalIdStringList.contains("data_mos")) {

        if (logicalIdStringList.contains("data_mosaic")) {

          try {

            PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); 

            QString missionDir = (QString) dataDir["Tgo"];

            

            FileName bandBinTransFile(missionDir + "/translations/tgoCassisBandBin.trn");

            FileName bandBinTransFile(missionDir + "/translations/tgoCassisMosaicBandBin.trn");

            // Get the translation manager ready for translating the band bin label

            XmlToPvlTranslationManager labelXBandBinlater(xmlFileName, bandBinTransFile.expanded());



            // Pvl output label

            Pvl *outputLabel = outputCube->label();

            labelXBandBinlater.Auto(*(outputLabel));

            

            FileName mosaicTransFile(missionDir + "/translations/tgoCassisMosaic.trn");



            // Get the translation manager ready for translating the mapping label

            // Get the translation manager ready for translating the mosaic label

            XmlToPvlTranslationManager labelXMosaiclater(xmlFileName, mosaicTransFile.expanded());



            labelXMosaiclater.Auto(*(outputLabel));

            return true;

          }