summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-12-28 04:12:01 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-12-28 04:12:01 (GMT)
commit1268074ec678c83c58baa437404c13b7d15cabcd (patch)
tree54b78691ad370b6f639e839abb1ee79b065f3ab8
parent9970c30a07d722b5ca5c5a5d1a2b370f6305fd79 (diff)
get dropboxes now takes type names as used by output
-rwxr-xr-xlib/RHRD/rddb.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/RHRD/rddb.pm b/lib/RHRD/rddb.pm
index 3ffb76a..1be87ac 100755
--- a/lib/RHRD/rddb.pm
+++ b/lib/RHRD/rddb.pm
@@ -890,7 +890,11 @@ sub get_dropboxes
my @allowed_dbs;
while(my ($group, $to_cart, $normlevel, $trimlevel, $params, $path, $lowcart, $highcart, $groupdesc) = $sth->fetchrow_array()) {
my @p = split(';', $params);
- next if (defined $type && $type ne $p[0]);
+ if (defined $type) {
+ if(!($type eq 'show' && $p[0] eq "S") && !($type eq 'jingle' && $p[0] eq "J") && !($type eq 'musicpool' && $p[0] eq "M")) {
+ next
+ }
+ }
my $entry = {};
$entry->{'GROUP'} = $group;
@@ -1127,7 +1131,7 @@ sub get_show_group_carts_used
{
my ($ctx, $groupname) = @_;
- my @dropboxes = RHRD::rddb::get_dropboxes($ctx, undef, $groupname, 'S');
+ my @dropboxes = RHRD::rddb::get_dropboxes($ctx, undef, $groupname, 'show');
if(!defined $dropboxes[0]) {
if(defined $dropboxes[1]) {
return (undef, $dropboxes[1], $dropboxes[2]);