Fix errors from using published dataset names

cms-sw · Nov 18, 2014 · c0332a8 · c0332a8
1 parent 7cc576f
commit c0332a8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/dataset.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/dataset.py
@@ -172,7 +172,10 @@ def __find_ge( self, a, x):
     def __getData( self, dasQuery, dasLimit = 0 ):
         dasData = das_client.get_data( 'https://cmsweb.cern.ch',
                                        dasQuery, 0, dasLimit, False )
-        jsondict = json.loads( dasData )
+        if isinstance(dasData, str):
+            jsondict = json.loads( dasData )
+        else:
+            jsondict = dasData
         # Check, if the DAS query fails
         if jsondict["status"] != 'ok':
             msg = "Status not 'ok', but:", jsondict["status"]
@@ -183,7 +186,11 @@ def __getDataType( self ):
         dasQuery_type = ( 'dataset dataset=%s | grep dataset.datatype,'
                           'dataset.name'%( self.__name ) )
         data = self.__getData( dasQuery_type )
-        return data[0]["dataset"][0]["datatype"]
+        for a in data[0]["dataset"]:
+            if "datatype" in a:
+                return a["datatype"]
+        msg = ("Cannot find the datatype of the dataset '%s'"%( self.name() ))
+        raise AllInOneError( msg )
 
     def __getFileInfoList( self, dasLimit ):
         if self.__fileInfoList: