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.14 by slacapra, Wed Jan 17 18:17:58 2007 UTC vs.
Revision 1.20 by spiga, Sun Jul 13 19:21:37 2008 UTC

# Line 9 | Line 9 | 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]
14 < if pythonV.find('2.2') >= 0 :
15 <    Crabpydir=commands.getoutput('which crab')
16 <    Topdir=string.replace(Crabpydir,'/python/crab','')
17 <    extradir=Topdir+'/DLSAPI/extra'
18 <    if sys.path.count(extradir) <= 0:
19 <         if os.path.exists(extradir):
20 <            sys.path.insert(0, extradir)
12 > # ## for python 2.2 add the pyexpat.so to PYTHONPATH
13 > # pythonV=sys.version.split(' ')[0]
14 > # if pythonV.find('2.2') >= 0 :
15 > #     Crabpydir=commands.getoutput('which crab')
16 > #     Topdir=string.replace(Crabpydir,'/python/crab','')
17 > #     extradir=Topdir+'/DLSAPI/extra'
18 > #     if sys.path.count(extradir) <= 0:
19 > #          if os.path.exists(extradir):
20 > #             sys.path.insert(0, extradir)
21  
22  
23   class DLSError:
# Line 28 | Line 28 | class DLSError:
28  
29   class DLSNoReplicas(exceptions.Exception):
30      def __init__(self, FileBlock):
31        exceptions.Exception.__init__(self, self.args)
31          self.args ="No replicas exists for fileblock: "+FileBlock+"\n"
32 +        exceptions.Exception.__init__(self, self.args)
33          pass
34  
35      def getClassName(self):
# Line 48 | Line 48 | class DLSNoReplicas(exceptions.Exception
48   class DLSInfo:
49      def __init__(self, type, cfg_params):
50          self.cfg_params = cfg_params
51 <        if type=="DLS_TYPE_DLI":
52 <            try:
53 <                endpoint=self.cfg_params['CMSSW.dls_endpoint']
54 <            except KeyError:
55 <                endpoint="prod-lfc-cms-central.cern.ch/grid/cms/DLS/LFC"
56 <
57 <            try:
58 <                import xml.dom.ext.reader
59 <            except:
60 <                crabdir=os.getenv('CRABDIR')
61 < ## Let the  user set up PyXML by hand
62 <                msg="There is no setup of PyXML python module required by DLS (DLI). Do the following:\n"
63 <                msg+=" - check that in  %s/configure  the function configureDLSAPI is not commented \n"%crabdir
64 <                msg+=" - uncomment it and re-run the configuration :"
65 <                msg+="\n    cd %s\n"%crabdir
66 <                msg+="     ./configure\n"
67 <                msg+="     source crab.(c)sh\n"
68 <                raise CrabException(msg)
69 <
70 <        elif type=="DLS_TYPE_MYSQL":
51 >        if type=="DLS_TYPE_DBS":
52 >            #
53 >            # use dbs_url as dls_endpoint if dls_type is dbs
54 >            #
55              try:
56 <                endpoint=self.cfg_params['CMSSW.dls_endpoint']
56 >                endpoint=self.cfg_params['CMSSW.dbs_url']
57              except KeyError:
58 <                endpoint="lxgate10.cern.ch:18081"
58 >                endpoint="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
59          else:
60              msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
61              raise CrabException(msg)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines