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.17 by spiga, Sat Nov 22 12:01:33 2008 UTC vs.
Revision 1.20 by spiga, Fri Mar 6 17:01:52 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 <        if self.sched in ['CAF','LSF']:self.protocol = 'direct'
61 >        if self.sched in ['CAF','LSF']:
62 >            self.protocol = 'direct'
63 >            self.SE = {'CAF':'caf.cern.ch', 'LSF':''}
64  
65          self.forced_path = '/store/user/'
66          if not self.usePhedex:
# Line 90 | Line 92 | class PhEDExDatasvcInfo:
92              if self.protocol == 'direct':
93                  query=endpoint
94                  SE_PATH = endpoint
95 <                SE = self.sched
95 >                SE = self.SE[self.sched]
96              else:
97                  url = 'http://'+endpoint.split('://')[1]
98                  # python > 2.4
# Line 100 | Line 102 | class PhEDExDatasvcInfo:
102                  SE_PATH = endpoint.split(host)[1]
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
112              try:

Diff Legend

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