diff --git a/bin/update-metadata.in b/bin/update-metadata.in index 4e1609f686406c0b8e232f5f49264999f353593f..fa8a242526f6b356d969211d8facd18b678d25de 100755 --- a/bin/update-metadata.in +++ b/bin/update-metadata.in @@ -90,10 +90,11 @@ foreach my $id (split(/, */, $configuration->{groups}->{list})) { next if $seen{$entry->{entityid}}++; my $entity = AccountManager::Entity->new( - db => $db, - entityid => $entry->{entityid}, - displayname => $entry->{display_name}, - url => $entry->{url}, + db => $db, + entityid => $entry->{entityid}, + displayname => $entry->{display_name}, + information_url => $entry->{information_url}, + organization_url => $entry->{organization_url}, ); $entity->contacts(uniq map { $_->{EmailAddress} } @{$entry->{contacts}}) diff --git a/conf/manager.sql b/conf/manager.sql index 322924a29a68cae3b9f4413f204a44ba62306e16..3402cc1c000da37a53388cba11376c7474a3a60d 100644 --- a/conf/manager.sql +++ b/conf/manager.sql @@ -14,7 +14,8 @@ CREATE TABLE tokens ( CREATE TABLE entities ( id bigint(20) NOT NULL AUTO_INCREMENT, entityid varchar(200) NOT NULL, - url varchar(200) DEFAULT NULL, + information_url varchar(200) DEFAULT NULL, + organization_url varchar(200) DEFAULT NULL, displayname varchar(500) DEFAULT NULL, contacts varchar(2000) DEFAULT NULL, PRIMARY KEY (id), diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm index 6f93a70247cc7920c01d8f1344c72a3c476224c9..9bce226ada19255c730da56c6e66084f125d0792 100644 --- a/lib/AccountManager/App.pm +++ b/lib/AccountManager/App.pm @@ -696,7 +696,7 @@ sub req_create_accounts { action => 'create_accounts', accounts => \@accounts, entityid => $entityid, - url => $sp->url(), + url => $sp->information_url(), email => $email, key => $key, token => $download_token->secret(), diff --git a/lib/AccountManager/Entity.pm b/lib/AccountManager/Entity.pm index 1005691b14613e30d6339df568daef073992e4fc..970d0aababc9323bb1f5f06055a2680fd4ea0fe1 100644 --- a/lib/AccountManager/Entity.pm +++ b/lib/AccountManager/Entity.pm @@ -12,11 +12,12 @@ __PACKAGE__->meta->setup( table => 'entities', columns => [ - id => { type => 'bigserial', not_null => 1 }, - entityid => { type => 'varchar', length => 200, not_null => 1 }, - displayname => { type => 'varchar', length => 500 }, - url => { type => 'varchar', length => 200 }, - contacts => { type => 'array' }, + id => { type => 'bigserial', not_null => 1 }, + entityid => { type => 'varchar', length => 200, not_null => 1 }, + displayname => { type => 'varchar', length => 500 }, + information_url => { type => 'varchar', length => 200 }, + organization_url => { type => 'varchar', length => 200 }, + contacts => { type => 'array' }, ], primary_key_columns => [ 'id' ], diff --git a/lib/AccountManager/Metadata.pm b/lib/AccountManager/Metadata.pm index e1937954cbbf494a79a7b5ed7bd1e895e48d0760..654435b76ae9791c05a301e82b7e1859c4ac2ee0 100644 --- a/lib/AccountManager/Metadata.pm +++ b/lib/AccountManager/Metadata.pm @@ -146,7 +146,7 @@ sub parse { my %urls = map { $_->getAttribute('xml:lang') => $_->textContent() } @urls; - $data->{url} = + $data->{information_url} = $urls{en} ? $urls{en} : @urls ? $urls[0]->textContent() : undef; @@ -191,7 +191,7 @@ sub parse { my %urls = map { $_->getAttribute('xml:lang') => $_->textContent() } @urls; - $data->{organization} = + $data->{organization_url} = $urls{en} ? $urls{en} : @urls ? $urls[0]->textContent() : undef;