summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2007-08-24 18:32:52 +0000
committerAndreas Brachold <vdr07@deltab.de>2007-08-24 18:32:52 +0000
commitbe8c52fbac04ede51b7c3e353106d66cd15df681 (patch)
tree9b312a386bf59dbf833fc0b5db2c49d84fd507e8
parentfaad4d39c273e1feec1f5a8641186a269dd8beda (diff)
downloadxxv-be8c52fbac04ede51b7c3e353106d66cd15df681.tar.gz
xxv-be8c52fbac04ede51b7c3e353106d66cd15df681.tar.bz2
* RECORDS: Fix parse channel data from info.vdr(1.5.x)
* footer.tmpl : Link to project page
-rw-r--r--html/widgets/footer.tmpl2
-rw-r--r--lib/XXV/MODULES/RECORDS.pm9
2 files changed, 6 insertions, 5 deletions
diff --git a/html/widgets/footer.tmpl b/html/widgets/footer.tmpl
index ff0a5b6..5e5fbe3 100644
--- a/html/widgets/footer.tmpl
+++ b/html/widgets/footer.tmpl
@@ -54,7 +54,7 @@ print Dumper($stash->_dump_frame(5));
<center class='footer'>
User: <?% user %?><br>
-XXV System -- Version: <?% version %?> -- created by xpix, hulk and poetter 2004 - 2007
+<a href="http://xxv.berlios.de">XXV System</a> -- Version: <?% version %?> -- created by xpix, hulk and poetter 2004 - 2007
</center>
</body>
</HTML>
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm
index fc9395d..f1f354d 100644
--- a/lib/XXV/MODULES/RECORDS.pm
+++ b/lib/XXV/MODULES/RECORDS.pm
@@ -866,7 +866,7 @@ sub videoInfo {
$status->{summary} =~ s/^\s+//; # no leading white space
$status->{summary} =~ s/\s+$//; # no trailing white space
}
- elsif($zeile =~ /^C\s+(.+)$/s) {
+ elsif($zeile =~ /^C\s+(\S+)/s) {
$status->{channel} = $1;
$status->{type} = $cmod->getChannelType($status->{channel});
}
@@ -1549,7 +1549,7 @@ WHERE
$desc =~ s/^\s+//; # no leading white space
$desc =~ s/\s+$//; # no trailing white space
}
- elsif($zeile =~ /^C\s+(.+)$/s) {
+ elsif($zeile =~ /^C\s+(\S+)/s) {
$channel = $1;
}
elsif($zeile =~ /^X\s+1\s+(.+)$/s) {
@@ -1678,7 +1678,7 @@ WHERE
undef $data->{summary};
}
}
- elsif($zeile =~ /^C\s+(.+)$/s) {
+ elsif($zeile =~ /^C\s+(\S+)/s) {
if(defined $data->{channel} && $data->{channel}) {
$data->{channel} =~ s/^\s+//;
$data->{channel} =~ s/\s+$//;
@@ -1939,7 +1939,8 @@ sub IdToPath {
my $sth = $obj->{dbh}->prepare('select Path from RECORDS where RecordMD5 = ?');
$sth->execute($id)
or return error sprintf("Can't execute query: %s.",$sth->errstr);
- return $sth->fetchrow_hashref()->{Path};
+ my $erg = $sth->fetchrow_hashref();
+ return $erg ? $erg->{Path} : undef;
}
# ------------------