Merge remote-tracking branch 'origin/feature/8126_icat4_external_down…

…load'

Conflicts:
	Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
refs #8126

.gitattributes

@@ -8,6 +8,6 @@
 *.xml              hooks.MaxObjectKiB130902=2048
 
 # Allowing gSoap generated files to be committed.
-/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h              hooks.MaxObjectKiB130819=2048 
-/Code/Mantid/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp                       hooks.MaxObjectKiB130819=5120
-/Code/Mantid/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp                       hooks.MaxObjectKiB130819=2048
+/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h              hooks.MaxObjectKiB131025=2048 
+/Code/Mantid/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp                       hooks.MaxObjectKiB131025=5120
+/Code/Mantid/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp                       hooks.MaxObjectKiB131025=2048

Code/Mantid/Framework/ICat/inc/MantidICat/CatalogDownloadDataFiles.h

@@ -82,8 +82,8 @@ namespace Mantid
       void exec();
       /// get location of data file  or download method
       int doDownload( ICATPortBindingProxy & icat);
-      /// True if the stream is considered binary, false otherwise
-      bool isBinary(std::istream& stream);
+      /// True if the extension of the file is a datafile.
+      bool isDataFile(const std::string& fileName);
       /// Saves the downloaded file to disc
       std::string saveFiletoDisk(std::istream& rs,const std::string &fileName);
       /// Saves downloaded file to local disk

Code/Mantid/Framework/ICat/src/CatalogDownloadDataFiles.cpp

@@ -16,7 +16,6 @@ if the data archive is not accessible, it downloads the files from the data serv
 #include "MantidAPI/ICatalog.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
-#include "MantidKernel/FileDescriptor.h"
 
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/HTTPRequest.h>
@@ -157,13 +156,25 @@ namespace Mantid
     }
 
     /**
-     * Checks to see if the file to be downloaded is a datafile.
-     * @param stream ::  input stream
-     * @returns True if the stream is not considered ASCII (e.g. binary), false otherwise
-     */
-    bool CatalogDownloadDataFiles::isBinary(std::istream& stream)
+    * Checks to see if the file to be downloaded is a datafile.
+    * @param fileName :: Name of data file to download.
+    * @returns True if the file is a data file.
+    */
+    bool CatalogDownloadDataFiles::isDataFile(const std::string & fileName)
     {
-      return !FileDescriptor::isAscii(stream);
+      std::string extension = Poco::Path(fileName).getExtension();
+      std::transform(extension.begin(),extension.end(),extension.begin(),tolower);
+
+      std::cerr << "The extension of this file is: " << extension << "\n";
+
+      if (extension.compare("raw") == 0 || extension.compare("nxs") == 0)
+      {
+        return true;
+      }
+      else
+      {
+        return false;
+      }
     }
 
     /**
@@ -232,7 +243,7 @@ namespace Mantid
       Poco::Path path(downloadPath, fileName);
       std::string filepath = path.toString();
 
-      std::ios_base::openmode mode = isBinary(rs) ? std::ios_base::binary : std::ios_base::out;
+      std::ios_base::openmode mode = isDataFile(fileName) ? std::ios_base::binary : std::ios_base::out;
 
       std::ofstream ofs(filepath.c_str(), mode);
       if ( ofs.rdstate() & std::ios::failbit )