Skip to content
Snippets Groups Projects
Commit 7325d5b9 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

GetName() for dCache and Chirp files now return full url that was used

in TFile::Open(). Consistent with TRFIOFile, TNetFile and TWebFile.


git-svn-id: http://root.cern.ch/svn/root/trunk@6879 27541ba8-7e3a-0410-8455-c3a389f83636
parent 79d1449f
No related branches found
No related tags found
No related merge requests found
...@@ -69,9 +69,7 @@ TChirpFile::TChirpFile(const char *path, Option_t *option, ...@@ -69,9 +69,7 @@ TChirpFile::TChirpFile(const char *path, Option_t *option,
goto zombie; goto zombie;
} }
SetName(path_part); fname = path_part;
fname = GetName();
fRealName = fname; fRealName = fname;
......
// @(#)root/dcache:$Name: $:$Id: TDCacheFile.cxx,v 1.6 2003/04/28 10:18:38 rdm Exp $ // @(#)root/dcache:$Name: $:$Id: TDCacheFile.cxx,v 1.7 2003/05/05 09:36:27 rdm Exp $
// Author: Grzegorz Mazur 20/01/2002 // Author: Grzegorz Mazur 20/01/2002
/************************************************************************* /*************************************************************************
...@@ -66,7 +66,8 @@ TDCacheFile::TDCacheFile(const char *path, Option_t *option, ...@@ -66,7 +66,8 @@ TDCacheFile::TDCacheFile(const char *path, Option_t *option,
fOption = "READ"; fOption = "READ";
} }
const char *fname; TString stmp;
char *fname;
if (!strncmp(path, DCAP_PREFIX, DCAP_PREFIX_LEN)) { if (!strncmp(path, DCAP_PREFIX, DCAP_PREFIX_LEN)) {
// Ugh, no PNFS support // Ugh, no PNFS support
...@@ -74,14 +75,13 @@ TDCacheFile::TDCacheFile(const char *path, Option_t *option, ...@@ -74,14 +75,13 @@ TDCacheFile::TDCacheFile(const char *path, Option_t *option,
Error("TDCacheFile", "Without PNFS support only reading access is allowed."); Error("TDCacheFile", "Without PNFS support only reading access is allowed.");
goto zombie; goto zombie;
} }
SetName(path); fname = path;
fname = GetName();
} else { } else {
// Metadata provided by PNFS // Metadata provided by PNFS
if ((fname = gSystem->ExpandPathName(path))) { if ((fname = gSystem->ExpandPathName(path))) {
SetName(fname); stmp = fname;
delete [] (char*)fname; delete [] fname;
fname = GetName(); fname = (char *)stmp.Data();
} else { } else {
Error("TDCacheFile", "error expanding path %s", path); Error("TDCacheFile", "error expanding path %s", path);
goto zombie; goto zombie;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment