X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=blobdiff_plain;f=videosite%2FBase.pm;h=437ef98839b0e5232e1cfbdf8fa16f952e2eb5b1;hp=d9e2044401b1e852de24d1433676e7bc07127435;hb=ba7da213efc2779e513a1b8c535a5a89283527c8;hpb=3d9694d738be71df68ef048dd11c3c8dfc1815d0 diff --git a/videosite/Base.pm b/videosite/Base.pm index d9e2044..437ef98 100644 --- a/videosite/Base.pm +++ b/videosite/Base.pm @@ -10,10 +10,10 @@ use Data::Dumper; sub new { my $class = shift; - my $self = {'_DEBUG' => 0, - '_CONNECTOR' => undef, + my $self = {'_CONNECTOR' => undef, _API => { - io => sub { printf(@_) }, + io => sub { print(@_) }, + io_debug => sub { print(@_) }, connectors => sub { return ({ 'name' => 'direct', 'schemas' => {} }) }, }, @@ -40,8 +40,9 @@ sub debug { 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 { @@ -84,7 +85,7 @@ sub getconfstr { 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"; @@ -148,12 +149,6 @@ sub gethelpstr { return $s; } -sub setdebug { - my $self = shift; - - $self->{'_DEBUG'} = shift; -} - sub ua { my $self = shift; my $ua;