[perl-ldap-checkins] CVS: ldap/lib/Net/LDAP Schema.pm,1.11,1.12

[Graham B. <gb...@us...>]

Update of /cvsroot/perl-ldap/ldap/lib/Net/LDAP
In directory usw-pr-cvs1:/tmp/cvs-serv9279/lib/Net/LDAP

Modified Files:
	Schema.pm 
Log Message:
- Fix bug in ->item when $item_name is not specified
- Don't generate an element name from the description, use the OID


Index: Schema.pm
===================================================================
RCS file: /cvsroot/perl-ldap/ldap/lib/Net/LDAP/Schema.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Schema.pm	2001/07/29 04:21:57	1.11
+++ Schema.pm	2001/12/19 22:27:58	1.12
@@ -7,7 +7,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = "0.10";
+$VERSION = "0.11";
 
 #
 # Get schema from the server (or read from LDIF) and parse it into 
@@ -255,7 +255,8 @@
 
   my $item_ref = $self->{oid}->{$oid[0]} or return _error($self, "Unknown OID");
 
-  my $value = $item_ref->{$item_name} or return _error($self, "No such property");
+  my $value = defined($item_name) ? $item_ref->{lc $item_name} : $item_ref
+    or return _error($self, "No such property");
   delete $self->{error};
 
   if( ref $value eq "ARRAY" && wantarray ) {
@@ -544,12 +545,7 @@
       # Force a name if we don't have one
       #
       if (!exists $schema_entry{name}) {
-        if (exists $schema_entry{desc}) {
-	  ($schema_entry{name} = $schema_entry{desc}) =~ s/\s+//g
-        }
-        else {
-	  $schema_entry{name} = "$type:$schema_entry{oid}"
-        }
+	$schema_entry{name} = $schema_entry{oid};
       }
 
       #