refactoring

optimize imports
reformat source code
remove unused cpu and memory log functionality
This commit is contained in:
Milan
2018-08-29 00:10:15 +02:00
parent c37c71f29e
commit 05b1251c1a
81 changed files with 9242 additions and 9962 deletions

View File

@@ -1,6 +1,6 @@
#!/bin/perl
package project;
package project;
use warnings "all";
use strict;
@@ -8,487 +8,491 @@ use strict;
use Data::Dumper;
use Date::Calc;
use config;
use log;
use template;
use images;
use config();
use log();
use template();
use images();
require Exporter;
our @ISA = qw(Exporter);
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(
check get_columns get insert delete get_date_range
get_studios assign_studio unassign_studio is_studio_assigned get_studio_assignments
get_series_ids assign_series unassign_series is_series_assigned get_series_assignments
get_with_dates get_sorted
check get_columns get insert delete get_date_range
get_studios assign_studio unassign_studio is_studio_assigned get_studio_assignments
get_series_ids assign_series unassign_series is_series_assigned get_series_assignments
get_with_dates get_sorted
);
#TODO: globally replace get_studios by get_studio_assignments
our %EXPORT_TAGS = ( 'all' => [ @EXPORT_OK ] );
our %EXPORT_TAGS = ( 'all' => [@EXPORT_OK] );
sub debug;
# get project columns
sub get_columns{
my $config=shift;
sub get_columns {
my $config = shift;
my $dbh=db::connect($config);
my $cols=db::get_columns($dbh, 'calcms_projects');
my $columns={};
for my $col (@$cols){
$columns->{$col}=1;
my $dbh = db::connect($config);
my $cols = db::get_columns( $dbh, 'calcms_projects' );
my $columns = {};
for my $col (@$cols) {
$columns->{$col} = 1;
}
return $columns;
}
# get projects
sub get{
my $config=shift;
my $condition=shift;
sub get {
my $config = shift;
my $condition = shift;
my $dbh=db::connect($config);
my $dbh = db::connect($config);
my @conditions=();
my @bind_values=();
my @conditions = ();
my @bind_values = ();
if ((defined $condition->{project_id}) && ($condition->{project_id} ne '')){
push @conditions, 'project_id=?';
if ( ( defined $condition->{project_id} ) && ( $condition->{project_id} ne '' ) ) {
push @conditions, 'project_id=?';
push @bind_values, $condition->{project_id};
}
if ((defined $condition->{name}) && ($condition->{name} ne '')){
push @conditions, 'name=?';
if ( ( defined $condition->{name} ) && ( $condition->{name} ne '' ) ) {
push @conditions, 'name=?';
push @bind_values, $condition->{name};
}
my $limit='';
if ((defined $condition->{limit}) && ($condition->{limit} ne '')){
$limit= 'limit '.$condition->{limit};
}
my $limit = '';
if ( ( defined $condition->{limit} ) && ( $condition->{limit} ne '' ) ) {
$limit = 'limit ' . $condition->{limit};
}
my $conditions='';
$conditions=" where ".join(" and ",@conditions) if (@conditions>0);
my $conditions = '';
$conditions = " where " . join( " and ", @conditions ) if ( @conditions > 0 );
my $query=qq{
my $query = qq{
select *
from calcms_projects
$conditions
order by start_date
$limit
};
#print STDERR Dumper($query).Dumper(\@bind_values);
my $projects=db::get($dbh, $query, \@bind_values);
#print STDERR Dumper($query).Dumper(\@bind_values);
my $projects = db::get( $dbh, $query, \@bind_values );
return $projects;
}
# requires at least project_id
sub getImageById{
sub getImageById {
my $config = shift;
my $conditions = shift;
return undef unless defined $conditions->{project_id};
my $projects=project::get($config, $conditions);
return undef if scalar(@$projects) != 1;
return $projects->[0]->{image};
my $conditions = shift;
return undef unless defined $conditions->{project_id};
my $projects = project::get( $config, $conditions );
return undef if scalar(@$projects) != 1;
return $projects->[0]->{image};
}
sub get_date_range{
my $config=shift;
my $query=qq{
sub get_date_range {
my $config = shift;
my $query = qq{
select min(start_date) start_date, max(end_date) end_date
from calcms_projects
};
my $dbh=db::connect($config);
my $dbh = db::connect($config);
my $projects=db::get($dbh, $query);
my $projects = db::get( $dbh, $query );
return $projects->[0];
}
# insert project
sub insert{
my $config=shift;
my $entry=shift;
sub insert {
my $config = shift;
my $entry = shift;
my $columns=get_columns($config);
my $project={};
for my $column (keys %$columns){
$project->{$column} = $entry->{$column} if defined $entry->{$column};
}
my $columns = get_columns($config);
my $project = {};
for my $column ( keys %$columns ) {
$project->{$column} = $entry->{$column} if defined $entry->{$column};
}
$project->{image} = images::normalizeName( $project->{image} ) if defined $project->{image};
$project->{image} = images::normalizeName( $project->{image} ) if defined $project->{image};
my $dbh=db::connect($config);
my $id=db::insert($dbh, 'calcms_projects', $project);
return $id;
my $dbh = db::connect($config);
my $id = db::insert( $dbh, 'calcms_projects', $project );
return $id;
}
# update project
sub update{
my $config=shift;
my $project=shift;
sub update {
my $config = shift;
my $project = shift;
my $columns=project::get_columns($config);
my $entry={};
for my $column (keys %$columns){
$entry->{$column}=$project->{$column} if defined $project->{$column};
}
my $columns = project::get_columns($config);
my $entry = {};
for my $column ( keys %$columns ) {
$entry->{$column} = $project->{$column} if defined $project->{$column};
}
$entry->{image} = images::normalizeName( $entry->{image} ) if defined $entry->{image};
$entry->{image} = images::normalizeName( $entry->{image} ) if defined $entry->{image};
my $values =join(",", map {$_.'=?'} (keys %$entry));
my @bind_values =map {$entry->{$_}} (keys %$entry);
push @bind_values,$entry->{project_id};
my $values = join( ",", map { $_ . '=?' } ( keys %$entry ) );
my @bind_values = map { $entry->{$_} } ( keys %$entry );
push @bind_values, $entry->{project_id};
my $query=qq{
my $query = qq{
update calcms_projects
set $values
where project_id=?
};
#print STDERR Dumper($query).Dumper(\@bind_values);
my $dbh=db::connect($config);
db::put($dbh, $query, \@bind_values);
#print STDERR Dumper($query).Dumper(\@bind_values);
my $dbh = db::connect($config);
db::put( $dbh, $query, \@bind_values );
}
# delete project
sub delete{
my $config=shift;
my $entry=shift;
my $dbh=db::connect($config);
db::put($dbh, 'delete from calcms_projects where project_id=?', [$entry->{project_id}]);
sub delete {
my $config = shift;
my $entry = shift;
my $dbh = db::connect($config);
db::put( $dbh, 'delete from calcms_projects where project_id=?', [ $entry->{project_id} ] );
}
# get studios of a project
sub get_studios{
my $config=shift;
my $options=shift;
return undef unless defined $options->{project_id};
my $project_id=$options->{project_id};
sub get_studios {
my $config = shift;
my $options = shift;
my $query=qq{
return undef unless defined $options->{project_id};
my $project_id = $options->{project_id};
my $query = qq{
select *
from calcms_project_studios
where project_id=?
};
my $dbh=db::connect($config);
my $project_studios=db::get($dbh,$query,[$project_id]);
my $dbh = db::connect($config);
my $project_studios = db::get( $dbh, $query, [$project_id] );
return $project_studios;
}
sub get_studio_assignments{
my $config=shift;
my $options=shift;
sub get_studio_assignments {
my $config = shift;
my $options = shift;
my @conditions=();
my @bind_values=();
my @conditions = ();
my @bind_values = ();
if ((defined $options->{project_id}) && ($options->{project_id} ne '')){
push @conditions, 'project_id=?';
if ( ( defined $options->{project_id} ) && ( $options->{project_id} ne '' ) ) {
push @conditions, 'project_id=?';
push @bind_values, $options->{project_id};
}
if ((defined $options->{studio_id}) && ($options->{studio_id} ne '')){
push @conditions, 'studio_id=?';
if ( ( defined $options->{studio_id} ) && ( $options->{studio_id} ne '' ) ) {
push @conditions, 'studio_id=?';
push @bind_values, $options->{studio_id};
}
my $conditions='';
$conditions=" where ".join(" and ",@conditions) if (@conditions>0);
my $conditions = '';
$conditions = " where " . join( " and ", @conditions ) if ( @conditions > 0 );
my $query=qq{
my $query = qq{
select *
from calcms_project_studios
$conditions
};
my $dbh=db::connect($config);
my $results=db::get($dbh, $query, \@bind_values);
my $dbh = db::connect($config);
my $results = db::get( $dbh, $query, \@bind_values );
return $results;
}
# is studio assigned to project
sub is_studio_assigned{
my $config=shift;
my $entry=shift;
sub is_studio_assigned {
my $config = shift;
my $entry = shift;
return 0 unless defined $entry->{project_id};
return 0 unless defined $entry->{studio_id};
my $project_id=$entry->{project_id};
my $studio_id= $entry->{studio_id};
my $project_id = $entry->{project_id};
my $studio_id = $entry->{studio_id};
my $query=qq{
my $query = qq{
select *
from calcms_project_studios
where project_id=? and studio_id=?
};
my $bind_values=[$project_id, $studio_id];
my $bind_values = [ $project_id, $studio_id ];
my $dbh=db::connect($config);
my $project_studios=db::get($dbh, $query, $bind_values);
return 1 if @$project_studios==1;
my $dbh = db::connect($config);
my $project_studios = db::get( $dbh, $query, $bind_values );
return 1 if @$project_studios == 1;
return 0;
}
# assign studio to project
sub assign_studio{
my $config=shift;
my $entry=shift;
sub assign_studio {
my $config = shift;
my $entry = shift;
return undef unless defined $entry->{project_id};
return undef unless defined $entry->{studio_id};
my $project_id=$entry->{project_id};
my $studio_id= $entry->{studio_id};
my $project_id = $entry->{project_id};
my $studio_id = $entry->{studio_id};
if (is_studio_assigned($entry)){
print STDERR "studio $entry->{studio_id} already assigned to project $entry->{project_id}\n";
return 1;
}
my $dbh=db::connect($config);
my $id=db::insert($dbh, 'calcms_project_studios', $entry);
return $id;
if ( is_studio_assigned($entry) ) {
print STDERR "studio $entry->{studio_id} already assigned to project $entry->{project_id}\n";
return 1;
}
my $dbh = db::connect($config);
my $id = db::insert( $dbh, 'calcms_project_studios', $entry );
return $id;
}
# unassign studio from project
sub unassign_studio{
my $config=shift;
my $entry=shift;
sub unassign_studio {
my $config = shift;
my $entry = shift;
return undef unless defined $entry->{project_id};
return undef unless defined $entry->{studio_id};
my $project_id=$entry->{project_id};
my $studio_id= $entry->{studio_id};
my $project_id = $entry->{project_id};
my $studio_id = $entry->{studio_id};
my $sql='delete from calcms_project_studios where project_id=? and studio_id=?';
my $bind_values=[$project_id, $studio_id];
my $dbh=db::connect($config);
return db::put($dbh, $sql, $bind_values);
my $sql = 'delete from calcms_project_studios where project_id=? and studio_id=?';
my $bind_values = [ $project_id, $studio_id ];
my $dbh = db::connect($config);
return db::put( $dbh, $sql, $bind_values );
}
# get series by project and studio
sub get_series{
my $config=shift;
my $options=shift;
sub get_series {
my $config = shift;
my $options = shift;
return undef unless defined $options->{project_id};
return undef unless defined $options->{studio_id};
my $project_id=$options->{project_id};
my $studio_id= $options->{studio_id};
my $project_id = $options->{project_id};
my $studio_id = $options->{studio_id};
my $query=qq{
my $query = qq{
select *
from calcms_project_series
where project_id=? and studio_id=?
};
my $bind_values=[$project_id, $studio_id];
my $dbh=db::connect($config);
my $project_series=db::get($dbh, $query, $bind_values);
my $bind_values = [ $project_id, $studio_id ];
my $dbh = db::connect($config);
my $project_series = db::get( $dbh, $query, $bind_values );
return $project_series;
}
sub get_series_assignments{
my $config=shift;
my $options=shift;
sub get_series_assignments {
my $config = shift;
my $options = shift;
my @conditions=();
my @bind_values=();
my @conditions = ();
my @bind_values = ();
if ((defined $options->{project_id}) && ($options->{project_id} ne '')){
push @conditions, 'project_id=?';
if ( ( defined $options->{project_id} ) && ( $options->{project_id} ne '' ) ) {
push @conditions, 'project_id=?';
push @bind_values, $options->{project_id};
}
if ((defined $options->{studio_id}) && ($options->{studio_id} ne '')){
push @conditions, 'studio_id=?';
if ( ( defined $options->{studio_id} ) && ( $options->{studio_id} ne '' ) ) {
push @conditions, 'studio_id=?';
push @bind_values, $options->{studio_id};
}
if ((defined $options->{series_id}) && ($options->{series_id} ne '')){
push @conditions, 'series_id=?';
if ( ( defined $options->{series_id} ) && ( $options->{series_id} ne '' ) ) {
push @conditions, 'series_id=?';
push @bind_values, $options->{series_id};
}
my $conditions='';
$conditions=" where ".join(" and ",@conditions) if (@conditions>0);
my $conditions = '';
$conditions = " where " . join( " and ", @conditions ) if ( @conditions > 0 );
my $query=qq{
my $query = qq{
select *
from calcms_project_series
$conditions
};
my $dbh=db::connect($config);
my $results=db::get($dbh, $query, \@bind_values);
my $dbh = db::connect($config);
my $results = db::get( $dbh, $query, \@bind_values );
return $results;
}
# is series assigned to project and studio
sub is_series_assigned{
my $config=shift;
my $entry=shift;
sub is_series_assigned {
my $config = shift;
my $entry = shift;
return 0 unless defined $entry->{project_id};
return 0 unless defined $entry->{studio_id};
return 0 unless defined $entry->{series_id};
my $project_id=$entry->{project_id};
my $studio_id= $entry->{studio_id};
my $series_id= $entry->{series_id};
my $project_id = $entry->{project_id};
my $studio_id = $entry->{studio_id};
my $series_id = $entry->{series_id};
my $query=qq{
my $query = qq{
select *
from calcms_project_series
where project_id=? and studio_id=? and series_id=?
};
my $bind_values=[$project_id, $studio_id, $series_id];
my $bind_values = [ $project_id, $studio_id, $series_id ];
my $dbh=db::connect($config);
my $project_series=db::get($dbh,$query, $bind_values);
return 1 if @$project_series==1;
my $dbh = db::connect($config);
my $project_series = db::get( $dbh, $query, $bind_values );
return 1 if @$project_series == 1;
return 0;
}
# assign series to project and studio
sub assign_series{
my $config=shift;
my $entry=shift;
sub assign_series {
my $config = shift;
my $entry = shift;
return undef unless defined $entry->{project_id};
return undef unless defined $entry->{studio_id};
return undef unless defined $entry->{series_id};
my $project_id=$entry->{project_id};
my $studio_id= $entry->{studio_id};
my $series_id= $entry->{series_id};
my $project_id = $entry->{project_id};
my $studio_id = $entry->{studio_id};
my $series_id = $entry->{series_id};
if (is_series_assigned($entry)){
print STDERR "series $series_id already assigned to project $project_id and studio $studio_id\n";
return return undef;
}
my $dbh=db::connect($config);
my $id=db::insert($dbh, 'calcms_project_series', $entry);
if ( is_series_assigned($entry) ) {
print STDERR "series $series_id already assigned to project $project_id and studio $studio_id\n";
return return undef;
}
my $dbh = db::connect($config);
my $id = db::insert( $dbh, 'calcms_project_series', $entry );
print STDERR "assigned series $series_id to project $project_id and studio $studio_id\n";
return $id;
return $id;
}
# unassign series from project
# TODO: remove series _single_ if no event is assigned to
sub unassign_series{
my $config=shift;
my $entry=shift;
sub unassign_series {
my $config = shift;
my $entry = shift;
return undef unless defined $entry->{project_id};
return undef unless defined $entry->{studio_id};
return undef unless defined $entry->{series_id};
my $project_id=$entry->{project_id};
my $studio_id= $entry->{studio_id};
my $series_id= $entry->{series_id};
my $project_id = $entry->{project_id};
my $studio_id = $entry->{studio_id};
my $series_id = $entry->{series_id};
my $sql='delete from calcms_project_series where project_id=? and studio_id=? and series_id=?';
my $bind_values=[$project_id, $studio_id, $series_id];
my $dbh=db::connect($config);
return db::put($dbh, $sql, $bind_values);
my $sql = 'delete from calcms_project_series where project_id=? and studio_id=? and series_id=?';
my $bind_values = [ $project_id, $studio_id, $series_id ];
my $dbh = db::connect($config);
return db::put( $dbh, $sql, $bind_values );
}
sub get_with_dates{
my $config=shift;
my $options=shift;
sub get_with_dates {
my $config = shift;
my $options = shift;
my $language = $config->{date}->{language} || 'en';
my $projects=project::get($config, {});
my $language = $config->{date}->{language} || 'en';
my $projects = project::get( $config, {} );
foreach my $project (reverse sort { $a->{end_date} cmp $b->{end_date} } (@$projects) ){
$project->{months} = get_months($config, $project, $language);
$project->{user} = $ENV{REMOTE_USER};
$project->{current} = 1 if ($project->{name} eq $config::config->{project});
}
foreach my $project ( reverse sort { $a->{end_date} cmp $b->{end_date} } (@$projects) ) {
$project->{months} = get_months( $config, $project, $language );
$project->{user} = $ENV{REMOTE_USER};
$project->{current} = 1 if ( $project->{name} eq $config::config->{project} );
}
return $projects;
return $projects;
}
#TODO: add config
sub get_sorted{
my $config=shift;
my $projects=project::get($config, {});
my @projects=reverse sort { $a->{end_date} cmp $b->{end_date} } (@$projects);
sub get_sorted {
my $config = shift;
my $projects = project::get( $config, {} );
my @projects = reverse sort { $a->{end_date} cmp $b->{end_date} } (@$projects);
unshift @projects,{
name => 'all',
title => 'alle',
priority => '0',
start_date => $projects[-1]->{start_date},
end_date => $projects[0]->{end_date},
};
return \@projects;
unshift @projects,
{
name => 'all',
title => 'alle',
priority => '0',
start_date => $projects[-1]->{start_date},
end_date => $projects[0]->{end_date},
};
return \@projects;
}
# internal
sub get_months{
my $config=shift;
my $project = shift;
my $language = shift || $config->{date}->{language} || 'en';
sub get_months {
my $config = shift;
my $project = shift;
my $language = shift || $config->{date}->{language} || 'en';
my $start = $project->{start_date};
my $end = $project->{end_date};
my $start = $project->{start_date};
my $end = $project->{end_date};
(my $start_year,my $start_month,my $start_day)=split(/\-/,$start);
my $last_day = Date::Calc::Days_in_Month($start_year,$start_month);
$start_day = 1 if ($start_day<1);
$start_day = $last_day if ($start_day gt $last_day);
( my $start_year, my $start_month, my $start_day ) = split( /\-/, $start );
my $last_day = Date::Calc::Days_in_Month( $start_year, $start_month );
$start_day = 1 if ( $start_day < 1 );
$start_day = $last_day if ( $start_day gt $last_day );
(my $end_year,my $end_month,my $end_day)=split(/\-/,$end);
$last_day = Date::Calc::Days_in_Month($end_year,$end_month);
$end_day = 1 if ($end_day<1);
$end_day = $last_day if ($end_day gt $last_day);
( my $end_year, my $end_month, my $end_day ) = split( /\-/, $end );
$last_day = Date::Calc::Days_in_Month( $end_year, $end_month );
$end_day = 1 if ( $end_day < 1 );
$end_day = $last_day if ( $end_day gt $last_day );
my @months=();
for my $year($start_year..$end_year){
my $m1=1;
my $m2=12;
$m1=$start_month if $year eq $start_year;
$m2=$end_month if $year eq $end_year;
my @months = ();
for my $year ( $start_year .. $end_year ) {
my $m1 = 1;
my $m2 = 12;
$m1 = $start_month if $year eq $start_year;
$m2 = $end_month if $year eq $end_year;
for my $month($m1..$m2){
my $d1=1;
my $d2=Date::Calc::Days_in_Month($year,$month);
$d1=$start_day if $month eq $start_month;
$d2=$end_day if $month eq $end_month;
push @months,{
start => time::array_to_date($year,$month,$d1),
end => time::array_to_date($year,$month,$d2),
year => $year,
month => $month,
month_name => $time::names->{$language}->{months_abbr}->[$month-1],
title => $project->{title},
user => $ENV{REMOTE_USER}
};
}
}
@months=reverse @months;
return \@months;
for my $month ( $m1 .. $m2 ) {
my $d1 = 1;
my $d2 = Date::Calc::Days_in_Month( $year, $month );
$d1 = $start_day if $month eq $start_month;
$d2 = $end_day if $month eq $end_month;
push @months,
{
start => time::array_to_date( $year, $month, $d1 ),
end => time::array_to_date( $year, $month, $d2 ),
year => $year,
month => $month,
month_name => $time::names->{$language}->{months_abbr}->[ $month - 1 ],
title => $project->{title},
user => $ENV{REMOTE_USER}
};
}
}
@months = reverse @months;
return \@months;
}
# check project_id
sub check{
my $config=shift;
my $options=shift;
return "missing project_id at checking project" unless defined $options->{project_id};
return "Please select a project" if($options->{project_id}eq'-1');
return "Please select a project" if($options->{project_id}eq'');
my $projects=project::get($config, { project_id=>$options->{project_id} } );
return "Sorry. unknown project" unless defined $projects;
return 1;
sub check {
my $config = shift;
my $options = shift;
return "missing project_id at checking project" unless defined $options->{project_id};
return "Please select a project" if ( $options->{project_id} eq '-1' );
return "Please select a project" if ( $options->{project_id} eq '' );
my $projects = project::get( $config, { project_id => $options->{project_id} } );
return "Sorry. unknown project" unless defined $projects;
return 1;
}
sub error{
my $msg=shift;
sub error {
my $msg = shift;
print "ERROR: $msg<br/>\n";
}