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

Comparing COMP/CRAB/python/DataDiscovery.py (file contents):
Revision 1.26 by spiga, Wed Feb 4 14:26:09 2009 UTC vs.
Revision 1.29 by edelmann, Tue Mar 17 14:36:44 2009 UTC

# Line 99 | Line 99 | class DataDiscovery:
99                            'glidein':  global_url,\
100                            'lsf':      global_url,\
101                            'caf':      caf_url,\
102 <                          'sge':      global_url
102 >                          'sge':      global_url,
103 >                          'arc':      global_url
104                            }
105  
106          dbs_url_default = dbs_url_map[(common.scheduler.name()).lower()]
# Line 131 | Line 132 | class DataDiscovery:
132  
133          api = DBSAPI.dbsApi.DbsApi(args)
134  
135 <        self.files = self.queryDbs(api,path=self.datasetPath,runNumber=runselection,useParent=useparent)
135 >        self.files = self.queryDbs(api,path=self.datasetPath,runselection=runselection,useParent=useparent)
136  
137          anFileBlocks = []
138          if self.skipBlocks: anFileBlocks = readTXTfile(self, fileBlocks_FileName)
# Line 182 | Line 183 | class DataDiscovery:
183  
184   ###########################
185  
186 <    def queryDbs(self,api,path=None,runNumber=None,useParent=None):
186 >    def queryDbs(self,api,path=None,runselection=None,useParent=None):
187  
188          allowedRetriveValue = [#'retrive_parent',
189                                 'retrive_block',
# Line 190 | Line 191 | class DataDiscovery:
191                                 'retrive_run'
192                                 ]
193          try:
194 <            if not runNumber :
194 >            if len(runselection) <=0 :
195                  if useParent==1 or self.splitByRun==1 :
196                      if self.ads==1 :          
197                          files = api.listFiles(analysisDataset=path, retriveList=allowedRetriveValue)
# Line 199 | Line 200 | class DataDiscovery:
200                      common.logger.debug(5,"Set of input parameters used for DBS query : \n"+str(allowedRetriveValue))
201                      common.logger.write("Set of input parameters used for DBS query : \n"+str(allowedRetriveValue))
202                  else:
202 –                    print 'MALE2'
203                      files = api.listDatasetFiles(self.datasetPath)
204              else :
205                  files=[]

Diff Legend

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