Commit 8e767851 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

PROG: Fixed an error in edrget caused by the server. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7424 41f8697f-d340-4b68-9986-7bafba869bb8
parent 3a1128b0

isis/src/base/apps/edrget/edrget.cpp

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ void IsisMain() { 
  QUrl qurl(guiURL);



  //test if scheme is ftp or http

  if (qurl.scheme().toLower() == "ftp" || qurl.scheme().toLower() == "http") {

  if (qurl.scheme().toLower() == "ftp" || qurl.scheme().toLower() == "http" || 

      qurl.scheme().toLower() == "https") {



    if (ui.IsInteractive()) {

      QString parameters = "URL=" + guiURL;

isis/src/base/apps/edrget/edrget.xml

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ xsi:noNamespaceSchemaLocation= 
    <change name="Ian Humphrey" date="2016-04-14">

        Replaced httpget and ftpget classes with ResourceGet class for updating to Qt5.

    </change>

    <change name="Makayla Shepherd" date="2017-03-02">

        Added https to reflect changes in the server.

    </change>

  </history>

isis/src/base/apps/edrget/tsts/connectErrors/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ commands: 
	  true; \

	fi;

	if [ `$(APPNAME) \

	  url=http://pdsimage2.wr.usgs.gov/cdroms/Viking_Orbiter/vo_1004/f253sxx/f26.imq \

	  url=https://pdsimage2.wr.usgs.gov/cdroms/Viking_Orbiter/vo_1004/f253sxx/f26.imq \

	  topath=$(OUTPUT) \

	  >& $(OUTPUT)/httpFileDNEtmp.txt` ]; then \

	  true; \

isis/src/base/apps/edrget/tsts/timeout/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ commands: 
	$(APPNAME) URL=ftp://pdsimage2.wr.usgs.gov/cdroms/Viking_Orbiter/vo_1004/f253sxx/f253s05.imq TOPATH=$(OUTPUT) TIMEOUT=6 >& $(OUTPUT)/temp.txt;

	$(SED) 's/.*Timeout/Timeout/' < $(OUTPUT)/temp.txt > $(OUTPUT)/temp1.txt;

	$(TAIL) '-2' < $(OUTPUT)/temp1.txt > $(OUTPUT)/ftperror.txt;

	$(APPNAME) URL=http://pdsimage2.wr.usgs.gov/cdroms/Viking_Orbiter/vo_1004/f253sxx/f253s05.imq TOPATH=$(OUTPUT) TIMEOUT=6 >& $(OUTPUT)/temp.txt;

	$(APPNAME) URL=https://pdsimage2.wr.usgs.gov/cdroms/Viking_Orbiter/vo_1004/f253sxx/f253s05.imq TOPATH=$(OUTPUT) TIMEOUT=6 >& $(OUTPUT)/temp.txt;

	$(SED) 's/.*Timeout/Timeout/' < $(OUTPUT)/temp.txt > $(OUTPUT)/temp1.txt;

	$(TAIL) '-2' < $(OUTPUT)/temp1.txt > $(OUTPUT)/httperror.txt;

	$(RM) $(OUTPUT)/temp.txt;