Removed references to Machines.

[clearscm.git] / clearadm / lib / Clearadm.pm

diff --git a/clearadm/lib/Clearadm.pm b/clearadm/lib/Clearadm.pm
index 7e57109..fb63079 100644 (file)
--- a/clearadm/lib/Clearadm.pm
+++ b/clearadm/lib/Clearadm.pm
@@ -86,6 +86,7 @@ use warnings;
 
 use Carp;
 use DBI;
+use File::Basename;
 use Net::Domain qw(hostdomain);
 
 use FindBin;
@@ -97,7 +98,9 @@ use Display;
 use GetConfig;
 use Mail;
 
-our %CLEAROPTS = GetConfig ("$FindBin::Bin/etc/clearadm.conf");
+my $conf = dirname (__FILE__) . '/../etc/clearadm.conf';
+
+our %CLEAROPTS = GetConfig ($conf);
 
 # Globals
 our $VERSION  = '$Revision: 1.54 $';
@@ -484,6 +487,14 @@ sub FindSystem (;$) {
   return $self->_getRecords ('system', $condition);
 } # FindSystem
 
+sub SearchSystem (;$) {\r
+  my ($self, $condition) = @_;
+  
+  $condition = "name like '%'" unless $condition;
+  
+  return $self->_getRecords ('system', $condition); \r
+} # SearchSystem
+
 sub AddPackage (%) {
   my ($self, %package) = @_;