ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/CRAB/python/PhEDExDatasvcInfo.py (file contents):
Revision 1.19 by fanzago, Fri Jan 30 13:19:25 2009 UTC vs.
Revision 1.21 by spiga, Fri Mar 6 18:37:04 2009 UTC

#	Line 103 | Line 103 | class PhEDExDatasvcInfo:
103		USER = (query.split('user')[1]).split('/')[1]
104		else:
105		#### to test #####
106	<	url = 'http://'+endpoint.split('://')[1]
107	<	scheme, host, path, params, query, fragment = urlparse(url)
108	<	SE = host.split(':')[0]
109	<	SE_PATH = endpoint.split(host)[1]
110	<	#SE = self.node
111	<	#SE_PATH = self.user_se_path + self.user_remote_dir
106	>	# url = 'http://'+endpoint.split('://')[1]
107	>	# scheme, host, path, params, query, fragment = urlparse(url)
108	>	# SE = host.split(':')[0]
109	>	# SE_PATH = endpoint.split(host)[1]
110	>	SE = self.node
111	>	SE_PATH = self.user_se_path + self.user_remote_dir
112		try:
113		USER = (self.lfn.split('user')[1]).split('/')[1]
114		except:
#	Line 139 | Line 139 | class PhEDExDatasvcInfo:
139		if int(self.publish_data) == 1 or int(self.usenamespace) == 1:
140		if self.sched in ['CAF']: l_User=True
141		primaryDataset = self.computePrimaryDataset()
142	<	lfn = LFNBase(self.forced_path, primaryDataset, self.publish_data_name, LocalUser=l_User)  + '/${PSETHASH}/'
142	>	lfn = LFNBase(self.forced_path, primaryDataset, self.publish_data_name)  + '/${PSETHASH}/'
143		else:
144		if self.sched in ['CAF','LSF']: l_User=True
145	<	lfn = LFNBase(self.forced_path,self.user_remote_dir,LocalUser=l_User)
145	>	lfn = LFNBase(self.forced_path,self.user_remote_dir)
146		return lfn
147
148		def computePrimaryDataset(self):

Diff Legend

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