diff --git a/TAP/tap.py b/TAP/tap.py index c2102ae..69d840d 100755 --- a/TAP/tap.py +++ b/TAP/tap.py @@ -217,7 +217,7 @@ def __run__(self, **kwargs): if self.debug: logging.debug('') - logging.debug('nexsciTAP version 1.2.1\n\n') + logging.debug('nexsciTAP version 3.0.1\n\n') logging.debug('HTTP request keywords:\n') self.lang = 'ADQL' @@ -2979,7 +2979,7 @@ def __printVosiTables__ (self, connectInfo, vosipath, **kwargs): logging.debug('') logging.debug('call vosiTables') - vositbl = vosiTables (dbms=dbms, \ + vositbl = vosiTables (connectInfo=self.config.connectInfo, dbms=dbms, \ dbserver=dbserver, \ userid=userid, \ password=password, \ diff --git a/TAP/vositables.py b/TAP/vositables.py index 206bd69..83a1cd1 100644 --- a/TAP/vositables.py +++ b/TAP/vositables.py @@ -214,6 +214,12 @@ def __init__(self, **kwargs): # # { Connect to DBMS # + if('connectInfo' in kwargs): + self.connectInfo = kwargs['connectInfo'] + else: + self.msg = 'Required connectInfo dict is missing.' + raise Exception (self.msg) + self.tap_schema_file = self.connectInfo['tap_schema_file'] self.tap_schema = self.connectInfo['tap_schema'] self.schemas_table = self.connectInfo['schemas_table']