- Closes #228 "Apache::Session::Browseable searchOn functions broken by new Apache::Session wrapper"

- Avoid MySQL locks failed
- "--ignore..." works only on target
environments/ppa-mbqj77/deployments/1
Xavier Guimard 15 years ago
parent e24ccf2696
commit c8c785fed7
  1. 4
      build/lemonldap-ng/Makefile
  2. 8
      modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Apache/Session.pm
  3. 3
      modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/_DBI.pm

@ -586,7 +586,7 @@ debian-diff:
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm $(DIFFPREFIX)/usr/share/perl5/Lemonldap/NG/Manager.pm ||true
@$(DIFF) lemonldap-ng-manager/example/index.pl $(DIFFPREFIX)/var/lib/lemonldap-ng/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/sessions.pl $(DIFFPREFIX)/var/lib/lemonldap-ng/manager/sessions.pl ||true
@$(DIFF) --ignore-matching-lines=='.*__APACHE.*' lemonldap-ng-manager/example/scripts/lmConfigEditor $(DIFFPREFIX)/usr/share/lemonldap-ng/bin/lmConfigEditor ||true
@$(DIFF) --ignore-matching-lines='.*POSIX.*' lemonldap-ng-manager/example/scripts/lmConfigEditor $(DIFFPREFIX)/usr/share/lemonldap-ng/bin/lmConfigEditor ||true
@for i in $(MANAGERSKINS); do \
$(DIFF) -x 'jquery*' lemonldap-ng-manager/example/skins/$$i $(DIFFPREFIX)/usr/share/lemonldap-ng/manager-skins/$$i; \
done ||true
@ -618,7 +618,7 @@ default-diff:
@$(DIFF) lemonldap-ng-manager/example/skins $(LMPREFIX)/htdocs/manager/skins ||true
@$(DIFF) lemonldap-ng-manager/example/index.pl $(LMPREFIX)/htdocs/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/sessions.pl $(LMPREFIX)/htdocs/manager/sessions.pl ||true
@$(DIFF) --ignore-matching-lines=='.*__APACHE.*' lemonldap-ng-manager/example/scripts/lmConfigEditor $(LMPREFIX)/bin/lmConfigEditor ||true
@$(DIFF) --ignore-matching-lines='.*POSIX.*' lemonldap-ng-manager/example/scripts/lmConfigEditor $(LMPREFIX)/bin/lmConfigEditor ||true
tidy: clean
find lemon*/ -type f \( -name '*.pm' -or -name '*.pl' -or -name '*.t' \) -print -exec perltidy -b {} \;

@ -18,7 +18,7 @@ sub _load {
my $backend = shift;
unless ( $backend->can('populate') ) {
eval "require $backend";
die $@ if($@);
die $@ if ($@);
}
}
@ -50,8 +50,7 @@ sub searchOn {
my $backend = $args->{backend};
_load($backend);
if ( $backend->can('searchOn') ) {
$backend .= '::searchOn';
return $class->$backend( $args, $selectField, $value, @fields );
return $backend->searchOn( $args, $selectField, $value, @fields );
}
my %res = ();
$class->get_key_from_all_sessions(
@ -100,8 +99,7 @@ sub get_key_from_all_sessions {
my $backend = $_[0]->{backend};
_load($backend);
if ( $backend->can('get_key_from_all_sessions') ) {
$backend .= '::get_key_from_all_sessions';
return $class->$backend(@_);
return $backend->get_key_from_all_sessions(@_);
}
if ( $backend =~
/^Apache::Session::(?:MySQL|Postgres|Oracle|Sybase|Informix)$/ )

@ -69,6 +69,7 @@ sub lock {
my @row = $sth->fetchrow_array;
return $row[0] || 0;
};
return 1;
}
else {
@ -88,6 +89,7 @@ sub isLocked {
my @row = $sth->fetchrow_array;
return $row[0] ? 0 : 1;
};
return 0;
}
else {
@ -107,6 +109,7 @@ sub unlock {
my @row = $sth->fetchrow_array;
return $row[0] || 0;
};
return 1;
}
else {

Loading…
Cancel
Save