From a9748ac28517cd9a6162c797d143d2c1777dc9ed Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Sat, 30 Jul 2016 03:23:21 +0200
Subject: musicpools vs musicgrid


diff --git a/lib/RHRD/rddb.pm b/lib/RHRD/rddb.pm
index e1335fe..81ca9be 100755
--- a/lib/RHRD/rddb.pm
+++ b/lib/RHRD/rddb.pm
@@ -2078,7 +2078,7 @@ sub remove_musicpool
   return @actions;
 }
 
-sub is_musicpools_user
+sub is_musicgrid_user
 {
   my ($ctx, $username) = @_;
 
@@ -2104,7 +2104,7 @@ sub is_musicpools_user
   return 0;
 }
 
-sub set_musicpools_user
+sub set_musicgrid_user
 {
   my ($ctx, $username, $value) = @_;
 
@@ -2124,7 +2124,7 @@ sub set_musicpools_user
   return ($rows, 'OK', 'success');
 }
 
-sub get_musicpools_clocks
+sub get_musicgrid_clocks
 {
   my ($ctx) = @_;
 
@@ -2156,7 +2156,7 @@ sub get_musicpools_clocks
   return @clocks;
 }
 
-sub set_musicpools_clock
+sub set_musicgrid_clock
 {
   my ($ctx, $dow, $hour, $shortname) = @_;
 
diff --git a/test/get-music-clocks b/test/get-music-clocks
index 20f2932..89fc53a 100755
--- a/test/get-music-clocks
+++ b/test/get-music-clocks
@@ -29,7 +29,7 @@ use RHRD::rddb;
 my @clocks = ();
 my ($ctx, $status, $errorstring) = RHRD::rddb::init();
 if(defined $ctx) {
-  @clocks = RHRD::rddb::get_musicpools_clocks($ctx);
+  @clocks = RHRD::rddb::get_musicgrid_clocks($ctx);
   if(!defined $clocks[0] && defined $clocks[1]) {
     print STDERR "$clocks[1]: $clocks[2]";
     RHRD::rddb::destroy($ctx);
diff --git a/test/music-grids b/test/music-grids
index 35bb702..8a15e76 100755
--- a/test/music-grids
+++ b/test/music-grids
@@ -29,7 +29,7 @@ my ($ctx, $status, $errorstring) = RHRD::rddb::init();
 if(defined $ctx) {
   my $username = "";
   $username = $ARGV[0] if(defined($ARGV[0]));
-  (my $authorized, $status, $errorstring) = RHRD::rddb::is_musicpools_user($ctx, $username);
+  (my $authorized, $status, $errorstring) = RHRD::rddb::is_musicgrid_user($ctx, $username);
   if(!defined $authorized) {
     print STDERR "$status: $errorstring\n";
     RHRD::rddb::destroy($ctx);
diff --git a/utils/rhrd-user b/utils/rhrd-user
index 14e5462..8aeacc9 100755
--- a/utils/rhrd-user
+++ b/utils/rhrd-user
@@ -104,7 +104,7 @@ sub is_grids
 {
   my ($ctx, $username) = @_;
 
-  my ($authorized, $status, $errorstring) = RHRD::rddb::is_musicpools_user($ctx, $username);
+  my ($authorized, $status, $errorstring) = RHRD::rddb::is_musicgrid_user($ctx, $username);
   if(!defined $authorized) {
     print STDERR "$status: $errorstring\n";
     return 1;
@@ -122,7 +122,7 @@ sub set_grids
     return 1;
   }
 
-  my ($cnt, $status, $errorstring) = RHRD::rddb::set_musicpools_user($ctx, $username, $value);
+  my ($cnt, $status, $errorstring) = RHRD::rddb::set_musicgrid_user($ctx, $username, $value);
   if(!defined $cnt) {
     print STDERR "$status: $errorstring\n";
     return 1;
-- 
cgit v0.10.2