diff --git a/SAS/OTDB/bin/repairTree.py b/SAS/OTDB/bin/repairTree.py
index 2aa4fa65dc8eb74be73506a8f8fc51cbe6922f99..7db355a7c9e4b474a773cb9c63dbd3e7a963e1e2 100755
--- a/SAS/OTDB/bin/repairTree.py
+++ b/SAS/OTDB/bin/repairTree.py
@@ -1,7 +1,9 @@
#!/usr/bin/env python
-#coding: iso-8859-15
-import os,sys,time,pg
-from database import *
+# coding: iso-8859-15
+import sys
+import pg
+from optparse import OptionParser
+import getpass
#
@@ -11,58 +13,103 @@ if __name__ == '__main__':
"""
repairTree is a temporarely script that adds an 'identifications' field to a given tree
"""
+ parser = OptionParser("Usage: %prog [options] MomID")
- # check syntax of invocation
- # Expected syntax: copyTree momID database
- if (len(sys.argv) != 3):
- print "Syntax: %s MoMID database" % sys.argv[0]
+ parser.add_option("-D", "--database",
+ dest="dbName",
+ type="string",
+ default="LOFAR_4",
+ help="Name of OTDB database to use")
+
+ parser.add_option("-H", "--host",
+ dest="dbHost",
+ type="string",
+ default="sasdb.control.lofar",
+ help="Hostname of OTDB database server")
+
+ parser.add_option("-P", "--port",
+ dest="dbPort",
+ type="int",
+ default="5432",
+ help="Port of OTDB database server")
+
+ parser.add_option("-U", "--user",
+ dest="dbUser",
+ type="string",
+ default="postgres",
+ help="Username of OTDB database")
+
+ # parse arguments
+
+ (options, args) = parser.parse_args()
+
+ dbName = options.dbName
+ dbHost = options.dbHost
+ dbPort = options.dbPort
+ dbUser = options.dbUser
+
+ # print sys.argv
+ if len(args) != 1:
+ parser.print_help()
sys.exit(1)
- momID = int(sys.argv[1])
- DBname = sys.argv[2]
-
+
+ momID = int(args[0])
+
+ dbPassword = getpass.getpass()
+
# calling stored procedures only works from the pg module for some reason.
- database = pg.connect(user="postgres", host="localhost", dbname=DBname)
- print "Connected to database", DBname
+ database = pg.connect(user=dbUser, host=dbHost, dbname=dbName, port=dbPort, passwd=dbPassword)
+ print "Connected to database", dbName
# Check for tree-existance in both databases.
- DBtree = database.query("select * from gettreelist(0::int2,3::int2,0,'','','') where momid=%d" % momID).dictresult()
+ DBtree = database.query("select * from gettreelist(0::int2,3::int2,0,'','','') where momid=%d" %
+ momID).dictresult()
if len(DBtree) == 0:
- print "Tree with MoMId %d not found in database %s" % (momID, DBname)
+ print "Tree with MoMId %d not found in database %s" % (momID, dbName)
sys.exit(1)
- if DBtree[0]['type'] == 10: # PIC tree?
+ if DBtree[0]['type'] == 10: # PIC tree?
print "PIC trees cannot be copied"
sys.exit(1)
- database.query("BEGIN");
+ database.query("BEGIN")
# What's the version of this tree?
- treeID = DBtree[0]['treeid']
+ treeID = DBtree[0]['treeid']
nodeDefID = database.query("select * from getTopNode(%d)" % treeID).dictresult()[0]
- nodeInfo = database.query("select * from getVICnodedef(%s)" % nodeDefID['paramdefid']).dictresult()[0]
- version = nodeInfo['version']
+ nodeInfo = database.query("select * from getVICnodedef(%s)" %
+ nodeDefID['paramdefid']).dictresult()[0]
+ version = nodeInfo['version']
print "Tree %d was built with components of version %d" % (treeID, version)
- parentNodes = database.query("select * from VICnodedef where version=%d and name like 'Output_%%'" % version).dictresult()
+ parentNodes = database.query(
+ "select * from VICnodedef where version=%d and name like 'Output_%%'" %
+ version).dictresult()
for node in parentNodes:
print DBtree[0]['momid'], treeID, node['nodeid'], node['name'],
paramid = 0
- idnode = database.query("select * from vicparamdef where nodeid=%d and name='identifications'" % node['nodeid']).dictresult()
+ idnode = database.query(
+ "select * from vicparamdef where nodeid=%d and name='identifications'" %
+ node['nodeid']).dictresult()
if len(idnode):
paramid = idnode[0]['paramid']
print "No need to insert the parameter, paramid=%d" % paramid
else:
print "Adding parameter to the component",
- paramid = database.query("select * from savevicparamdef(1,%d,'identifications',212::int2,0::int2,10::int2,100::int2,true,'[]','identifications and topology of the output data products')" % node['nodeid']).getresult()[0]
- print ", paramid=%d" % paramid;
+ paramid = database.query("select * from savevicparamdef(1,%d,'identifications',212::int2,0::int2,10::int2,100::int2,true,'[]','identifications and topology of the output data products')" %
+ node['nodeid']).getresult()[0]
+ print ", paramid=%d" % paramid
- vicrecs = database.query("select * from vichierarchy where treeid=%d and paramrefid=%d" % (treeID, node['nodeid'])).dictresult()
+ vicrecs = database.query("select * from vichierarchy where treeid=%d and paramrefid=%d" %
+ (treeID, node['nodeid'])).dictresult()
if len(vicrecs):
print "parent node found in victree",
- found = database.query("select * from vichierarchy where treeid=%d and parentid='%d' and name like '%%identifications'" % (treeID, vicrecs[0]['nodeid'])).dictresult()
+ found = database.query("select * from vichierarchy where treeid=%d and parentid='%d' and name like '%%identifications'" %
+ (treeID, vicrecs[0]['nodeid'])).dictresult()
if len(found):
print ", parameter already added, id=%d" % found[0]['nodeid']
else:
print ", parameter not in tree, adding it"
- newid = database.query("insert into VIChierarchy(treeID, parentID, paramrefID, name, value) values (%d, %d, %d, '%s.identifications','[]')" % (treeID, vicrecs[0]['nodeid'], paramid, vicrecs[0]['name']))
+ newid = database.query("insert into VIChierarchy(treeID, parentID, paramrefID, name, value) values (%d, %d, %d, '%s.identifications','[]')" %
+ (treeID, vicrecs[0]['nodeid'], paramid, vicrecs[0]['name']))
else:
print "parent node NOT in victree, ready"