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.9 by ewv, Tue Jul 8 19:34:00 2008 UTC vs.
Revision 1.11 by spiga, Sun Sep 21 10:36:13 2008 UTC

#	Line 10 | Line 10 | import os, string
10		from ProdCommon.SiteDB.SiteDB import SiteDBJSON
11
12
13	<	def LFNBase(ProcessedDataset,merged=True,LocalUser=False):
13	>	def LFNBase(PrimaryDataset='',ProcessedDataset='',merged=True,LocalUser=False,publish=False):
14		"""
15		"""
16		lfnbase = "/store"
17		if not merged:
18		lfnbase = os.path.join(lfnbase,"tmp")
19	<	lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), ProcessedDataset )
19	>	if (PrimaryDataset == 'null'):
20	>	PrimaryDataset = ProcessedDataset
21	>	lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
22
23		return lfnbase
24
23	–	def PFNportion(ProcessedDataset,LocalUser=False):
24	–	pfnpath = os.path.join(getUserName(LocalUser=LocalUser), ProcessedDataset )
25	–	return pfnpath
26	–
25		def getUnixUserName():
26		"""
27		extract username from whoami
#	Line 75 | Line 73 | def getUserName(LocalUser=False):
73		extract user name from either SiteDB or Unix
74		"""
75		if LocalUser:
76	<	common.logger.message("==> Using as username the Unix user name")
76	>	common.logger.debug(10,"Using as username the Unix user name")
77		UserName=getUnixUserName()
78		return UserName
79

Diff Legend

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