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.14 by fanzago, Wed Oct 15 18:45:30 2008 UTC vs.
Revision 1.16 by fanzago, Thu Oct 23 17:07:22 2008 UTC

#	Line 10 | Line 10 | import os, string, time
10		from ProdCommon.SiteDB.SiteDB import SiteDBJSON
11
12
13	<	def LFNBase(PrimaryDataset='',ProcessedDataset='',merged=True,LocalUser=False,publish=False):
13	>	def LFNBase(lfn, 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 )
22	<	### for tutorial
23	<	lfnbase = os.path.join(lfnbase, "user/test", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
21	>	# lfnbase = os.path.join(lfnbase, "user", getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset )
22	>	lfnbase = os.path.join(lfn, getUserName(LocalUser=LocalUser), PrimaryDataset, ProcessedDataset)
23
24		return lfnbase
25

Diff Legend

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