Merge pull request #8 from mn5hk/add-swords

Update plugindir code in geoslurpdb
strawpants · Jul 10, 2023 · e118a9d · e118a9d
2 parents 478a6d8 + 6634cc4
commit e118a9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/geoslurp/config/localsettings.py b/geoslurp/config/localsettings.py
@@ -100,6 +100,7 @@ def readLocalSettings(args=settingsArgs(),readonlyuser=True,dbalias=None):
         lastOpts={"dbalias":args.dbalias,args.dbalias:defaultdbdict}
 
     isUpdated=False
+
     if argsout.dbalias:
         lastOpts["dbalias"]=argsout.dbalias
         dbalias=argsout.dbalias

diff --git a/geoslurp/db/geoslurpdb.py b/geoslurp/db/geoslurpdb.py
@@ -18,7 +18,7 @@
 from geoslurp.db.connector import GeoslurpConnector
 
 
-def geoslurpConnect(args=None,readonly_user=True,update=False,local_settings=None,dbalias=None,plugindir=None):
+def geoslurpConnect(args=None,readonly_user=True,update=False,local_settings=None,dbalias=None):
     """Convenience wrapper to start a connection with a geoslurpdatabase. Returns a database connection while taking use of stored settings from the users 
     configuration file ($HOME/.geoslurp_lastused.yaml).
     :param args: Class which encapsulates different connection parameters
@@ -33,10 +33,6 @@ def geoslurpConnect(args=None,readonly_user=True,update=False,local_settings=Non
     if dbalias:
         args.dbalias=dbalias
 
-    if plugindir:
-        args.plugindir=plugindir
-
     userSettings=readLocalSettings(args=args,readonlyuser=readonly_user)
     return GeoslurpConnector(host=userSettings.host,user=userSettings.user,passwd=userSettings.password,
-            cache=userSettings.cache,dataroot=userSettings.dataroot,
-            plugindir=userSettings.plugindir)
+            cache=userSettings.cache,dataroot=userSettings.dataroot)