Merge pull request #733 from ViniciusCampanha/alpha5

Missing folder argument in GrADS accessor
TerraMA2 · Nov 18, 2016 · e1e8df2 · e1e8df2
2 parents 1c06d2f + a5a53a0
commit e1e8df2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/terrama2/impl/DataAccessorFile.cpp b/src/terrama2/impl/DataAccessorFile.cpp
@@ -76,7 +76,7 @@ std::string terrama2::core::DataAccessorFile::retrieveData(const DataRetrieverPt
 
   try
   {
-    folderPath = getProperty(dataset, dataSeries_, "folder", false);
+    folderPath = getFolderMask(dataset);
   }
   catch(UndefinedTagException& /*e*/)
   {

diff --git a/src/terrama2/impl/DataAccessorGrADS.cpp b/src/terrama2/impl/DataAccessorGrADS.cpp
@@ -99,8 +99,19 @@ std::string terrama2::core::DataAccessorGrADS::retrieveData(const DataRetrieverP
                                                             const Filter& filter,
                                                             std::shared_ptr<FileRemover> remover) const
 {
+  std::string folderPath = "";
+
+  try
+  {
+    folderPath = getFolderMask(dataset);
+  }
+  catch(UndefinedTagException& /*e*/)
+  {
+    // Do nothing
+  }
+
   std::string mask = getCtlFilename(dataset);
-  std::string uri = dataRetriever->retrieveData(mask, filter, remover);
+  std::string uri = dataRetriever->retrieveData(mask, filter, remover, "", folderPath);
 
   QUrl url(QString::fromStdString(uri));
   QDir dir(url.path());
@@ -118,7 +129,7 @@ std::string terrama2::core::DataAccessorGrADS::retrieveData(const DataRetrieverP
 
     datasetMask = grad2TerramaMask(datasetMask.c_str()).toStdString();
 
-    dataRetriever->retrieveData(datasetMask, filter, remover, uri);
+    dataRetriever->retrieveData(datasetMask, filter, remover, uri, folderPath);
   }
 
   return uri;

diff --git a/src/terrama2/impl/DataAccessorGrADS.hpp b/src/terrama2/impl/DataAccessorGrADS.hpp
@@ -167,7 +167,8 @@ namespace terrama2
          \return The URI to retrieved data.
         */
         std::string
-        retrieveData(const DataRetrieverPtr dataRetriever, DataSetPtr dataSet, const Filter& filter, std::shared_ptr<FileRemover> remover) const override;
+        retrieveData(const DataRetrieverPtr dataRetriever, DataSetPtr dataSet, const Filter& filter,
+                     std::shared_ptr<FileRemover> remover) const override;
 
         /*
          \brief Returns a smart pointer to a DataAccessorGrADS.
-Original file line number
+Diff line change
@@ Expand Up @@
       try
       {
-        folderPath = getProperty(dataset, dataSeries_, "folder", false);
+        folderPath = getFolderMask(dataset);
       }
       catch(UndefinedTagException& /*e*/)
       {
@@ Expand Down @@