Merge pull request #719 from 4cgeodgeo/master

Bug fix - to many values to extract expected 2
dsgoficial · Sep 28, 2022 · ef17498 · ef17498
2 parents 321089e + 3b4463b
commit ef17498
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/DsgTools/gui/ServerTools/batchDbManager.py b/DsgTools/gui/ServerTools/batchDbManager.py
@@ -93,13 +93,16 @@ def populateListWithDatabasesFromServer(self):
             dbList = self.serverWidget.abstractDb.getEDGVDbsFromServer(parentWidget = self)
         except Exception as e:
             QMessageBox.critical(self, self.tr('Critical!'), ':'.join(e.args))
-
         dbList.sort()
-        for (dbname, dbversion) in dbList:
-            if dbversion not in list(self.dbDict.keys()):
-                dbversion = 'Non_EDGV'
-            if dbname not in self.dbDict[dbversion]:
-                self.dbDict[dbversion].append(dbname)
+        try:
+            for (dbname, dbversion, impl_dummy) in dbList:
+                dbversion = dbversion.replace("EDGV ","")
+                if dbversion not in list(self.dbDict.keys()):
+                    dbversion = 'Non_EDGV'
+                if dbname not in self.dbDict[dbversion]:
+                    self.dbDict[dbversion].append(dbname)
+        except Exception as e:
+            QMessageBox.critical(self, self.tr('Critical!'), str(dbList))
 
     def setDatabases(self):
         self.populateListWithDatabasesFromServer()