I'm sure I've done something since I remembered to commit...

[familyTree.git] / cgiFiles / smallGraph.py

diff --git a/cgiFiles/smallGraph.py b/cgiFiles/smallGraph.py
index b1bc179300424b6183515f562f9764df88083d6c..7d67e52538b40d9243faa94a37a688ce24279086 100755 (executable)
--- a/cgiFiles/smallGraph.py
+++ b/cgiFiles/smallGraph.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
 import cgi
-import cgitb
+#import cgitb
 import make_dot as d
 import sys
 sys.path.append('/home/naath/familyTreeProject/familyTree')
 import askQuestion as aQ
-cgitb.enable()
+#cgitb.enable()
 
 def add_parents(ID,s,cl,pl,pos,os):
        Self = aQ.find_person(ID)[0]
@@ -55,7 +55,7 @@ def add_children(ID,cl,os):
 def add_spouses(ID,os,cl):
        Self = aQ.find_person(ID)[0]
 
-       [spouses,spousesID,spousesNames] = aQ.find_spouses(ID)
+       [spouses,spousesID,spousesNames,sD] = aQ.find_spouses(ID)
 
        for s in spouses:
                 d.add_marriage(Self,s,[],1)
@@ -67,6 +67,7 @@ def add_spouses(ID,os,cl):
                                add_spouses(s,0,cl)
                                add_children(s,cl,os)
 
+
 def make_graph(ID,v,fs):
        pl = v[0]
        cl = v[1]
@@ -83,6 +84,7 @@ def make_graph(ID,v,fs):
        add_children(ID,cl,os)
        add_spouses(ID,os,cl)
 
+       d.create_dot()
        d.add_subgraphs()
        
        d.end_dot()
@@ -93,7 +95,7 @@ def check_int(s):
        try:
                return int(s)
        except ValueError:
-               return 1
+               return -1
 
 form = cgi.FieldStorage()
 
@@ -107,19 +109,19 @@ for s in variables:
 
 for i in range(len(values)):
        v = values[i]
-       if v == None:
+       if v == None or v<0:
                v = 0
        v = check_int(v)
-       if v<0:
-               v=0
        values[i] = v
 
 fs = form.getvalue('fs')
 if fs==None:
        fs=8
 fs = check_int(fs)
-if fs==1:
+if fs<0:
        fs=8
+if fs>20:
+       fs=20
 
 conn = aQ.connect()
 make_graph(ID,values,fs)