From Jan-Fiete: make a couple of adjustments and add a couple of protections

git-svn-id: http://root.cern.ch/svn/root/trunk@23453 27541ba8-7e3a-0410-8455-c3a389f83636

net/net/src/TFileStager.cxx

@@ -125,9 +125,14 @@ Bool_t TFileStager::IsStaged(const char *f)
    TUrl u(f);
    u.SetOptions("filetype=raw");
    TFile *ff = TFile::Open(u.GetUrl());
-   Bool_t rc = (ff && !ff->IsZombie()) ? kTRUE : kFALSE;
-   ff->Close();
-   delete ff;
+   Bool_t rc = kTRUE;
+   if (!ff || ff->IsZombie()) {
+      rc = kFALSE;
+      if (ff) {
+         ff->Close();
+         delete ff;
+      }
+   }
    // Done
    return rc;
 }
@@ -158,6 +163,15 @@ TString TFileStager::GetPathName(TObject *o)
    } else if (cn == "TFileInfo") {
       TFileInfo *fi = (TFileInfo *)o;
       pathname = (fi->GetCurrentUrl()) ? fi->GetCurrentUrl()->GetUrl() : "";
+      if (fi->GetCurrentUrl()) {
+         if (strlen(fi->GetCurrentUrl()->GetAnchor()) > 0) {
+            TUrl url(*(fi->GetCurrentUrl()));
+            url.SetAnchor("");
+            pathname = url.GetUrl();
+         }
+      } else {
+         pathname = fi->GetCurrentUrl()->GetUrl();
+      }
    }
 
    // Done

proof/proof/src/TProofDataSetManagerFile.cxx

@@ -169,6 +169,10 @@ Bool_t TProofDataSetManagerFile::BrowseDataSets(const char *group,
    Bool_t exporting = (option & kExport) ? kTRUE : kFALSE;
    Bool_t updating = (option & kQuotaUpdate) ? kTRUE : kFALSE;
 
+   // If printing is required add kReadShort to the options
+   if (printing || updating)
+      option |= kReadShort;
+
    // The last three options are mutually exclusive
    if (((Int_t)printing + (Int_t)exporting + (Int_t)updating) > 1) {
       Error("BrowseDataSets",
@@ -794,7 +798,7 @@ Int_t TProofDataSetManagerFile::ScanDataSet(TFileCollection *dataset,
                  fileInfo->GetCurrentUrl()->GetUrl());
 
          // Check if file is still available, if touch is set actually read from the file
-         TFile *file = TFile::Open(Form("%s?filetype=rawmxredir=7", url.GetUrl()));
+         TFile *file = TFile::Open(Form("%s?filetype=raw&mxredir=2", url.GetUrl()));
          if (file) {
             if (touch) {
                // Actually access the file