Commit 842d7231 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Look for uuid versions of the names last. I want my URNS.

parent ec9ab02f
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# GENIPUBLIC-COPYRIGHT # GENIPUBLIC-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group. # Copyright (c) 2010-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
package GeniXML; package GeniXML;
...@@ -304,8 +304,8 @@ sub SetExpires($$) ...@@ -304,8 +304,8 @@ sub SetExpires($$)
sub GetNodeId($) sub GetNodeId($)
{ {
my ($node) = @_; my ($node) = @_;
return GetFirstText($node, "component_uuid", "component_urn", "uuid", return GetFirstText($node, "component_urn", "component_id",
"component_id"); "component_uuid", "uuid");
} }
sub GetVirtualId($) sub GetVirtualId($)
...@@ -336,8 +336,8 @@ sub GetSliverId($) ...@@ -336,8 +336,8 @@ sub GetSliverId($)
sub GetManagerId($) sub GetManagerId($)
{ {
my ($node) = @_; my ($node) = @_;
return GetFirstText($node, "component_manager_uuid", return GetFirstText($node, "component_manager_urn",
"component_manager_urn", "component_manager_id"); "component_manager_id", "component_manager_uuid");
} }
sub GetColocate($) sub GetColocate($)
......
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