[Rt-commit] r10459 - rtir/branches/2.3-EXPERIMENTAL/html/Callbacks/RTIR/Elements/MakeClicky

[ruz at bestpractical.com]

Author: ruz
Date: Wed Jan 23 18:15:51 2008
New Revision: 10459

Modified:
   rtir/branches/2.3-EXPERIMENTAL/html/Callbacks/RTIR/Elements/MakeClicky/Default

Log:
* url_overwrite should override url_overwrite instead of url action
* add RTIR's overridings for url action

Modified: rtir/branches/2.3-EXPERIMENTAL/html/Callbacks/RTIR/Elements/MakeClicky/Default
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/Callbacks/RTIR/Elements/MakeClicky/Default	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/Callbacks/RTIR/Elements/MakeClicky/Default	Wed Jan 23 18:15:51 2008
@@ -12,17 +12,26 @@
         my %args = @_;
         return qq{<a href="$web_path/RTIR/Tools/Lookup.html?$args{lookup_params}q=$args{value}">$args{value}</a>};
     },
-    url_overwrite => sub {
+    url => sub {
         my %args = @_;
-        my $uri  = URI::URL->new($args{value});
-        my $host = $uri->host;
 
+        my $host = $args{'all_matches'}[3];
         my $super = $super{url} ? $super{url}->(%args) : $args{value};
 
         my $result = qq{[<a href="$web_path/RTIR/Tools/Lookup.html?$args{lookup_params}type=host&q=$host">}
             .loc('lookup "[_1]"', $host) .qq{</a>]};
         return $super . qq{ <span class="clickylink">$result</span>};
     },
+    url_overwrite => sub {
+        my %args = @_;
+
+        my $host = $args{'all_matches'}[3];
+        my $super = $super{url_overwrite} ? $super{url_overwrite}->(%args) : $args{value};
+
+        my $result = qq{[<a href="$web_path/RTIR/Tools/Lookup.html?$args{lookup_params}type=host&q=$host">}
+            .loc('lookup "[_1]"', $host) .qq{</a>]};
+        return $super . qq{ <span class="clickylink">$result</span>};
+    },
     ip => sub {
         my %args = @_;
         $args{host} ||= $args{value};