ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/LFNBaseName.py

Comparing COMP/CRAB/python/LFNBaseName.py (file contents):
Revision 1.4 by afanfani, Tue May 27 19:08:17 2008 UTC vs.
Revision 1.5 by afanfani, Wed May 28 13:01:17 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 76 | Line 75 | def gethnUserName():
75		raise CrabException(msg)
76		return hnUserName
77
78	<	def getUserName():
78	>	def getUserName(LocalUser=False):
79		"""
80		extract user name from either SiteDB or Unix
81		"""
82	<	try:
83	<	UserName=gethnUserName()
84	<	except:
85	<	common.logger.message("==> Using as username the Unix user name")
86	<	UserName=getUnixUserName()
82	>	if LocalUser:
83	>	common.logger.message("==> Using as username the Unix user name")
84	>	UserName=getUnixUserName()
85	>	return UserName
86	>
87	>	UserName=gethnUserName()
88		return UserName
89
90		if __name__ == '__main__' :

Diff Legend

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