Commit ee65fb7a authored by Tyler Wilson's avatar Tyler Wilson Committed by Stuart Sides
Browse files

Added fix to Spice Server to accept clients with version nums >=3.5.*.* (#780)

parent 4a763700

isis/src/base/apps/spiceserver/main.cpp

+11 −6
Original line number Diff line number Diff line
@@ -149,13 +149,18 @@ void IsisMain() { 
      throw IException(IException::User, msg, _FILEINFO_);

    }



    if ( ui.GetBoolean("CHECKVERSION") && otherVersion != Application::Version() ) {

      QString msg = "The SPICE server only supports the latest Isis version [" +

                    Application::Version() + "], version [" + otherVersion +

                    "] is not compatible";



    if (ui.GetBoolean("CHECKVERSION") ) {

      QStringList remoteVersion = otherVersion.split(QRegExp("\\s+"))[0].split(QRegExp("\\."));

      if ( remoteVersion[1].toInt() < 5) {



       QString msg ="The SPICE server only supports Isis versions greater than or equal to 3.5.*.*.";

               msg += "Your version:   [" + otherVersion + "] is not compatible";

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



      }



    }

    // This next section looks a lot like spiceinit, its semi-duplicated because

    //   I did not want users to be able to spiceinit a label without cube

    //   data.

isis/src/base/apps/spiceserver/spiceserver.xml

+6 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>



<application name="spiceserver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">

<application name="spiceserver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">

  <brief>

    Spiceinit Server

  </brief>
@@ -50,6 +51,10 @@ 
    <change name="Makayla Shepherd" date="2015-09-08">

      Modified to open the temporary cube correctly. Fixes #2213.

    </change>

    <change name="Tyler Wilson" date="2019-02-11">

      Modified the version check.  Now all versions of ISIS3 >= 3.5.*.* will be acceptable

      to the application.

    </change>

  </history>



  <groups>