[LDAPsh-cvs] ldapsh ldapsh,1.19,1.20

[<j-d...@us...>]

Update of /cvsroot/ldapsh/ldapsh
In directory sc8-pr-cvs1:/tmp/cvs-serv31584

Modified Files:
	ldapsh 
Log Message:
Define _haventries for uniform reporting of empty $ENTRIES.


Index: ldapsh
===================================================================
RCS file: /cvsroot/ldapsh/ldapsh/ldapsh,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ldapsh	27 Jul 2003 06:56:36 -0000	1.19
--- ldapsh	27 Jul 2003 07:03:01 -0000	1.20
***************
*** 368,371 ****
--- 368,379 ----
  }
  
+ sub _haveentries {
+ 	my $entries = shift || $Globals->{ENTRIES}{VALUE};
+ 	unless (defined($entries) && scalar(@{$entries}) > 0) {
+ 		print STDERR "No entries defined. Have you forgotten to do a search prior to changing anything?\n";
+ 		return undef;
+ 	}
+ }
+ 
  # Search with Connection error checking, and try to reconnect if disconnected
  sub _searchWEC {
***************
*** 1628,1635 ****
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	unless (defined($entries)) {
! 		print STDERR "No entries defined. Have you forgot to do a search prior to change anything?\n";
! 		return 0;
! 	}
  
  	map { &$code; } @$entries;
--- 1636,1640 ----
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	_haveentries($entries) or return 0;
  
  	map { &$code; } @$entries;
***************
*** 1649,1656 ****
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	unless (defined($entries)) {
! 		print STDERR "No entries defined. Have you forgot to do a search prior to change anything?\n";
! 		return 0;
! 	}
  
  	my $nbchanges = 0;
--- 1654,1658 ----
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	_haveentries($entries);
  
  	my $nbchanges = 0;
***************
*** 1698,1705 ****
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	unless (defined($entries)) {
! 		print STDERR "No entries defined. Have you forgot to do a search prior to change anything?\n";
! 		return 0;
! 	}
  
  	my $result;
--- 1700,1704 ----
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	_haveentries($entries) or return 0;
  
  	my $result;
***************
*** 1804,1811 ****
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	unless (defined($entries)) {
! 		print STDERR "No entries defined. Have you forgot to do a search prior to change anything?\n";
! 		return 0;
! 	}
  
  	my $nbentries = scalar(@$entries);
--- 1803,1807 ----
  	my $entries = shift || $Globals->{ENTRIES}{VALUE};
  
! 	_haveentries($entries) or return 0;
  
  	my $nbentries = scalar(@$entries);
***************
*** 1860,1867 ****
  	if (scalar(@_) == 1) {
  		$entries = $Globals->{ENTRIES}{VALUE};
! 		unless (defined($entries)) {
! 			print STDERR "No entries defined. Have you forgot to do a search prior to exclude something from the results?\n";
! 			return undef;
! 		}
  		$regexp = shift;
  	} elsif (scalar(@_) == 2) {
--- 1856,1860 ----
  	if (scalar(@_) == 1) {
  		$entries = $Globals->{ENTRIES}{VALUE};
! 		_haveentries($entries) or return undef;
  		$regexp = shift;
  	} elsif (scalar(@_) == 2) {
***************
*** 1882,1888 ****
  
  	if ($counter) {
! 		printf STDERR "-----\n%d %s excluded\n", $counter, ($counter > 1 ? 'entries' : 'entry');
  	} else {
! 		printf STDERR ">> No entry matched the regular expression\n\n";
  	}
  	return $entries;
--- 1875,1881 ----
  
  	if ($counter) {
! 		printf STDERR "-----\n%d %s excluded.\n", $counter, ($counter > 1 ? 'entries' : 'entry');
  	} else {
! 		printf STDERR ">> No entries matched the regular expression.\n";
  	}
  	return $entries;