summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-07-08 15:44:34 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-07-08 15:44:43 (GMT)
commit661bf8aea88508ee89c08ee6ede2220f4e035176 (patch)
treeff4972806b09c23677810a8ea97480c8a4010ab2
parentf67ca98e8c4acbe11398d802a15c3c76a4b8f95c (diff)
added support for jingle dropboxes
-rwxr-xr-xlib/rddb.pm5
-rwxr-xr-xrh-bin/listdropboxes.cgi4
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/rddb.pm b/lib/rddb.pm
index 1d6102a..a5c1f20 100755
--- a/lib/rddb.pm
+++ b/lib/rddb.pm
@@ -167,6 +167,11 @@ sub get_dropboxes
substr($p[3], 2, 0) = ':';
$entry->{'SHOWSTARTTIME'} = $p[3];
$entry->{'SHOWLEN'} = int $p[4];
+ } elsif($p[0] eq "J") {
+ $entry->{'TYPE'} = 'jingle';
+ $entry->{'JINGLETITLE'} = $groupdesc;
+ $entry->{'JINGLECART'} = int $p[1];
+ $entry->{'JINGLECARTDISABLED'} = int $p[2];
}
push @allowed_dbs, $entry;
diff --git a/rh-bin/listdropboxes.cgi b/rh-bin/listdropboxes.cgi
index 189e6cf..bfdc925 100755
--- a/rh-bin/listdropboxes.cgi
+++ b/rh-bin/listdropboxes.cgi
@@ -83,6 +83,10 @@ if($responsecode != 200) {
print " <show-dayofweek>" . $href->{'SHOWDOW'} . "</show-dayofweek>\n";
print " <show-starttime>" . $href->{'SHOWSTARTTIME'} . "</show-starttime>\n";
print " <show-length>" . $href->{'SHOWLEN'} . "</show-length>\n";
+ } elsif($href->{'TYPE'} eq "jingle") {
+ print " <jingle-title>" . $href->{'JINGLETITLE'} . "</jingle-title>\n";
+ print " <jingle-cart>" . $href->{'JINGLECART'} . "</jingle-cart>\n";
+ print " <jingle-cartdisabled>" . $href->{'JINGLECARTDISABLED'} . "</jingle-cartdisabled>\n";
}
print " </dropbox>\n";
}