refactoring SELECTs

[familyTree.git] / cgiFiles / jointAncestorGraph.py

diff --git a/cgiFiles/jointAncestorGraph.py b/cgiFiles/jointAncestorGraph.py
index 0279bc9cb999ba779f88a876b6943868d1c81536..01a631992a20c1f17eac90267b85b49a0a45a1b0 100755 (executable)
--- a/cgiFiles/jointAncestorGraph.py
+++ b/cgiFiles/jointAncestorGraph.py
@@ -37,22 +37,14 @@ def make_graph(ID,ID2,LA,LB):
        d.start_dot()   
 
        if int(LA)!=0:
-               s = "SELECT name, id FROM people WHERE ID = ?;"
-               for row in aQ.run_query(s,(ID,)):
-                       thisN = row[0]+' ' + str(row[1])
-                       d.add_highlight(thisN)
-                       newName = (thisN)
-                       newID = row[1]
-               add_parents(newID,newName,0,LA)
+               [Self, selfID, selfName] = aQ.find_person(ID)
+               d.add_highlight(Self)
+               add_parents(selfID,Self,0,LA)
 
        if int(LB)!=0:
-               s = "SELECT name, id FROM people WHERE ID = ?;"
-               for row in aQ.run_query(s,(ID2,)):
-                       thisN = row[0] +' '+ str(row[1])
-                       d.add_highlight(thisN)
-                       newName = (thisN)
-                       newID = row[1]
-               add_parents(newID,newName,0,LB)
+               [Self, selfID, selfName] = aQ.find_person(ID2)
+                d.add_highlight(Self)
+               add_parents(selfID,Self,0,LB)
 
        d.add_subgraphs()
        d.end_dot()