[Catalyst-commits] r6631 - in trunk/Catalyst-Model-LDAP: . lib/Catalyst/Model lib/Catalyst/Model/LDAP

[omega at dev.catalyst.perl.org]

Author: omega
Date: 2007-08-09 10:23:04 +0100 (Thu, 09 Aug 2007)
New Revision: 6631

Modified:
   trunk/Catalyst-Model-LDAP/
   trunk/Catalyst-Model-LDAP/Changes
   trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm
   trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Connection.pm
Log:
 r15951 at andreas-marienborgs-computer:  andreas | 2007-08-09 10:45:01 +0200
 a small fix to Connection->search when $mesg->control returns an array



Property changes on: trunk/Catalyst-Model-LDAP
___________________________________________________________________
Name: svk:merge
   - 20164c6d-cd09-0410-925d-b4c4e616b846:/local/Catalyst-Model-LDAP:15102
d5d31d6e-1f00-0410-95d2-b6c42ccb6655:/trunk:90
   + 20164c6d-cd09-0410-925d-b4c4e616b846:/local/Catalyst-Model-LDAP:15102
d5d31d6e-1f00-0410-95d2-b6c42ccb6655:/trunk:90
ea49d7f7-7c45-40ca-be27-1349e20c1c07:/local/c-model-ldap:15951

Modified: trunk/Catalyst-Model-LDAP/Changes
===================================================================
--- trunk/Catalyst-Model-LDAP/Changes	2007-08-09 07:59:45 UTC (rev 6630)
+++ trunk/Catalyst-Model-LDAP/Changes	2007-08-09 09:23:04 UTC (rev 6631)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Model::LDAP.
-
+0.17  Thu Aug 09 10:40:00 CET 2007    
+        - Fix Connection->search to handle array-return from 
+          $mesg->control.
+          
 0.16
         - Fix Catalyst::Model::LDAP::Entry's constructor
         - Reorganize tests a little

Modified: trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Connection.pm
===================================================================
--- trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Connection.pm	2007-08-09 07:59:45 UTC (rev 6630)
+++ trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Connection.pm	2007-08-09 09:23:04 UTC (rev 6631)
@@ -190,6 +190,7 @@
         $mesg = $self->next::method(%args);
         my $resp = $mesg->control(LDAP_CONTROL_VLVRESPONSE) or
             croak 'Could not get pager from LDAP response: ' . $mesg->server_error;
+        $resp = $resp->[0] if (ref($resp) eq 'ARRAY');
         $pager = Data::Page->new($resp->content, $rows, $page);
     }
     else {

Modified: trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm
===================================================================
--- trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm	2007-08-09 07:59:45 UTC (rev 6630)
+++ trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm	2007-08-09 09:23:04 UTC (rev 6631)
@@ -5,7 +5,7 @@
 use base qw/Catalyst::Model/;
 use Carp qw/croak/;
 
-our $VERSION = '0.16_01';
+our $VERSION = '0.1701';
 
 =head1 NAME