diff --git a/www/genihistory.php b/www/genihistory.php index 6eee1042fba98d8feac1c7a46a58c41034203092..7dbbe72fa3468577fa4f7862a70df086855903bf 100644 --- a/www/genihistory.php +++ b/www/genihistory.php @@ -72,8 +72,8 @@ if (isset($showtypes["aggregates"])) { $table = array('#id' => 'aggregate', '#title' => "Aggregate History", '#headings' => array("idx" => "ID", - "slice_hrn" => "Slice HRN", - "creator_hrn" => "Creator HRN", + "slice_hrn" => "Slice HRN/URN", + "creator_hrn" => "Creator HRN/URN", "created" => "Created", "Destroyed" => "Destroyed", "Manifest" => "Manifest")); @@ -85,12 +85,24 @@ if (isset($showtypes["aggregates"])) { $uuid = $row["uuid"]; $slice_hrn = $row["slice_hrn"]; $creator_hrn = $row["creator_hrn"]; + $slice_urn = $row["slice_urn"]; + $creator_urn = $row["creator_urn"]; $created = $row["created"]; $destroyed = $row["destroyed"]; + # If we have urns, show those instead. + $slice_info = $slice_hrn; + if (isset($slice_urn)) { + $slice_info = "$slice_urn"; + } + $creator_info = $creator_hrn; + if (isset($creator_urn)) { + $creator_info = "$creator_urn"; + } + $tablerow = array("idx" => $idx, - "hrn" => $slice_hrn, - "creator" => $creator_hrn, + "hrn" => $slice_info, + "creator" => $creator_info, "created" => $created, "destroyed" => $destroyed); diff --git a/www/genislices.php b/www/genislices.php index 8d453568778ecfa3bca984915a4cf30d694bc854..5a9ff8d6b48e215611cc1dee8d8369cdedf05f8a 100644 --- a/www/genislices.php +++ b/www/genislices.php @@ -1,7 +1,7 @@