graph faffing, now knows who's king

[familyTree.git] / cgiFiles / jointAncestorGraph.py

diff --git a/cgiFiles/jointAncestorGraph.py b/cgiFiles/jointAncestorGraph.py
index 7fdadd0d7714bef20868461e8289c298bb18751f..c700ff01eae4833b1d86407cdd106b1dd40c6b84 100755 (executable)
--- a/cgiFiles/jointAncestorGraph.py
+++ b/cgiFiles/jointAncestorGraph.py
@@ -8,30 +8,6 @@ sys.path.append('/home/naath/familyTreeProject/familyTree')
 import make_dot as d
 import askQuestion as aQ
 
-def add_parents(ID,name,startLevel,stopLevel):
-
-       startLevel = startLevel + 1
-       if int(startLevel) == int(stopLevel)+1:
-               return
-
-       pair=[]
-       [parents, parentIDs,parentNames] = aQ.find_parents(ID)
-
-        pair = []
-        for i in range(len(parents)):
-                newName = parents[i]
-                if parentIDs[i]!=0:
-                        newID = parentIDs[i]
-                        if not d.has_node(newName):
-                                d.add_person(newName)
-                                add_parents(newID,newName,\
-                               startLevel,stopLevel)
-                else:   
-                        d.add_person(newName)
-                pair.append(newName)
-
-       d.add_marriage(pair[0], pair[1],[name],1)
-
 def find_oneside_path(ID,start,stop):
        global myP
        global myC
@@ -110,17 +86,11 @@ def make_graph(ID,ID2,LA,LB):
         d.start_dot(8) 
        done = 0
 
-       find_path(ID,ID2,LA,LB)
+       for tID in [ID, ID2]:
+               [Self, selfID, selfName] = aQ.find_person(tID)
+               d.add_highlight(Self)
 
-#      if int(LA)!=0:
-#              [Self, selfID, selfName] = aQ.find_person(ID)
-#              d.add_highlight(Self)
-#              add_parents(selfID,Self,0,LA)
-#
-#      if int(LB)!=0:
-#              [Self, selfID, selfName] = aQ.find_person(ID2)
-#               d.add_highlight(Self)
-#              add_parents(selfID,Self,0,LB)
+       find_path(ID,ID2,LA,LB)
 
        d.add_subgraphs()
        d.end_dot()