From ea454655baf78ac446f1395febef680af3341477 Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Tue, 5 Mar 2019 13:29:30 +0000
Subject: [PATCH] SW-598: Check on argument before asking password
---
.../data/Coordinates/ETRS89toITRS2005.py | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/MAC/Deployment/data/Coordinates/ETRS89toITRS2005.py b/MAC/Deployment/data/Coordinates/ETRS89toITRS2005.py
index 0486f0e39b8..183a6ebaaa1 100755
--- a/MAC/Deployment/data/Coordinates/ETRS89toITRS2005.py
+++ b/MAC/Deployment/data/Coordinates/ETRS89toITRS2005.py
@@ -184,24 +184,27 @@ if __name__ == '__main__':
dbPort = options.dbPort
dbUser = options.dbUser
- dbPassword = getpass.getpass()
-
- host = "{}:{}".format(dbHost, dbPort)
-
if len(args) != 3:
parser.print_help()
sys.exit(1)
+ stationname = str(args[0])
+ objecttype = str(args[1])
+ date_years = float(args[2])
+
+ dbPassword = getpass.getpass()
+
+ host = "{}:{}".format(dbHost, dbPort)
+
(X, Y, Z) = latlonhgt2xyz(52.9129392, 6.8690294, 54.1)
print X, Y, Z
(Xn, Yn, Zn) = i89toi2005([X, Y, Z], 2007.775342466)
print Xn, Yn, Zn
sys.exit(0)
- date_years = float(sys.args[2])
db = pgdb.connect(user=dbUser, host=host, database=dbName, password=dbPassword)
cursor = db.cursor()
- cursor.execute("select * from get_ref_objects(%s, %s)", (args[0], args[1]))
+ cursor.execute("select * from get_ref_objects(%s, %s)", (stationname, objecttype))
while (1):
record = cursor.fetchone()
if record is None:
--
GitLab