Merge branch 'url-path-bug' of https://github.com/alja/xrootd

xrootd · Dec 8, 2014 · 66c6a41 · 66c6a41
2 parents cd677f3 + 84a9e7b
commit 66c6a41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/src/XrdFileCache/XrdFileCache.cc b/src/XrdFileCache/XrdFileCache.cc
@@ -21,6 +21,7 @@
 #include <sys/statvfs.h>
 
 #include "XrdCl/XrdClConstants.hh"
+#include "XrdCl/XrdClURL.hh"
 #include "XrdSys/XrdSysPthread.hh"
 #include "XrdOss/XrdOss.hh"
 #include "XrdOuc/XrdOucEnv.hh"
@@ -99,23 +100,10 @@ void Cache::Detach(XrdOucCacheIO* io)
 //______________________________________________________________________________
 
 
-bool Cache::getFilePathFromURL(const char* url, std::string &result) const
+void Cache::getFilePathFromURL(const char* iUrl, std::string &result) const
 {
-   std::string path = url;
-   size_t split_loc = path.rfind("//");
-
-   if (split_loc == path.npos)
-      return false;
-
-   size_t kloc = path.rfind("?");
-
-   if (kloc == path.npos)
-      return false;
-
-   result = Factory::GetInstance().RefConfiguration().m_cache_dir;
-   result += path.substr(split_loc+1,kloc-split_loc-1);
-
-   return true;
+   XrdCl::URL url(iUrl);
+   result = Factory::GetInstance().RefConfiguration().m_cache_dir + url.GetPath();
 }
 
 //______________________________________________________________________________

diff --git a/src/XrdFileCache/XrdFileCache.hh b/src/XrdFileCache/XrdFileCache.hh
@@ -90,7 +90,7 @@ namespace XrdFileCache
          void Detach(XrdOucCacheIO *);
 
          //! Transfor URL to path on local disk.
-         bool getFilePathFromURL(const char* url, std::string& res) const;
+         void getFilePathFromURL(const char* url, std::string& res) const;
 
          //! Short log alias.
          XrdCl::Log* clLog() const { return XrdCl::DefaultEnv::GetLog(); }