Commit c534e327 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Updated XmlToPvlTranslationManager to handle multiple InputPosition values

parent 15b4c7c3

isis/src/base/objs/XmlToPvlTranslationManager/XmlToPvlTranslationManager.cpp

+0 −26
Original line number Diff line number Diff line
@@ -285,32 +285,6 @@ namespace Isis { 
      }

    }



/*    for (int i = 0; i < inputPosition. csize(); i++) {

      QString childName = inputPosition[i];

      inputParentElement = inputParentElement.firstChildElement(childName);

      if(inputParentElement.isNull()) {

        if ( hasInputDefault(outputName) ) {

          if (isDebug) {

            cout << endl << "Could not traverse input position, " <<

                            "using default value: " <<

                            InputDefault(outputName) << endl;

          }

          return PvlTranslationTable::Translate( outputName );

        }

        else {

          QString msg = "Failed traversing input position. [" +

                        inputPosition.name() + "] element does not have a child element named [" +

                        childName + "].";

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

        }

      }

      if (isDebug) {

        indent += "  ";

        cout << indent << inputParentElement.tagName() << endl;

      }

    }*/





    QDomElement inputKeyElement = inputParentElement.firstChildElement(inputKey);

    if (isDebug) {

      indent += "  ";

isis/src/base/objs/XmlToPvlTranslationManager/XmlToPvlTranslationManager.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ namespace Isis { 
   *  @history 2017-01-18 Jesse Mapel - Updated documentation and error messages. Fixes #4584.

   *  @history 2017-01-25 Jesse Mapel - Created unit test. Fixes #4584.

   *  @history 2017-05-26 Makayla Shepherd - Renamed XmlToPvlTranslationManager.

   *  @history 2018-02-15 Kristin Berry and Summer Stapleton - Updated translate() method to search

   *                          for multiple values for InputPosition keyword. Fixes #

   */

  class XmlToPvlTranslationManager : public LabelTranslationManager {

    public: