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.18 by ewv, Fri Oct 24 16:02:48 2008 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 >   # lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
22 >    lfnbase = os.path.join(forced_path, getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset)
23  
24      return lfnbase
25  
# Line 89 | Line 90 | def gethnUserName():
90                 nameuser = line
91             userfile.close()
92             nameuser = string.strip(nameuser)
93 <    return nameuser  
93 >    return nameuser
94  
95   def getUserName(LocalUser=False):
96      """

Diff Legend

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