--- test/html-webhacc/WebHACC/Result.pm	2008/08/15 12:11:56	1.12
+++ test/html-webhacc/WebHACC/Result.pm	2008/08/16 07:42:20	1.14
@@ -185,8 +185,8 @@
       } elsif (defined $opt{input}->{request_uri}) {
         $out->url ($opt{input}->{request_uri});
         $has_location = 1;
-      } elsif (defined $opt{input}->{uri}) {
-        $out->url ($opt{input}->{uri});
+      } elsif (defined $opt{input}->url) {
+        $out->url ($opt{input}->url);
         $has_location = 1;
       }
     }
@@ -204,14 +204,8 @@
   
   ## Error message
   my $error_type_text = $opt{type};
-  $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text});
-
-  ## Additional error description
-  if (defined $opt{text}) { ## TODO: Remove this block once all errors are put into the catalog.
-    $out->html (' (<q>');
-    $out->text ($opt{text});
-    $out->html ('</q>)');
-  }
+  $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},
+                 value => $opt{value});
   
   ## Link to a long description