From 07187f44757f101d783ff960b901f149c06c0586 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 15 Jan 2012 13:19:32 +0000 Subject: [PATCH] skip expensive by dns node search on initial global find --- .gitignore | 1 + Netdisco/lib/Netdisco/Web/Search.pm | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 34a98a7d..fdd66ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +Netdisco/environments/development.yml test.pl diff --git a/Netdisco/lib/Netdisco/Web/Search.pm b/Netdisco/lib/Netdisco/Web/Search.pm index 41303971..8500c3c3 100644 --- a/Netdisco/lib/Netdisco/Web/Search.pm +++ b/Netdisco/lib/Netdisco/Web/Search.pm @@ -183,18 +183,13 @@ get '/search' => sub { })->count) { params->{'tab'} = 'device'; } - elsif ($s->resultset('NodeIp')->search({ - dns => { '-ilike' => "\%$q\%" }, - })->count) { - params->{'tab'} = 'node'; - } elsif ($s->resultset('DevicePort')->search({ name => { '-ilike' => "\%$q\%" }, })->count) { params->{'tab'} = 'port'; } } - params->{'tab'} ||= 'device'; + params->{'tab'} ||= 'node'; } } elsif (not $q) {