ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/LFNBaseName.py
(Generate patch)

Comparing COMP/CRAB/python/LFNBaseName.py (file contents):
Revision 1.13 by spiga, Fri Oct 10 15:41:14 2008 UTC vs.
Revision 1.20 by spiga, Thu Jan 22 18:19:14 2009 UTC

# Line 7 | Line 7 | from crab_exceptions import *
7   from crab_util import runCommand, UnixUserName
8   import common
9   import os, string, time
10 < from ProdCommon.SiteDB.SiteDB import SiteDBJSON
10 > from WMCore.Services.SiteDB.SiteDB import SiteDBJSON
11  
12  
13 < def LFNBase(PrimaryDataset='',ProcessedDataset='',merged=True,LocalUser=False,publish=False):
13 > def LFNBase(forced_path, PrimaryDataset='',ProcessedDataset='',merged=True,LocalUser=False,publish=False):
14      """
15      """
16 <    lfnbase = "/store"
17 <    if not merged:
18 <        lfnbase = os.path.join(lfnbase,"tmp")
16 >    #lfnbase = "/store"
17 >    #if not merged:
18 >        #lfnbase = os.path.join(lfnbase,"tmp")
19      if (PrimaryDataset == 'null'):
20          PrimaryDataset = ProcessedDataset
21 <    lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
21 >    if PrimaryDataset != '':
22 >        if ( PrimaryDataset[0] == '/' ):  PrimaryDataset=PrimaryDataset[1:]  
23 >   # lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
24 >    lfnbase = os.path.join(forced_path, getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset)
25  
26      return lfnbase
27  
# Line 89 | Line 92 | def gethnUserName():
92                 nameuser = line
93             userfile.close()
94             nameuser = string.strip(nameuser)
95 <    return nameuser  
95 >    return nameuser
96  
97   def getUserName(LocalUser=False):
98      """

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines