Commit 24174a51 authored by Jonathon Duerig's avatar Jonathon Duerig

Add rspec output version list to GetVersion call

parent aac97d1b
......@@ -206,7 +206,9 @@ sub DiscoverResourcesAux($$$$)
if (!defined($version));
# Sanity check since this can come from client.
if (! ($version eq "0.1" || $version eq "0.2" ||$version eq "2")) {
if (! ($version eq "0.1" || $version eq "0.2" || $version eq "2"
|| $version eq "PG 0.1" || $version eq "PG 0.2"
|| $version eq "PG 2")) {
return GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Improper version request");
}
......@@ -296,6 +298,13 @@ sub GetAdvertisement($$$$)
my ($available, $pc, $version, $experiment) = @_;
my $xml = undef;
$version = "0.1"
if ($version eq "PG 0.1");
$version = "0.2"
if ($version eq "PG 0.2");
$version = "2"
if ($version eq "PG 2");
my $invocation = "$PTOPGEN -x -g $version -r -p GeniSlices";
if (defined($experiment)) {
my $eid = $experiment->eid();
......
......@@ -82,12 +82,14 @@ my $API_VERSION = 2;
#
sub GetVersion()
{
my @input_rspec_versions = ( "0.1", "2" );
my @input_rspec_versions = ( "0.1", "0.2", "2", "PG 0.1", "PG 0.2", "PG 2" );
my @ad_rspec_versions = ( "0.1", "0.2", "2", "PG 0.1", "PG 0.2", "PG 2" );
my $blob = {
"api" => $API_VERSION,
"level" => 1,
"input_rspec" => \@input_rspec_versions,
"output_rspec" => "0.1"
"output_rspec" => "0.2",
"ad_rspec" => \@ad_rspec_versions
};
return GeniResponse->Create( GENIRESPONSE_SUCCESS, $blob);
......
Markdown is supported
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