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

Comparing COMP/CRAB/python/DLSInfo.py (file contents):
Revision 1.13 by slacapra, Wed Sep 27 14:17:57 2006 UTC vs.
Revision 1.14 by slacapra, Wed Jan 17 18:17:58 2007 UTC

# Line 5 | Line 5 | from crab_exceptions import *
5   from crab_util import *
6   import common
7  
8 < try:
9 <    import dlsApi
10 <    import dlsClient
11 <    from dlsDataObjects import DlsLocation, DlsFileBlock, DlsEntry
12 < except:
13 <    try:
14 <        Crabpydir=commands.getoutput('which crab')
15 <        Topdir=string.replace(Crabpydir,'/python/crab','')
16 <        sys.path.append(Topdir+'/DLSAPI')
17 <        import dlsApi
18 <        import dlsClient
19 <        from dlsDataObjects import DlsLocation, DlsFileBlock, DlsEntry
20 <    except:
21 <        msg="ERROR no DLS API available"
22 <        raise CrabException(msg)
8 > import dlsApi
9 > import dlsClient
10 > from dlsDataObjects import DlsLocation, DlsFileBlock, DlsEntry
11                                                                                              
12   ## for python 2.2 add the pyexpat.so to PYTHONPATH
13   pythonV=sys.version.split(' ')[0]
# Line 40 | Line 28 | class DLSError:
28  
29   class DLSNoReplicas(exceptions.Exception):
30      def __init__(self, FileBlock):
31 <        args ="No replicas exists for fileblock: "+FileBlock+"\n"
32 <        exceptions.Exception.__init__(self, args)
31 >        exceptions.Exception.__init__(self, self.args)
32 >        self.args ="No replicas exists for fileblock: "+FileBlock+"\n"
33          pass
34  
35      def getClassName(self):
# Line 60 | Line 48 | class DLSNoReplicas(exceptions.Exception
48   class DLSInfo:
49      def __init__(self, type, cfg_params):
50          self.cfg_params = cfg_params
63        jobtype = self.cfg_params['CRAB.jobtype']
51          if type=="DLS_TYPE_DLI":
52              try:
53                  endpoint=self.cfg_params['CMSSW.dls_endpoint']
# Line 93 | Line 80 | class DLSInfo:
80          try:
81              self.api = dlsClient.getDlsApi(dls_type=type,dls_endpoint=endpoint)
82          except dlsApi.DlsApiError, inst:
83 <            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),self.DLSServer_)
83 >            msg = "Error when binding the DLS interface: %s  Server %s"%(str(inst),endpoint)
84              #print msg
85              raise CrabException(msg)
86  
# Line 106 | Line 93 | class DLSInfo:
93          try:
94              entryList=self.api.getLocations([fileblocks])
95          except dlsApi.DlsApiError, inst:
96 <            msg = "Error in the DLS query: %s." % str(inst)
96 >            #msg = "Error in the DLS query: %s." % str(inst)
97              #print msg
98              raise DLSNoReplicas(fileblocks)
99  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines