From: naath Date: Fri, 18 Apr 2014 12:10:26 +0000 (+0100) Subject: Added list by number of children; refarctored other list-by-count X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~naath/git?a=commitdiff_plain;h=cb45384a4af592c96ec516c99743073e2cc76226;p=familyTree.git Added list by number of children; refarctored other list-by-count --- diff --git a/cgiFiles/age.py b/cgiFiles/age.py deleted file mode 100755 index dc888d4..0000000 --- a/cgiFiles/age.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- - -# enable debugging -import cgi -import cgitb -import sys -import re -sys.path.append('/home/naath/familyTreeProject/familyTree') -import askQuestion -import everyPage - -cgitb.enable() - -[conn,form]=everyPage.top() - -age = form.getvalue('age') -if age == None: - age = 20 - -result = re.match('[-]{0,1}[0-9]{1,4}$', str(age)) - -if result == None: - everyPage.bad() -else: - printMe = askQuestion.people_had_child_at_age(age,'
') - if len(printMe)<10: - printMe = 'sorry, no data
' - - everyPage.good(printMe) - - -everyPage.bottom(conn) diff --git a/cgiFiles/ageDeath.py b/cgiFiles/ageDeath.py deleted file mode 100755 index 3e7bcd7..0000000 --- a/cgiFiles/ageDeath.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- - -# enable debugging -import cgi -import cgitb -import sys -import re -sys.path.append('/home/naath/familyTreeProject/familyTree') -import askQuestion -import everyPage - -cgitb.enable() - -[conn,form]=everyPage.top() - -age = form.getvalue('age') -if age == None: - age = 20 - -result = re.match('[-]{0,1}[0-9]{1,4}$', str(age)) - -if result == None: - everyPage.bad() -else: - printMe = askQuestion.people_died_at_age(age,'
') - if len(printMe)<10: - printMe = 'sorry, no data
' - - everyPage.good(printMe) - - -everyPage.bottom(conn) diff --git a/cgiFiles/everyPage.py b/cgiFiles/everyPage.py index 413b873..5ae696d 100755 --- a/cgiFiles/everyPage.py +++ b/cgiFiles/everyPage.py @@ -17,18 +17,25 @@ def links(): print '
  • Search for people
    • ' print '
  • list of people
    • ' + 'listPeople.py> List of people' print '
  • list of territories
    • ' + 'listTerr.py> List of territories' + print '
  • big graph
    • ' + print '' + print '' print '
    ' + + + def footer(): print '
    ' print 'This somewhat silly thing made by ' diff --git a/cgiFiles/listAge.py b/cgiFiles/listAge.py index b0b4091..e1a8d61 100755 --- a/cgiFiles/listAge.py +++ b/cgiFiles/listAge.py @@ -10,16 +10,26 @@ import everyPage [conn,form]=everyPage.top() -result = 1 -if result == None: - everyPage.bad() -else: +age = form.getvalue('age') +if age == None: printMe = askQuestion.count_age_at_child('
    ') if len(printMe)<3: printMe = 'sorry, no data
    ' everyPage.good(printMe) +else: + result = re.match('[-]{0,1}[0-9]{1,4}$', str(age)) + + if result == None: + everyPage.bad() + else: + printMe = askQuestion.people_had_child_at_age(age,'
    ') + if len(printMe)<10: + printMe = 'sorry, no data
    ' + + everyPage.good(printMe) + everyPage.bottom(conn) diff --git a/cgiFiles/listAgeDeath.py b/cgiFiles/listAgeDeath.py index 061314d..44a724c 100755 --- a/cgiFiles/listAgeDeath.py +++ b/cgiFiles/listAgeDeath.py @@ -10,16 +10,27 @@ import everyPage [conn,form]=everyPage.top() cgitb.enable() -result = 1 -if result == None: - everyPage.bad() -else: + +age = form.getvalue('age') + +if age == None: printMe = askQuestion.count_age_at_death('
    ') if len(printMe)<3: printMe = 'sorry, no data
    ' everyPage.good(printMe) +else: + result = re.match('[-]{0,1}[0-9]{1,4}$', str(age)) + if result==None: + everyPage.bad() + else: + + printMe = askQuestion.people_died_at_age(age,'
    ') + if len(printMe)<10: + printMe = 'sorry, no data
    ' + + everyPage.good(printMe) everyPage.bottom(conn) diff --git a/cgiFiles/listChildCount.py b/cgiFiles/listChildCount.py new file mode 100755 index 0000000..689a5a6 --- /dev/null +++ b/cgiFiles/listChildCount.py @@ -0,0 +1,34 @@ +#!/usr/bin/python + +import cgi +import cgitb +import sys +import re +sys.path.append('/home/naath/familyTreeProject/familyTree') +import askQuestion +import everyPage + +[conn,form]=everyPage.top() + +nc = form.getvalue('nc') +if nc == None: + printMe = askQuestion.count_children('
    ') + if len(printMe)<3: + printMe = 'sorry, no data
    ' + + everyPage.good(printMe) + +else: + result = re.match('^[0-9]{0,4}$', str(nc)) + + if result == None: + everyPage.bad() + else: + printMe = askQuestion.parents_with_children(int(nc),'
    ') + if len(printMe)<10: + printMe = 'sorry, no data
    ' + + everyPage.good(printMe) + + +everyPage.bottom(conn) diff --git a/cgiFiles/make_dot.py b/cgiFiles/make_dot.py index abf3071..0e78525 100755 --- a/cgiFiles/make_dot.py +++ b/cgiFiles/make_dot.py @@ -122,7 +122,7 @@ def start_dot(fs): edges=[] cNodes={} dot = "digraph G{\n" - dot = dot + "ranksep = 0.2 nodesep = 0\n" + dot = dot + "ranksep = 0.2 nodesep = 0.1\n" subgraphs=[] set_attr(fs) @@ -169,7 +169,7 @@ def set_attr(fs): global debug_edge_attr zero_size = [('width','0'),('height','0')] person_attr = [('fontsize',str(fs))]+\ - [('shape','plaintext'),('margin','0.1'),\ + [('shape','plaintext'),('margin','0'),\ ('style','filled'),('fillcolor','white')] +\ zero_size highlight_attr = \ diff --git a/familyTree/askQuestion.py b/familyTree/askQuestion.py index a5a6b30..d0380d7 100755 --- a/familyTree/askQuestion.py +++ b/familyTree/askQuestion.py @@ -124,7 +124,7 @@ def print_people(n): def print_age_child_count(row,newLine): if newLine == '
    ': - script = "age.py?age="+str(row[0]) + script = "listAge.py?age="+str(row[0]) link = link_Template.substitute(script = \ script, title = add_quotes(row[0]), text = row[0]) out = str(row[1])+print_people(row[1]) @@ -136,7 +136,7 @@ def print_age_child_count(row,newLine): def print_age_death_count(row,newLine): if newLine =='
    ': - script = "ageDeath.py?age="+str(row[0]) + script = "listAgeDeath.py?age="+str(row[0]) link = link_Template.substitute(script = script,\ title = add_quotes(row[0]),text = row[0]) out = str(row[1])+print_people(row[1]) @@ -154,6 +154,34 @@ def print_name_count(row,newLine): else: return print_row(row,newLine) +def print_children_count(row,newLine): + out = str(row[0]) + + if row[0]==1: + out = out + ' person ' + else: + out = out + ' people ' + out = out +'had ' + + if newLine == '
    ': + script = "listChildCount.py?nc="+str(row[1]) + link = link_Template.substitute(script =\ + script, title = add_quotes(row[1]),text = row[1]) + else: + link = str(row[1]) + + out = out + link + + if row[1] == 1: + out = out + ' child ' + else: + out = out + ' children ' + + + out = out + newLine + + return out + def print_tagged_name(relationship,row,newLine): if row[0]==None: out = relationship + " not yet entered: " + row[1] @@ -338,6 +366,59 @@ def count_names(newLine): return out + +def count_children(newLine): + + s = "SELECT count(*),nc"\ + +" FROM ("\ + +" SELECT count(*) AS nc"\ + +" FROM parents"\ + +" GROUP BY parentID"\ + +" HAVING parentID <>'?'"\ + +" AND parentID <> '0')"\ + +" GROUP BY nc;" + + out = '' + for row in run_query(s,()): + out = out + print_children_count(row,newLine) + return out + +def parents_with_children(nChildren,newLine): + s = "SELECT name,parentID"\ + + " FROM parents"\ + + " LEFT JOIN people"\ + + " ON parentID = people.ID"\ + + " GROUP BY parentID"\ + + " HAVING count(*) = ?"\ + + " AND parentID <> 0"\ + + " ORDER BY bornYear;" + + + u = "SELECT count(*)"\ + +" FROM parents INNER JOIN people"\ + +" ON parents.ID = people.ID"\ + +" WHERE parentID = ?"\ + +" AND (diedyear-bornyear>? OR died='present');" + + out = "People who had " + str(nChildren) + if nChildren==1: + out = out + " child" + else: + out = out + " children" + out = out + ':' + newLine + + + + for row in run_query(s,(nChildren,)): + out = out + name_html(row,newLine) + for r in run_query(u,(row[1],1)): + out += " %d survived infancy" % r[0] + for r in run_query(u,(row[1],18)): + out = out +" and " +str(r[0])+" survived to adulthood" + out = out +newLine + + return out + def search_name(name,newLine): s = "SELECT name, ID"\ +" FROM people"\ @@ -475,6 +556,7 @@ def count_age_at_death(newLine): out = out + print_age_death_count(row,newLine) return out + def people_died_at_age(age,newLine): s = "SELECT diedYear-bornYear as age, name,ID"\ +" FROM people"\ @@ -742,11 +824,11 @@ def isKing(ID): t = (ID,) k = 0 + spellingsOfKing = ['King','Queen','king','queen'] 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 + for s in spellingsOfKing: + if re.match('.*'+s,row[0]) != None: + k = 1 return k diff --git a/familyTree/tree b/familyTree/tree index f1c9448..04f57de 100644 --- a/familyTree/tree +++ b/familyTree/tree @@ -1428,10 +1428,10 @@ Name: Edward IV URL: -. +http://en.wikipedia.org/wiki/Edward_IV_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/4/4d/Edward4.jpg/229px-Edward4.jpg Born: 28/04/1442 @@ -1480,10 +1480,10 @@ Name: Edward V URL: -. +http://en.wikipedia.org/wiki/Edward_V_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/5/53/King-edward-v.jpg/200px-King-edward-v.jpg Born: 02/11/1470 @@ -1516,10 +1516,10 @@ Name: Richard III URL: -. +http://en.wikipedia.org/wiki/Richard_III_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/0/09/Richard_III_earliest_surviving_portrait.jpg/230px-Richard_III_earliest_surviving_portrait.jpg Born: 02/10/1452 @@ -1555,10 +1555,10 @@ Name: Henry VII URL: -. +http://en.wikipedia.org/wiki/Henry_VII_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/e/e9/King_Henry_VII.jpg/220px-King_Henry_VII.jpg Born: 28/01/1457 @@ -1594,10 +1594,10 @@ Name: Henry VIII URL: -. +http://en.wikipedia.org/wiki/Henry_VIII_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/0/07/Workshop_of_Hans_Holbein_the_Younger_-_Portrait_of_Henry_VIII_-_Google_Art_Project.jpg/220px-Workshop_of_Hans_Holbein_the_Younger_-_Portrait_of_Henry_VIII_-_Google_Art_Project.jpg Born: 28/06/1491 @@ -1686,10 +1686,10 @@ Name: Edward VI URL: -. +http://en.wikipedia.org/wiki/Edward_VI_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/7/7f/Portrait_of_Edward_VI_of_England.jpg/220px-Portrait_of_Edward_VI_of_England.jpg Born: 21/10/1537 @@ -1725,10 +1725,10 @@ Name: Jane Grey URL: -. +http://en.wikipedia.org/wiki/Lady_Jane_Grey Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/8/87/Streathamladyjayne.jpg/220px-Streathamladyjayne.jpg Born: C1536-1537 @@ -1764,10 +1764,10 @@ Name: Mary I URL: -. +http://en.wikipedia.org/wiki/Mary_I_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/6/6e/Maria_Tudor1.jpg/220px-Maria_Tudor1.jpg Born: 18/02/1516 @@ -1848,10 +1848,10 @@ Name: Elizabeth I URL: -. +http://en.wikipedia.org/wiki/Elizabeth_I_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/a/af/Darnley_stage_3.jpg/220px-Darnley_stage_3.jpg Born: 07/09/1533 @@ -1884,10 +1884,10 @@ Name: James VI & I URL: -. +http://en.wikipedia.org/wiki/James_VI_and_I Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/7/72/James_I_of_England_by_Daniel_Mytens.jpg/200px-James_I_of_England_by_Daniel_Mytens.jpg Born: 19/06/1566 @@ -1933,10 +1933,10 @@ Name: Charles I URL: -. +http://en.wikipedia.org/wiki/Charles_I_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/King_Charles_I_after_original_by_van_Dyck.jpg/220px-King_Charles_I_after_original_by_van_Dyck.jpg Born: 19/11/1600 @@ -1983,10 +1983,10 @@ Name: Charles II URL: -. +http://en.wikipedia.org/wiki/Charles_II_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/5/51/King_Charles_II_by_John_Michael_Wright_or_studio.jpg/220px-King_Charles_II_by_John_Michael_Wright_or_studio.jpg Born: 26/05/1630 @@ -2033,10 +2033,10 @@ Name: James VII & II URL: -. +http://en.wikipedia.org/wiki/James_II_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/King_James_II_by_Sir_Godfrey_Kneller%2C_Bt.jpg/220px-King_James_II_by_Sir_Godfrey_Kneller%2C_Bt.jpg Born: 14/10/1633 @@ -2074,10 +2074,10 @@ Name: Mary II URL: -. +http://en.wikipedia.org/wiki/Mary_II_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/6/65/1662_Mary_II.jpg/220px-1662_Mary_II.jpg Born: 30/04/1662 @@ -2117,10 +2117,10 @@ Name: William II & III URL: -. +http://en.wikipedia.org/wiki/William_III_of_England Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/5/5c/King_William_III_of_England%2C_%281650-1702%29_%28lighter%29.jpg/220px-King_William_III_of_England%2C_%281650-1702%29_%28lighter%29.jpg Born: 04/11/1650 @@ -2176,10 +2176,10 @@ Name: Anne URL: -. +http://en.wikipedia.org/wiki/Anne,_Queen_of_Great_Britain Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/7/75/Anne1705.jpg/220px-Anne1705.jpg Born: 06/02/1665 @@ -2228,10 +2228,10 @@ Name: George I URL: -. +http://en.wikipedia.org/wiki/George_I_of_Great_Britain Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/0/02/King_George_I_by_Sir_Godfrey_Kneller%2C_Bt_%283%29.jpg/226px-King_George_I_by_Sir_Godfrey_Kneller%2C_Bt_%283%29.jpg Born: 28/05/1660 @@ -2279,10 +2279,10 @@ Name: George II URL: -. +http://en.wikipedia.org/wiki/George_II_of_Great_Britain Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/c/cf/George_II_by_Thomas_Hudson.jpg/220px-George_II_by_Thomas_Hudson.jpg Born: 10/11/1683 @@ -2320,10 +2320,10 @@ Name: George III URL: -. +http://en.wikipedia.org/wiki/George_III_of_the_United_Kingdom Picture: -. +http://upload.wikimedia.org/wikipedia/commons/thumb/5/54/George_III_in_Coronation_edit.jpg/250px-George_III_in_Coronation_edit.jpg Born: 04/06/1738 @@ -3226,7 +3226,7 @@ Picture: . Born: -C 1057 +? Died: 1066 @@ -4491,7 +4491,7 @@ Picture: . Born: -02/04/1683 +02/04/1653 Died: 28/10/1708 @@ -9752,7 +9752,7 @@ Mother: Anne Spouses: -275 +295 Style: Duke of Burnswick Luneburg @@ -9789,7 +9789,7 @@ Mother: Sophie Margarete Spouses: -295 +276 Style: Margrave of Brandenburg-Ansbach @@ -10391,7 +10391,7 @@ ID: 295 Name: -Eleonore Desmier d'Obreuse +Eleonore Desmier d'Olbreuse URL: . @@ -13704,3 +13704,1979 @@ Spouses: +ID: +410 + +Name: +Mary of York + +URL: +. + +Picture: +. + +Born: +11/08/1467 +Died: +23/05/1482 + +Father: +34 +Mother: +101 + +Spouses: + + + + +ID: +411 + +Name: +Cecily of York + +URL: +. + +Picture: +. + +Born: +20/03/1469 +Died: +24/08/1507 + +Father: +34 +Mother: +101 + +Spouses: +Ralph Scrope +JohnWelles +Thomas Kyme + + + +ID: +412 + +Name: +Margaret of York + +URL: +. + +Picture: +. + +Born: +10/04/1472 +Died: +11/12/1472 + +Father: +34 +Mother: +101 + +Spouses: + + + + +ID: +413 + +Name: +Richard of Shrewsbury + +URL: +. + +Picture: +. + +Born: +17/08/1473 +Died: +? + +Father: +34 +Mother: +101 + +Spouses: +Anne de Mowbray + +Style: +Duke of York +Territories: +York + +From: +05/1474 +To: +? + + + +ID: +414 + +Name: +Anne of York + +URL: +. + +Picture: +. + +Born: +2/11/1475 +Died: +23/11/1511 + +Father: +34 +Mother: +101 + +Spouses: +Thomas Howard + + + +ID: +415 + +Name: +George Plantagenet + +URL: +. + +Picture: +. + +Born: +03/1477 +Died: +03/1479 + +Father: +34 +Mother: +101 + +Style: +Duke of Bedford +Territories: +Bedford + +From: + + + +ID: +416 + +Name: +Catherine of York + +URL: +. + +Picture: +. + +Born: +14/08/1479 +Died: +15/11/1527 + +Father: +34 +Mother: +101 + +Spouses: +William Courtenay + + + +ID: +417 + +Name: +Bridget of York + +URL: +. + +Picture: +. + +Born: +10/11/1480 +Died: +1517 + +Father: +34 +Mother: +101 + +Spouses: + + + + +ID: +418 + +Name: +Edward of Middleham + +URL: +. + +Picture: +. + +Born: +11/1473 +Died: +09/04/1484 + +Father: +36 +Mother: +102 + +Style: +Prince of Wales, Duke of Cornwall, Earl of Chester, Earl of Salisbury +Territories: +Wales +Cornwall +Chester +Salisbury + +From: +? +To: +? + + + +ID: +419 + +Name: +Elizabeth Tudor + +URL: +. + +Picture: +. + +Born: +02/07/1492 +Died: +14/09/1495 + +Father: +37 +Mother: +103 + +Spouses: + + + + +ID: +420 + +Name: +Edmund Tudor + +URL: +. + +Picture: +. + +Born: +21/02/1499 +Died: +19/06/1500 + +Father: +37 +Mother: +103 + +Style: +Duke of Somerset +Territories: +Somerset + +From: +? +To: +? + + + +ID: +421 + +Name: +Katherine Tudor + +URL: +. + +Picture: +. + +Born: +02/02/1503 +Died: +10/02/1503 + +Father: +37 +Mother: +103 + +Spouses: + + + + +ID: +422 + +Name: +daughter + +URL: +. + +Picture: +. + +Born: +31/01/1510 +Died: +31/01/1510 + +Father: +38 +Mother: +104 + +Spouses: + + + + +ID: +423 + +Name: +Henry + +URL: +. + +Picture: +. + +Born: +01/01/1511 +Died: +22/02/1511 + +Father: +38 +Mother: +104 + +Spouses: + + + + +ID: +424 + +Name: +son + +URL: +. + +Picture: +. + +Born: +11/1513 +Died: +11/1513 + +Father: +38 +Mother: +104 + +Spouses: + + + + +ID: +425 + +Name: +Henry + +URL: +. + +Picture: +. + +Born: +12/1514 +Died: +12/1514 + +Father: +38 +Mother: +104 + +Spouses: + + + + +ID: +426 + +Name: +daughter + +URL: +. + +Picture: +. + +Born: +11/1518 +Died: +11/1518 + +Father: +38 +Mother: +104 + +Spouses: + + + + +ID: +427 + +Name: +Henry + +URL: +. + +Picture: +. + +Born: +08/1534 +Died: +08/1534 + +Father: +38 +Mother: +105 + +Spouses: + + + + +ID: +428 + +Name: +Henry Frederick + +URL: +. + +Picture: +. + +Born: +19/02/1594 +Died: +06/11/1612 + +Father: +43 +Mother: +112 + +Style: +Prince of Wales, Duke of Cornwall, Earl of Chester +Territories: +Wales +Cornwall +Chester + +From: +? +To: +? + + + +ID: +429 + +Name: +Margaret Stuart + +URL: +. + +Picture: +. + +Born: +24/12/1598 +Died: +03/1600 + +Father: +43 +Mother: +112 + +Spouses: + + + + +ID: +430 + +Name: +Robert + +URL: +. + +Picture: +. + +Born: +18/01/1602 +Died: +24/05/1602 + +Father: +43 +Mother: +112 + +Spouses: + + + + +ID: +431 + +Name: +Mary Stuart + +URL: +. + +Picture: +. + +Born: +08/04/1605 +Died: +06/09/1607 + +Father: +43 +Mother: +112 + +Spouses: + + + + +ID: +432 + +Name: +Sophia of England + +URL: +. + +Picture: +. + +Born: +22/06/1606 +Died: +23/06/1606 + +Father: +43 +Mother: +112 + +Spouses: + + + + +ID: +433 + +Name: +Charles James + +URL: +. + +Picture: +. + +Born: +13/05/1629 +Died: +13/05/1629 + +Father: +44 +Mother: +113 + +Spouses: + + + + +ID: +434 + +Name: +Elizabeth + +URL: +. + +Picture: +. + +Born: +28/12/1635 +Died: +08/09/1650 + +Father: +44 +Mother: +113 + +Spouses: + + + + +ID: +435 + +Name: +Anne of England + +URL: +. + +Picture: +. + +Born: +17/03/1637 +Died: +05/11/1640 + +Father: +44 +Mother: +113 + +Spouses: + + + + +ID: +436 + +Name: +Henry Stuart + +URL: +. + +Picture: +. + +Born: +08/07/1640 +Died: +13/09/1660 + +Father: +44 +Mother: +113 + +Style: +Duke of Gloucester +Territories: +Gloucester + +From: +? +To: +? + + + +ID: +437 + +Name: +Henrietta of England + +URL: +. + +Picture: +. + +Born: +16/06/16344 +Died: +30/06/1670 + +Father: +44 +Mother: +113 + +Spouses: +Philippe of France + + + +ID: +438 + +Name: +Catherine + +URL: +. + +Picture: +. + +Born: +29/06/1639 +Died: +29/06/1639 + +Father: +44 +Mother: +113 + +Spouses: + + + + +ID: +439 + +Name: +Charles Stuart + +URL: +. + +Picture: +. + +Born: +22/10/1660 +Died: +05/05/1661 + +Father: +46 +Mother: +115 + +Style: +Duke of Cambridge +Territories: +Cambridge + +From: +? +To: +? + + + +ID: +440 + +Name: +James Stuart + +URL: +. + +Picture: +. + +Born: +12/07/1663 +Died: +20/06/1667 + +Father: +46 +Mother: +115 + +Style: +Duke of Cambridge +Territories: +Cambridge + +From: +? +To: +? + + + +ID: +441 + +Name: +Charles Stuart + +URL: +. + +Picture: +. + +Born: +04/07/1666 +Died: +22/05/1667 + +Father: +46 +Mother: +115 + +Style: +Duke of Kendal +Territories: +Kendal + +From: +? +To: +? + + + +ID: +442 + +Name: +Edgar Stuart + +URL: +. + +Picture: +. + +Born: +14/09/1667 +Died: +08/06/1674 + +Father: +46 +Mother: +115 + +Style: +Duke of Cambridge +Territories: +Cambridge + +From: +? +To: +? + + + +ID: +443 + +Name: +Henrietta + +URL: +. + +Picture: +. + +Born: +14/01/1669 +Died: +15/01/1669 + +Father: +46 +Mother: +115 + +Spouses: + + + + +ID: +444 + +Name: +Catherine + +URL: +. + +Picture: +. + +Born: +09/02/1671 +Died: +05/12/1671 + +Father: +46 +Mother: +115 + +Spouses: + + + + +ID: +446 + +Name: +Catherine Laura + +URL: +. + +Picture: +. + +Born: +16/08/1682 +Died: +16/10/1682 + +Father: +46 +Mother: +116 + +Spouses: + + + + +ID: +447 + +Name: +Isabel Stuart + +URL: +. + +Picture: +. + +Born: +28/08/1676 +Died: +02/03/1681 + +Father: +46 +Mother: +116 + +Spouses: + + + + +ID: +448 + +Name: +Charles Stuart + +URL: +. + +Picture: +. + +Born: +07/11/1677 +Died: +12/12/1677 + +Father: +46 +Mother: +116 + +Style: +Duke of Cambridge +Territories: +Cambridge + +From: +? +To: +? + + + +ID: +449 + +Name: +Elizabeth + +URL: +. + +Picture: +. + +Born: +1678 +Died: +1678 + +Father: +46 +Mother: +116 + +Spouses: + + + + +ID: +450 + +Name: +Charlotte Maria + +URL: +. + +Picture: +. + +Born: +16/08/1682 +Died: +16/08/1682 + +Father: +46 +Mother: +116 + +Spouses: + + + + +ID: +451 + +Name: +James Francis Edward Stuart + +URL: +. + +Picture: +. + +Born: +10/06/1688 +Died: +01/01/1766 + +Father: +46 +Mother: +116 + +Spouses: +Maria Clementina Sobieska + + + +ID: +452 + +Name: +Louisa Maria Teresa Stuart + +URL: +. + +Picture: +. + +Born: +28/06/1692 +Died: +18/04/1712 + +Father: +46 +Mother: +116 + +Spouses: + + + + +ID: +453 + +Name: +Mary + +URL: +. + +Picture: +. + +Born: +02/06/1685 +Died: +08/02/1687 + +Father: +117 +Mother: +49 + +Spouses: + + + + +ID: +454 + +Name: +Anne Sophia + +URL: +. + +Picture: +. + +Born: +12/05/1686 +Died: +02/02/1687 + +Father: +117 +Mother: +49 + +Spouses: + + + + +ID: +455 + +Name: +William + +URL: +. + +Picture: +. + +Born: +24/07/1689 +Died: +30/07/1700 + +Father: +117 +Mother: +49 + +Style: +Duke of Gloucester +Territories: +Gloucester + +From: +? +To: +? + + + +ID: +456 + +Name: +Mary + +URL: +. + +Picture: +. + +Born: +14/10/1690 +Died: +14/10/1690 + +Father: +117 +Mother: +49 + +Spouses: + + + + +ID: +457 + +Name: +George + +URL: +. + +Picture: +. + +Born: +17/04/1692 +Died: +17/04/1692 + +Father: +117 +Mother: +49 + +Spouses: + + + + +ID: +458 + +Name: +Sophia Dorothea of Hanover + +URL: +. + +Picture: +. + +Born: +26/03/1687 +Died: +28/06/1757 + +Father: +50 +Mother: +118 + +Spouses: +Frederick of Prussia + + + +ID: +459 + +Name: +Anne + +URL: +. + +Picture: +. + +Born: +02/11/1709 +Died: +12/01/1759 + +Father: +51 +Mother: +119 + +Spouses: +William IV of Orange + + + +ID: +460 + +Name: +Amelia + +URL: +. + +Picture: +. + +Born: +30/05/1711 +Died: +31/10/1786 + +Father: +51 +Mother: +119 + +Spouses: + + + + +ID: +461 + +Name: +Caroline + +URL: +. + +Picture: +. + +Born: +10/06/1713 +Died: +28/11/1757 + +Father: +51 +Mother: +119 + +Spouses: + + + + +ID: +462 + +Name: +son + +URL: +. + +Picture: +. + +Born: +30/11/1716 +Died: +30/11/1716 + +Father: +51 +Mother: +119 + +Spouses: + + + + +ID: +463 + +Name: +George William + +URL: +. + +Picture: +. + +Born: +13/11/1717 +Died: +17/02/1718 + +Father: +51 +Mother: +119 + +Spouses: + + + + +ID: +464 + +Name: +William + +URL: +. + +Picture: +. + +Born: +26/04/1721 +Died: +31/10/1765 + +Father: +51 +Mother: +119 + +Style: +Duke of Cumberland +Territories: +Cumberland + +From: +? +To: +? + + + +ID: +465 + +Name: +Princess Mary + +URL: +. + +Picture: +. + +Born: +05/03/1723 +Died: +14/01/1772 + +Father: +51 +Mother: +119 + +Spouses: +Frederick II + + + +ID: +466 + +Name: +Louise + +URL: +. + +Picture: +. + +Born: +107/12/1724 +Died: +19/12/1751 + +Father: +51 +Mother: +119 + +Spouses: +Frederick V + + + +ID: +467 + +Name: +Charlotte + +URL: +. + +Picture: +. + +Born: +29/09/1766 +Died: +05/10/1828 + +Father: +52 +Mother: +120 + +Spouses: +Frederick II + + + +ID: +468 + +Name: +Augusta Sophia + +URL: +. + +Picture: +. + +Born: +08/11/1768 +Died: +22/09/1840 + +Father: +52 +Mother: +120 + +Spouses: + + + + +ID: +469 + +Name: +Elizabeth + +URL: +. + +Picture: +. + +Born: +22/05/1770 +Died: +10/01/1840 + +Father: +52 +Mother: +120 + +Spouses: +Frederick VI + + + +ID: +470 + +Name: +Ernest Augustus + +URL: +. + +Picture: +. + +Born: +05/06/1771 +Died: +18/11/1851 + +Father: +52 +Mother: +120 + +Spouses: +Frederica + +Style: +King of Hanover +Territories: +Hanover + +From: +20/06/1837 +To: +18/11/1851 + + + +ID: +471 + +Name: +Augustus Frederick + +URL: +. + +Picture: +. + +Born: +27/01/1773 +Died: +21/04/1843 + +Father: +52 +Mother: +120 + +Spouses: +Augusta Murray +Cecilia Letitia Buggin + +Style: +Duke of Sussex +Territories: +Sussex + +From: +? +To: +? + + + +ID: +472 + +Name: +Adolphus Frederick + +URL: +. + +Picture: +. + +Born: +24/02/1774 +Died: +08/07/1850 + +Father: +52 +Mother: +120 + +Spouses: +Augusta + +Style: +Duke of Cambridge +Territories: +Cambridge + +From: +? +To: +? + + + +ID: +473 + +Name: +Mary + +URL: +. + +Picture: +. + +Born: +25/04/1776 +Died: +30/04/1857 + +Father: +52 +Mother: +120 + +Spouses: +William Frederick + + + +ID: +474 + +Name: +Sophia + +URL: +. + +Picture: +. + +Born: +03/11/1777 +Died: +27/05/1848 + +Father: +52 +Mother: +120 + +Spouses: + + + + +ID: +475 + +Name: +Octavius + +URL: +. + +Picture: +. + +Born: +23/02/1779 +Died: +03/05/1783 + +Father: +52 +Mother: +120 + +Spouses: + + + + +ID: +476 + +Name: +Alfred + +URL: +. + +Picture: +. + +Born: +22/09/1780 +Died: +20/08/1782 + +Father: +52 +Mother: +120 + +Spouses: + + + + +ID: +477 + +Name: +Amelia + +URL: +. + +Picture: +. + +Born: +07/08/1783 +Died: +02/11/1810 + +Father: +52 +Mother: +120 + +Spouses: + + + + +ID: +478 + +Name: +Frederick + +URL: +. + +Picture: +. + +Born: +16/08/1763 +Died: +05/01/1827 + +Father: +52 +Mother: +120 + +Spouses: +Frederica Charlotte + +Style: +Duke of York and Albany +Territories: +Albany +York + +From: +? +To: +? + + + diff --git a/familyTree/tree.db b/familyTree/tree.db index 1f5e3c1..969caa5 100644 Binary files a/familyTree/tree.db and b/familyTree/tree.db differ