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.12 by afanfani, Thu Oct 2 12:54:51 2008 UTC vs.
Revision 1.19 by spiga, Thu Jan 15 18:21:51 2009 UTC

# Line 4 | Line 4 | _LFNBaseName_
4   """
5  
6   from crab_exceptions import *
7 < from crab_util import runCommand
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[0] == '/' ):  PrimaryDataset=PrimaryDataset[1:]  
22 >   # lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
23 >    lfnbase = os.path.join(forced_path, getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset)
24  
25      return lfnbase
26  
# Line 26 | Line 28 | def getUnixUserName():
28      """
29      extract username from whoami
30      """
31 <    try:
30 <        UserName = runCommand("whoami")
31 <        UserName = string.strip(UserName)
32 <    except:
33 <        msg = "Error. Problem with whoami command"
34 <        raise CrabException(msg)
35 <    return UserName
31 >    return UnixUserName()
32  
33   def getDN():
34      """
# Line 95 | Line 91 | def gethnUserName():
91                 nameuser = line
92             userfile.close()
93             nameuser = string.strip(nameuser)
94 <    return nameuser  
94 >    return nameuser
95  
96   def getUserName(LocalUser=False):
97      """

Diff Legend

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