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.4 by afanfani, Tue May 27 19:08:17 2008 UTC vs.
Revision 1.6 by afanfani, Wed May 28 18:18:05 2008 UTC

# Line 9 | Line 9 | import common
9   import os, string
10  
11  
12 < def LFNBase(ProcessedDataset,merged=True):
12 > def LFNBase(ProcessedDataset,merged=True,LocalUser=False):
13      """
14      """
15      lfnbase = "/store"
16      if not merged:
17          lfnbase = os.path.join(lfnbase,"tmp")  
18 < #    lfnbase = os.path.join(lfnbase, "user", gethnUserName(), ProcessedDataset )
19 <    lfnbase = os.path.join(lfnbase, "user", getUserName(), ProcessedDataset )
18 >    lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), ProcessedDataset )
19 >      
20      return lfnbase
21  
22 < def PFNportion(ProcessedDataset):
23 < #    pfnpath = os.path.join(gethnUserName(), ProcessedDataset )
24 <    pfnpath = os.path.join(getUserName(), ProcessedDataset )
22 > def PFNportion(ProcessedDataset,LocalUser=False):
23 >    pfnpath = os.path.join(getUserName(LocalUser=LocalUser), ProcessedDataset )
24      return pfnpath
25  
26   def getUnixUserName():
# Line 63 | Line 62 | def gethnUserName():
62          try:
63              userinfo= eval(udata)
64          except StandardError, ex:
65 <            msg = "Error. Problem extracting user name from %s : %s"%(sitedburl,ex)
65 >            msg = "Error. Problem extracting user name from %s : %s \n SiteDB call output: \n %s"%(sitedburl,ex,udata)
66              raise CrabException(msg)
67          hnUserName = userinfo['user']
68      except:
69 <        msg = "Error. Problem extracting user name from %s"%sitedburl
70 <        msg += "Check that you are registered in SiteDB, see https://twiki.cern.ch/twiki/bin/view/CMS/SiteDBForCRAB"
69 >        msg = "Error. Problem extracting user name from %s "%sitedburl
70 >        msg += "\n Check that you are registered in SiteDB, see https://twiki.cern.ch/twiki/bin/view/CMS/SiteDBForCRAB"
71 >        msg += "\n SiteDB call output: \n %s"%udata
72          raise CrabException(msg)
73      if not hnUserName:
74          msg = "Error. There is no user name associated to DN %s in %s. You need to register in SiteDB with the instructions at https://twiki.cern.ch/twiki/bin/view/CMS/SiteDBForCRAB"%(userdn,sitedburl)
# Line 76 | Line 76 | def gethnUserName():
76          raise CrabException(msg)
77      return hnUserName
78  
79 < def getUserName():
79 > def getUserName(LocalUser=False):
80      """
81      extract user name from either SiteDB or Unix
82      """
83 <    try:
84 <      UserName=gethnUserName()
85 <    except:
86 <      common.logger.message("==> Using as username the Unix user name")
87 <      UserName=getUnixUserName()
83 >    if LocalUser:
84 >       common.logger.message("==> Using as username the Unix user name")
85 >       UserName=getUnixUserName()
86 >       return UserName
87 >    
88 >    UserName=gethnUserName()
89      return UserName
90  
91   if __name__ == '__main__' :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines