git://git.camperquake.de
/
videosite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Base: redirect debug output to own io handler, remove local debug flags
[videosite.git]
/
videosite
/
Base.pm
diff --git
a/videosite/Base.pm
b/videosite/Base.pm
index
d9e2044
..
437ef98
100644
(file)
--- a/
videosite/Base.pm
+++ b/
videosite/Base.pm
@@
-10,10
+10,10
@@
use Data::Dumper;
sub new {
my $class = shift;
sub new {
my $class = shift;
- my $self = {'_DEBUG' => 0,
- '_CONNECTOR' => undef,
+ my $self = {'_CONNECTOR' => undef,
_API => {
_API => {
- io => sub { printf(@_) },
+ io => sub { print(@_) },
+ io_debug => sub { print(@_) },
connectors => sub { return ({ 'name' => 'direct',
'schemas' => {} }) },
},
connectors => sub { return ({ 'name' => 'direct',
'schemas' => {} }) },
},
@@
-40,8
+40,9
@@
sub debug {
my $self = shift;
my @data = @_;
my $self = shift;
my @data = @_;
- $data[0] = "DEBUG: " . $data[0];
- if ($self->{'_DEBUG'} != 0) {$self->error(@data)};
+ $data[0] = "(" . ref($self) . ") " . $data[0];
+
+ $self->{_API}->{io_debug}->(@data);
}
sub _getval {
}
sub _getval {
@@
-84,7
+85,7
@@
sub getconfstr {
my $p;
foreach $k (keys(%{$self->{'_PARAMS'}})) {
my $p;
foreach $k (keys(%{$self->{'_PARAMS'}})) {
- $p = $self->
{_API}->{config_get}->{$k}
;
+ $p = $self->
_getval($k)
;
$s .= sprintf(" %s: %s", $k, $p);
if ($p eq $self->{'_PARAMS'}->{$k}->[0]) {
$s .= " (default)\n";
$s .= sprintf(" %s: %s", $k, $p);
if ($p eq $self->{'_PARAMS'}->{$k}->[0]) {
$s .= " (default)\n";
@@
-148,12
+149,6
@@
sub gethelpstr {
return $s;
}
return $s;
}
-sub setdebug {
- my $self = shift;
-
- $self->{'_DEBUG'} = shift;
-}
-
sub ua {
my $self = shift;
my $ua;
sub ua {
my $self = shift;
my $ua;