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,174 +1,176 @@
#!/bin/perl
package event_history;
package event_history;
use warnings "all";
use strict;
use Data::Dumper;
require Exporter;
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(get_columns get get_by_id insert insert_by_event_id delete);
our %EXPORT_TAGS = ( 'all' => [ @EXPORT_OK ] );
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(get_columns get get_by_id insert insert_by_event_id delete);
our %EXPORT_TAGS = ( 'all' => [@EXPORT_OK] );
sub debug;
sub get_columns{
my $config=shift;
sub get_columns {
my $config = shift;
my $dbh=db::connect($config);
my $cols=db::get_columns($dbh, 'calcms_event_history');
my $columns={};
for my $col (@$cols){
$columns->{$col}=1;
my $dbh = db::connect($config);
my $cols = db::get_columns( $dbh, 'calcms_event_history' );
my $columns = {};
for my $col (@$cols) {
$columns->{$col} = 1;
}
return $columns;
}
sub get{
my $config=shift;
my $condition=shift;
sub get {
my $config = shift;
my $condition = shift;
return undef unless defined $condition->{studio_id};
return undef unless defined $condition->{studio_id};
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->{studio_id}) && ($condition->{studio_id} ne '')){
push @conditions, 'studio_id=?';
if ( ( defined $condition->{studio_id} ) && ( $condition->{studio_id} ne '' ) ) {
push @conditions, 'studio_id=?';
push @bind_values, $condition->{studio_id};
}
if ((defined $condition->{series_id}) && ($condition->{series_id} ne '')){
push @conditions, 'series_id=?';
if ( ( defined $condition->{series_id} ) && ( $condition->{series_id} ne '' ) ) {
push @conditions, 'series_id=?';
push @bind_values, $condition->{series_id};
}
if ((defined $condition->{event_id}) && ($condition->{event_id} ne '')){
push @conditions, 'event_id=?';
if ( ( defined $condition->{event_id} ) && ( $condition->{event_id} ne '' ) ) {
push @conditions, 'event_id=?';
push @bind_values, $condition->{event_id};
}
if ((defined $condition->{change_id}) && ($condition->{change_id} ne '')){
push @conditions, 'id=?';
if ( ( defined $condition->{change_id} ) && ( $condition->{change_id} ne '' ) ) {
push @conditions, 'id=?';
push @bind_values, $condition->{change_id};
}
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_event_history
$conditions
order by modified_at desc
$limit
};
#print STDERR Dumper($query).Dumper(\@bind_values);
my $changes=db::get($dbh, $query, \@bind_values);
#print STDERR Dumper($changes);
#print STDERR Dumper($query).Dumper(\@bind_values);
for my $change (@$changes){
$change->{change_id}=$change->{id};
my $changes = db::get( $dbh, $query, \@bind_values );
#print STDERR Dumper($changes);
for my $change (@$changes) {
$change->{change_id} = $change->{id};
delete $change->{id};
}
return $changes;
}
sub get_by_id{
my $config=shift;
my $id=shift;
sub get_by_id {
my $config = shift;
my $id = shift;
my $dbh=db::connect($config);
my $dbh = db::connect($config);
my $query=qq{
my $query = qq{
select *
from calcms_event_history
where event_id=?
};
my $studios=db::get($dbh,$query,[$id]);
return undef if (@$studios!=1);
my $studios = db::get( $dbh, $query, [$id] );
return undef if ( @$studios != 1 );
return $studios->[0];
}
sub insert{
my $config=shift;
my $entry=shift;
sub insert {
my $config = shift;
my $entry = shift;
$entry->{modified_at}= time::time_to_datetime(time());
$entry->{modified_at} = time::time_to_datetime( time() );
$entry->{event_id}=$entry->{id} if((defined $entry->{id})&&(!(defined $entry->{event_id})));
delete $entry->{id};
$entry->{event_id} = $entry->{id} if ( ( defined $entry->{id} ) && ( !( defined $entry->{event_id} ) ) );
delete $entry->{id};
#TODO:filter for existing attributes
my $columns=get_columns($config);
my $event={};
for my $column (keys %$columns){
$event->{$column}=$entry->{$column} if defined $entry->{$column};
}
#TODO:filter for existing attributes
my $columns = get_columns($config);
my $event = {};
for my $column ( keys %$columns ) {
$event->{$column} = $entry->{$column} if defined $entry->{$column};
}
my $dbh=db::connect($config);
my $id=db::insert($dbh, 'calcms_event_history', $event);
return $id;
my $dbh = db::connect($config);
my $id = db::insert( $dbh, 'calcms_event_history', $event );
return $id;
}
# insert event
sub insert_by_event_id{
my $config=shift;
my $options=shift;
sub insert_by_event_id {
my $config = shift;
my $options = shift;
return undef unless defined $options->{project_id};
return undef unless defined $options->{studio_id};
return undef unless defined $options->{series_id};
return undef unless defined $options->{event_id};
return undef unless defined $options->{user};
return undef unless defined $options->{project_id};
return undef unless defined $options->{studio_id};
return undef unless defined $options->{series_id};
return undef unless defined $options->{event_id};
return undef unless defined $options->{user};
my $sql=q{
my $sql = q{
select * from calcms_events
where id=?
};
my $bind_values=[$options->{event_id}];
my $dbh=db::connect($config);
my $results=db::get($dbh, $sql, $bind_values);
if(@$results!=1){
print STDERR "cannot find event with event_id=$options->{event_id}";
return 0;
}
my $bind_values = [ $options->{event_id} ];
my $dbh = db::connect($config);
my $results = db::get( $dbh, $sql, $bind_values );
if ( @$results != 1 ) {
print STDERR "cannot find event with event_id=$options->{event_id}";
return 0;
}
# add to history
my $event=$results->[0];
# add to history
my $event = $results->[0];
$event->{project_id} = $options->{project_id};
$event->{studio_id} = $options->{studio_id};
$event->{series_id} = $options->{series_id};
$event->{event_id} = $options->{event_id};
$event->{user} = $options->{user};
$event->{deleted} = 1;
event_history::insert($config, $event);
event_history::insert( $config, $event );
}
sub delete{
my $config=shift;
my $entry=shift;
my $dbh=db::connect($config);
db::put($dbh, 'delete from calcms_event_history where event_id=?', [$entry->{id}]);
sub delete {
my $config = shift;
my $entry = shift;
my $dbh = db::connect($config);
db::put( $dbh, 'delete from calcms_event_history where event_id=?', [ $entry->{id} ] );
}
sub error{
my $msg=shift;
sub error {
my $msg = shift;
print "ERROR: $msg<br/>\n";
}