From 043960d50d7079f86aeab454650c2b13b6d0e768 Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Tue, 23 Mar 2021 11:50:20 +0100
Subject: [PATCH] IOVDbSvcConfig: Minor change to simplify reading from sqlite
---
Database/IOVDbSvc/python/IOVDbSvcConfig.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Database/IOVDbSvc/python/IOVDbSvcConfig.py b/Database/IOVDbSvc/python/IOVDbSvcConfig.py
index 06d7d46a8a13..20afec75d2ac 100644
--- a/Database/IOVDbSvc/python/IOVDbSvcConfig.py
+++ b/Database/IOVDbSvc/python/IOVDbSvcConfig.py
@@ -130,10 +130,15 @@ def addFolderList(configFlags,listOfFolderInfoTuple,extensible=False,db=None):
dbname=db
else:
dbname=configFlags.IOVDb.DatabaseInstance
- if detDb not in _dblist.keys():
- raise ConfigurationError("Error, db shorthand %s not known" % detDb)
+ if detDb in _dblist.keys():
+ fs = "<db>"+_dblist[detDb]+"/"+dbname+"</db> " + fs
+ elif os.access(detDb,os.R_OK):
+ #Assume slqite file
+ fs = "<db>sqlite://;schema="+detDb+";dbname="+dbname+"</db> " + fs
+ else:
+ raise ConfigurationError("Error, db shorthand %s not known, nor found as sqlite file" % detDb)
#Append database string to folder-name
- fs = "<db>"+_dblist[detDb]+"/"+dbname+"</db> " + fs
+
if extensible:
fs = fs + '<extensible/>'
--
GitLab