Commit 35c16594 authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Modified the versioner to omit a blank, null, or nonexistent choosername from output.

parent d52c3b2c

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp

+4 −5
Original line number Diff line number Diff line
@@ -242,12 +242,10 @@ namespace Isis { 
      else {

        pvlPoint += PvlKeyword("PointId", controlPoint->GetId());

      }

      if ( controlPoint->HasChooserName() ) {

      if ( controlPoint->HasChooserName()

           && controlPoint->GetChooserName() != "Null" ) {

        pvlPoint += PvlKeyword("ChooserName", controlPoint->GetChooserName());

      }

      else {

        pvlPoint += PvlKeyword("ChooserName", "");

      }

      if ( controlPoint->HasDateTime() ) {

        pvlPoint += PvlKeyword("DateTime", controlPoint->GetDateTime());

      }
@@ -1659,7 +1657,8 @@ namespace Isis { 
        protoPoint.set_id(controlPoint->GetId().toLatin1().data());

      }



      if ( controlPoint->HasChooserName() ) {

      if ( controlPoint->HasChooserName()

           && controlPoint->GetChooserName() != "Null" ) {

        protoPoint.set_choosername(controlPoint->GetChooserName().toLatin1().data());

      }

      if ( controlPoint->HasDateTime() ) {