ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/PhEDExDatasvcInfo.py
(Generate patch)

Comparing COMP/CRAB/python/PhEDExDatasvcInfo.py (file contents):
Revision 1.20 by spiga, Fri Mar 6 17:01:52 2009 UTC vs.
Revision 1.22 by spiga, Tue Mar 31 23:43:22 2009 UTC

# Line 58 | Line 58 | class PhEDExDatasvcInfo:
58              raise CrabException(msg)
59          self.sched = common.scheduler.name().upper()
60          self.protocol = self.srm_version
61 +
62 +        self.forced_path = '/store/user/'
63          if self.sched in ['CAF','LSF']:
64              self.protocol = 'direct'
65              self.SE = {'CAF':'caf.cern.ch', 'LSF':''}
66 <
67 <        self.forced_path = '/store/user/'
66 >            if self.sched == 'CAF': self.forced_path = '/store/caf/user/'
67 >            
68          if not self.usePhedex:
69              self.forced_path = self.user_remote_dir
70          return
# Line 103 | Line 105 | class PhEDExDatasvcInfo:
105              USER = (query.split('user')[1]).split('/')[1]
106          else:
107              #### to test #####
108 <            #url = 'http://'+endpoint.split('://')[1]
109 <            #scheme, host, path, params, query, fragment = urlparse(url)
110 <            #SE = host.split(':')[0]
111 <            #SE_PATH = endpoint.split(host)[1]
108 >           # url = 'http://'+endpoint.split('://')[1]
109 >           # scheme, host, path, params, query, fragment = urlparse(url)
110 >           # SE = host.split(':')[0]
111 >           # SE_PATH = endpoint.split(host)[1]
112              SE = self.node
113              SE_PATH = self.user_se_path + self.user_remote_dir
114              try:
# Line 139 | Line 141 | class PhEDExDatasvcInfo:
141          if int(self.publish_data) == 1 or int(self.usenamespace) == 1:
142              if self.sched in ['CAF']: l_User=True
143              primaryDataset = self.computePrimaryDataset()
144 <            lfn = LFNBase(self.forced_path, primaryDataset, self.publish_data_name, LocalUser=l_User)  + '/${PSETHASH}/'    
144 >            lfn = LFNBase(self.forced_path, primaryDataset, self.publish_data_name)  + '/${PSETHASH}/'    
145          else:
146              if self.sched in ['CAF','LSF']: l_User=True
147 <            lfn = LFNBase(self.forced_path,self.user_remote_dir,LocalUser=l_User)
147 >            lfn = LFNBase(self.forced_path,self.user_remote_dir)
148          return lfn
149  
150      def computePrimaryDataset(self):

Diff Legend

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