graph faffing, now knows who's king

[familyTree.git] / familyTree / askQuestion.py

diff --git a/familyTree/askQuestion.py b/familyTree/askQuestion.py
index ecf810aa2e37199d06ac7e9c69be8f4741aefdc7..a5a6b3082b756875be7ef7ff4aeec282545c6c27 100755 (executable)
--- a/familyTree/askQuestion.py
+++ b/familyTree/askQuestion.py
@@ -4,6 +4,7 @@ import sqlite3
 import findYear
 from string import Template
 import cgi
+import re
 
 global link_Template 
 link_Template= Template(\
@@ -735,6 +736,19 @@ def find_person(ID):
                selfName = row[1]
                selfID = row[2]
                 return [Self, selfID,selfName]
+def isKing(ID):
+       ID = int(ID.split(',')[-1])
+       s=  "SELECT style FROM styles WHERE ID=?"
+       t = (ID,)       
+
+       k = 0
+       for row in run_query(s,t):
+               a=re.match('.*King',row[0])
+               b=re.match('.*Queen',row[0])
+               if a!=None or b!=None:
+                       k=1
+
+       return k
 
 def find_parents(ID):
         s = "SELECT name, parentID"\
@@ -753,7 +767,7 @@ def find_parents(ID):
                         pID = row[1]
                        pN = row[0]
                 else:
-                        p = row[1] + ',p ' + str(ID)
+                        p = row[1] + ',p' + str(ID)
                         pID = 0
                        pN = row[1]
                 parents.append(p)
@@ -786,7 +800,7 @@ def find_spouses(ID):
                                 sID = row[1]
                                        sN = row[0]
                        elif row[1] !='':
-                                s=row[1] + ",s " +str(ID)
+                                s=row[1] + ",s" +str(ID)
                                 sID = 0
                                sN = row[1]
                         if row[1] !='':
@@ -828,7 +842,7 @@ def find_children(ID):
                         opID = row[2]
                        opN = row[3]
                 else:
-                        op = row[2] + ',s ' + str(ID)
+                        op = row[2] + ',s' + str(ID)
                         opID = 0
                        opN = row[2]