Commit 605f47b6 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Merge branch 'CaSSIS_Pipeline' of https://github.com/USGS-Astrogeology/ISIS3 into rdrgenProductId

parents fd7e7edf 869b9e94

isis/src/base/objs/Application/Application.cpp

+0 −8
Original line number Diff line number Diff line
@@ -102,14 +102,6 @@ namespace Isis { 
    strncpy(env, "LANG=en_US", 1023);

    putenv(env);



    // Verify ISISROOT was set

    if (getenv("ISISROOT") == NULL || QString(getenv("ISISROOT")) == "") {

      QString message = "Please set ISISROOT before running any Isis "

          "applications";

      cerr << message << endl;

      abort();

    }



    // Get the starting cpu time, direct I/Os, page faults, and swaps

    //p_startClock = clock();

    p_startDirectIO = DirectIO();

isis/src/base/objs/Isis/Isis.h

+9 −1
Original line number Diff line number Diff line
@@ -107,6 +107,14 @@ void InterruptSignal(int); 
 * @return int

 */

int main(int argc, char *argv[]) {

  // Verify ISISROOT was set

  // Note: as printing and logging IExceptions requires ISISROOT to be set (for preferences),

  //       The case below cannot be handled with IExceptions

  if (getenv("ISISROOT") == NULL || QString(getenv("ISISROOT")) == "") {

    std::cerr << "Please set ISISROOT before running any Isis applications" << std::endl;

    exit(1);

  }



#ifdef CWDEBUG

  startMonitoringMemory();

  signal(SIGSEGV, SegmentationFault);

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

+14 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ namespace Isis { 


    QString xmlModel;

    xmlModel += "href=\"http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.sch\" ";

    xmlModel += "schemetypens=\"http://purl.oclc.org/dsdl/schematron\"";

    xmlModel += "schematypens=\"http://purl.oclc.org/dsdl/schematron\"";

    QDomProcessingInstruction header =

        m_domDoc->createProcessingInstruction("xml-model", xmlModel);

    m_domDoc->appendChild(header);
@@ -404,7 +404,7 @@ namespace Isis { 
    xmlModel +=  xmlnsURI;

    xmlModel +=  "/";

    xmlModel +=  sch;

    xmlModel += "\" schemetypens=\"http://purl.oclc.org/dsdl/schematron\"";

    xmlModel += "\" schematypens=\"http://purl.oclc.org/dsdl/schematron\"";

    QDomProcessingInstruction header =

        m_domDoc->createProcessingInstruction("xml-model", xmlModel);

    m_domDoc->insertAfter(header, m_domDoc->firstChild());
@@ -753,9 +753,18 @@ namespace Isis { 
    // Create the "Modification_Detail" element and add it to the end of the

    // "Modification_History" element.

    QDomElement detailElement = m_domDoc->createElement("Modification_Detail");

    detailElement.setAttribute("description", description);

    detailElement.setAttribute("modification_date", date);

    detailElement.setAttribute("version_id", version);



    QDomElement modDateElement = m_domDoc->createElement("modification_date");

    PvlToXmlTranslationManager::setElementValue(modDateElement, date);

    detailElement.appendChild(modDateElement);



    QDomElement versionIdElement = m_domDoc->createElement("version_id");

    PvlToXmlTranslationManager::setElementValue(versionIdElement, version);

    detailElement.appendChild(versionIdElement);



    QDomElement descriptionElement = m_domDoc->createElement("description");

    PvlToXmlTranslationManager::setElementValue(descriptionElement, description);

    detailElement.appendChild(descriptionElement);



    historyElement.insertAfter( detailElement,

                                historyElement.lastChildElement() );

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

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ namespace Isis { 
   *   @history 2018-02-05 Kristin Berry - Updated WritePds4 to remove the .xml and add a .img

   *                           if the user inputs something of the form filename.xml as the image

   *                           output name. 

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

   *                           attributes to elements. Matches pds validate tool specifations.

   */



  class ProcessExportPds4: public Isis::ProcessExport {

isis/src/base/objs/iTime/iTime.truth

+19 −0
Original line number Diff line number Diff line
@@ -18,6 +18,25 @@ Unit test for iTime 
   Et          = 94781765.3

   UTC         = 2003-01-02T12:15:01.1234



  Test of date = 2003/01/02 12:15:01.1234Z

   Year        = 2003

   Year        = 2003

   Month       = 1

   Month       = 1

   Day         = 2

   Day         = 2

   Hour        = 12

   Hour        = 12

   Minute      = 15

   Minute      = 15

   Second      = 1.1234

   Second      = 1.1234

   Day of Year = 2

   Day of Year = 2

   Et          = 94781765.307363

   Et          = 94781765.3

   UTC         = 2003-01-02T12:15:01.1234



  Test of date = 2000-12-31T23:59:01.6789

   Year        = 2000

   Year        = 2000