--- family/view.inc 2008-12-06 03:23:35.000000000 +0000 +++ family/view.inc 2009-04-26 21:12:52.000000000 +0000 @@ -54,6 +54,26 @@ function family_make_location($var, $lin } +// return "Father", "Mother", or "Parent" +function family_parent_reln($nid) +{ + $relation = NULL ; + if ($nid) { + $relation = "Parent" ; + $facts=db_fetch_array(db_query("SELECT * FROM {family_individual} WHERE nid = %d",$nid)) ; + if ($facts['gender']) { + if ($facts['gender'] == 'M') { + $relation = "Father" ; + } + elseif ($facts['gender'] == 'F') { + $relation = "Mother" ; + } + } + } + return $relation ; +} + + // Generate summary of individual information function family_summ_indi ($nid) { $content="

"; @@ -69,13 +89,11 @@ $content .= "".l("View //Find parents $fam=db_fetch_array(db_query("SELECT parent1, parent2 FROM {family_group} WHERE nid='%s'",$facts['ancestor_group'])); if ($fam) { - $father = $fam['parent1']; - if ($father) { - $list[] = 'Father: '. family_make_name($father,TRUE); - } - $mother = $fam['parent2']; - if ($mother) { - $list[] = 'Mother: '. family_make_name($mother,TRUE); + if ($fam['parent1']) { + $list[] = family_parent_reln($fam['parent1']) . ': ' . family_make_name($fam['parent1'],TRUE); + } + if ($fam['parent2']) { + $list[] = family_parent_reln($fam['parent2']) . ': ' . family_make_name($fam['parent2'],TRUE); } } if ($show_record) { @@ -149,4 +167,4 @@ $content .='

< $content .= '
'; //Break before sources, biography, and comments return($content); -} \ No newline at end of file +}