[LDAPsh-cvs] ldapsh ldapsh,1.46,1.47

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

Update of /cvsroot/ldapsh/ldapsh
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17734

Modified Files:
	ldapsh 
Log Message:
* Added '-k' option for 'vi'.


Index: ldapsh
===================================================================
RCS file: /cvsroot/ldapsh/ldapsh/ldapsh,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ldapsh	9 Feb 2004 08:27:34 -0000	1.46
--- ldapsh	9 Feb 2004 09:07:17 -0000	1.47
***************
*** 2497,2501 ****
  =head3 vi
  
! B<Synopsis>: C<vi E<lt>expansionE<gt>>
  
  Show the entries matched by the expansion (see L<Expansion|"Expansion of LDAP DNs and Filters">) in a text editor.
--- 2497,2501 ----
  =head3 vi
  
! B<Synopsis>: C<vi ['-k',] E<lt>expansionE<gt>>
  
  Show the entries matched by the expansion (see L<Expansion|"Expansion of LDAP DNs and Filters">) in a text editor.
***************
*** 2504,2514 ****
  the search results. Any changes can be viewed using L<changes|changes> and will need to
  be committed using L<commit|commit>.
! BUG (TODO): If you add an attribute to an entry (so, if you add a value to an attribute
! that hadn't previously a value), it will not be detected. We should do a two-way check.
  
  =cut
  
  sub vi {
! 	my $entries = _entriesExpander undef, @_;
  	return 0 unless defined $entries;
  
--- 2504,2516 ----
  the search results. Any changes can be viewed using L<changes|changes> and will need to
  be committed using L<commit|commit>.
! 
! Normally, the LDIF file is deleted once the changes have been read in.
! The C<-k> parameter prevents this.
  
  =cut
  
  sub vi {
! 	my $localArgs = {};
! 	my $entries = _entriesExpander [$localArgs, 'k'], @_;
  	return 0 unless defined $entries;
  
***************
*** 2588,2592 ****
  		}
  	}
! 	unlink $tempfile;
  	return $entries;
  }
--- 2590,2599 ----
  		}
  	}
! 	if ($localArgs->{k}) {
! 		print STDERR "LDIF stored in $tempfile\n\n";
! 	}
! 	else {
! 		unlink $tempfile;
! 	}
  	return $entries;
  }