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.10 by fanzago, Wed Aug 20 12:43:43 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):
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	>	#lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), ProcessedDataset )
20	>	### FEDE FOR NEW LFN ###
21	>	if (PrimaryDataset == 'null'):
22	>	PrimaryDataset = ProcessedDataset
23	>	lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
24	>	########################
25
26		return lfnbase
27
28	<	def PFNportion(ProcessedDataset,LocalUser=False):
29	<	pfnpath = os.path.join(getUserName(LocalUser=LocalUser), ProcessedDataset )
28	>	def PFNportion(PrimaryDataset,ProcessedDataset,LocalUser=False):
29	>	### FEDE FOR NEW LFN ###
30	>	#pfnpath = os.path.join(getUserName(LocalUser=LocalUser), ProcessedDataset )
31	>	pfnpath = os.path.join(getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
32	>	########################
33		return pfnpath
34
35		def getUnixUserName():

Diff Legend

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