Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / svc_hardware.pm

diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm
index 96502e4..dc9ac59 100644 (file)
--- a/FS/FS/svc_hardware.pm
+++ b/FS/FS/svc_hardware.pm
@@ -1,10 +1,9 @@
 package FS::svc_hardware;
+use base qw( FS::svc_Common );
 
 use strict;
-use base qw( FS::svc_Common );
 use vars qw( $conf );
-use FS::Record qw( qsearch qsearchs );
-use FS::hardware_type;
+use FS::Record qw( qsearchs ); #qsearch qsearchs );
 use FS::hardware_status;
 use FS::Conf;
 
@@ -105,9 +104,13 @@ sub search_sql {
   my ($class, $string) = @_;
   my @where = ();
 
-  my $ip = NetAddr::IP->new($string);
-  if ( $ip ) {
-    push @where, $class->search_sql_field('ip_addr', $ip->addr);
+  if ( $string =~ /^[\d\.:]+$/ ) {
+    # if the string isn't an IP address, this will waste several seconds
+    # attempting a DNS lookup.  so try to filter those out.
+    my $ip = NetAddr::IP->new($string);
+    if ( $ip ) {
+      push @where, $class->search_sql_field('ip_addr', $ip->addr);
+    }
   }
   
   if ( $string =~ /^(\w+)$/ ) {
@@ -196,13 +199,6 @@ sub check {
 
 Returns the L<FS::hardware_type> object associated with this installation.
 
-=cut
-
-sub hardware_type {
-  my $self = shift;
-  return qsearchs('hardware_type', { 'typenum' => $self->typenum });
-}
-
 =item status_label
 
 Returns the 'label' field of the L<FS::hardware_status> object associated