Commit bbcb657a authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Longitude/latitude/country location information will default to sitevar values if present.

parent 9c649900
...@@ -65,6 +65,13 @@ if ($PGENISUPPORT) { ...@@ -65,6 +65,13 @@ if ($PGENISUPPORT) {
$cmurn = GeniHRN::Generate($OURDOMAIN, "authority", "cm"); $cmurn = GeniHRN::Generate($OURDOMAIN, "authority", "cm");
} }
my $default_long = undef;
TBGetSiteVar('protogeni/default_longitude', \$default_long);
my $default_lat = undef;
TBGetSiteVar('protogeni/default_latitude', \$default_lat);
my $default_country = undef;
TBGetSiteVar('protogeni/default_country', \$default_country);
my $delaycap_override; my $delaycap_override;
# #
...@@ -1530,6 +1537,13 @@ sub print_node ...@@ -1530,6 +1537,13 @@ sub print_node
my $country = shift(@_); my $country = shift(@_);
my $lat = shift(@_); my $lat = shift(@_);
my $long = shift(@_); my $long = shift(@_);
if (! defined($lat) || ! defined($long)) {
$lat = $default_lat;
$long = $default_long;
}
if (! defined($country)) {
$country = $default_country;
}
if (!$do_xml) { if (!$do_xml) {
my $text = "node $name " . my $text = "node $name " .
join(" ", @$types) . " - " . join(" ", @$features) . join(" ", @$types) . " - " . join(" ", @$features) .
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment