kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config cache issues

Browse Source 
By default the configuration cached by the mod_perl2 instance.
You can disable cache by setting cache/config=0.
You should disable cache only if you have multiple calcms instances
running on the same mod_perl2 server with different configuration.

The Location of the configuration will be determined by config module
now.
This commit is contained in:
Milan
2018-09-22 21:39:20 +02:00
parent e043493847
commit afa56e9e1e
12 changed files with 303 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
website/agenda/series_names.cgi
View File

@@ -2,6 +2,7 @@
#use utf8;
use warnings "all";
#use diagnostics;
use strict;
use Data::Dumper;
@@ -23,17 +24,16 @@ binmode STDOUT, ":utf8";
my $r = shift;
( my $cgi, my $params, my $error ) = params::get($r);
my $config = config::get('config/config.cgi');
my $config = config::getFromScriptLocation();
my $debug = $config->{system}->{debug};
#get request
my $request = {
url => $ENV{QUERY_STRING},
params => {
original => $params,
checked => check_params( $config, $params )
},
url => $ENV{QUERY_STRING},
params => {
original => $params,
checked => check_params( $config, $params )
},
};
$params = $request->{params}->{checked};
@@ -41,12 +41,12 @@ $params = $request->{params}->{checked};
#read cache
my $cache = {};
if ( $config->{cache}->{use_cache} eq '1' ) {
cache::configure('series_names.html');
$cache = cache::load( $config, $params );
if ( defined $cache->{content} ) {
print $cache->{content};
return;
}
cache::configure('series_names.html');
$cache = cache::load( $config, $params );
if ( defined $cache->{content} ) {
print $cache->{content};
return;
}
}
#connect
@@ -56,111 +56,111 @@ my $dbh = db::connect($config);
my $template_parameters = {};
$template_parameters->{projects} = getProjects( $dbh, $config, $params );
$template_parameters->{debug} = $config->{system}->{debug};
$template_parameters->{server_cache} = $config->{cache}->{server_cache} if $config->{cache}->{server_cache} ;
$template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache} if $config->{cache}->{use_client_cache} ;
$template_parameters->{server_cache} = $config->{cache}->{server_cache} if $config->{cache}->{server_cache};
$template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache} if $config->{cache}->{use_client_cache};
#output template
my $template = $params->{template};
my $out = '';
template::process($config, $out, $params->{template}, $template_parameters );
template::process( $config, $out, $params->{template}, $template_parameters );
print $out;
#write to cache
if ( $config->{cache}->{use_cache} eq '1' ) {
$cache->{content} = $out;
cache::save($cache);
$cache->{content} = $out;
cache::save($cache);
}
$cache = undef;
$out = undef;
sub getProjects {
my $dbh = shift;
my $config = shift;
my $params = shift;
my $dbh = shift;
my $config = shift;
my $params = shift;
my $prev_series_names = undef;
my $projects = project::get_sorted($config);
my $prev_series_names = undef;
my $projects = project::get_sorted($config);
my $excludedProjects = {};
if ( defined $config->{filter}->{projects_to_exclude} ) {
for my $project ( split( /\,/, $config->{filter}->{projects_to_exclude} ) ) {
$project =~ s/^\s+//g;
$project =~ s/\s+$//g;
$excludedProjects->{$project} = 1;
}
}
my $excludedProjects = {};
if ( defined $config->{filter}->{projects_to_exclude} ) {
for my $project ( split( /\,/, $config->{filter}->{projects_to_exclude} ) ) {
$project =~ s/^\s+//g;
$project =~ s/\s+$//g;
$excludedProjects->{$project} = 1;
}
}
my $results = [];
for my $project (@$projects) {
next if defined $excludedProjects->{ $project->{name} };
my $results = [];
for my $project (@$projects) {
next if defined $excludedProjects->{ $project->{name} };
my $series_names = getSeriesNames( $dbh, $config, $project->{name}, $params );
$project->{isEmpty} = 1 if scalar(@$series_names) == 0;
$project->{series_names} = $series_names;
my $series_names = getSeriesNames( $dbh, $config, $project->{name}, $params );
$project->{isEmpty} = 1 if scalar(@$series_names) == 0;
$project->{series_names} = $series_names;
$project->{js_name} = $project->{name};
$project->{js_name} =~ s/[^a-zA-Z\_0-9]/\_/g;
$project->{js_name} =~ s/\_+/\_/g;
$project->{js_name} = $project->{name};
$project->{js_name} =~ s/[^a-zA-Z\_0-9]/\_/g;
$project->{js_name} =~ s/\_+/\_/g;
#mark last series_name entry of all non empty projects
if ( ( defined $series_names ) && ( scalar @$series_names > 0 ) ) {
$series_names->[-1]->{last} = 1;
$prev_series_names->[-1]->{last} = 0 if ( defined $prev_series_names ) && ( sclar @$prev_series_names > 0 ) ;
$prev_series_names = $series_names;
}
push @$results, $project;
}
return $results;
#mark last series_name entry of all non empty projects
if ( ( defined $series_names ) && ( scalar @$series_names > 0 ) ) {
$series_names->[-1]->{last} = 1;
$prev_series_names->[-1]->{last} = 0 if ( defined $prev_series_names ) && ( sclar @$prev_series_names > 0 );
$prev_series_names = $series_names;
}
push @$results, $project;
}
return $results;
}
sub getSeriesNames {
my $dbh = shift;
my $config = shift;
my $project = shift;
my $params = shift;
my $dbh = shift;
my $config = shift;
my $project = shift;
my $params = shift;
my $debug = $config->{system}->{debug};
my $bind_values = [];
my $debug = $config->{system}->{debug};
my $bind_values = [];
my @conds = ();
if ( defined $config->{filter}->{locations_to_exclude} ) {
my @exclude = ();
for my $location ( split( /\,/, $config->{filter}->{locations_to_exclude} ) ) {
$location =~ s/^\s+//g;
$location =~ s/\s+$//g;
push @exclude, '?';
push @$bind_values, $location;
}
push @conds, 'location not in (' . join( ',', @exclude ) . ')';
}
my @conds = ();
if ( defined $config->{filter}->{locations_to_exclude} ) {
my @exclude = ();
for my $location ( split( /\,/, $config->{filter}->{locations_to_exclude} ) ) {
$location =~ s/^\s+//g;
$location =~ s/\s+$//g;
push @exclude, '?';
push @$bind_values, $location;
}
push @conds, 'location not in (' . join( ',', @exclude ) . ')';
}
if ( defined $config->{filter}->{projects_to_exclude} ) {
my @exclude = ();
for my $project ( split( /\,/, $config->{filter}->{projects_to_exclude} ) ) {
$project =~ s/^\s+//g;
$project =~ s/\s+$//g;
push @exclude, '?';
push @$bind_values, $project;
}
push @conds, 'project not in (' . join( ',', @exclude ) . ')';
}
if ( defined $config->{filter}->{projects_to_exclude} ) {
my @exclude = ();
for my $project ( split( /\,/, $config->{filter}->{projects_to_exclude} ) ) {
$project =~ s/^\s+//g;
$project =~ s/\s+$//g;
push @exclude, '?';
push @$bind_values, $project;
}
push @conds, 'project not in (' . join( ',', @exclude ) . ')';
}
if ( ( $project ne '' ) && ( $project ne 'all' ) ) {
push @conds, 'project=?';
push @$bind_values, $project;
}
if ( ( $project ne '' ) && ( $project ne 'all' ) ) {
push @conds, 'project=?';
push @$bind_values, $project;
}
if ( ( $params->{search} ne '' ) ) {
push @conds, 'series_name like ?';
push @$bind_values, '%' . $params->{search} . '%';
}
if ( ( $params->{search} ne '' ) ) {
push @conds, 'series_name like ?';
push @$bind_values, '%' . $params->{search} . '%';
}
my $where = '';
if ( @conds > 0 ) {
$where = 'where ' . join( ' and ', @conds );
}
my $where = '';
if ( @conds > 0 ) {
$where = 'where ' . join( ' and ', @conds );
}
my $query = qq{
my $query = qq{
select series_name, count(series_name) sum
from calcms_events
$where
@@ -168,38 +168,38 @@ sub getSeriesNames {
order by series_name
};
my $series_names = db::get( $dbh, $query, $bind_values );
my $series_names = db::get( $dbh, $query, $bind_values );
for my $series (@$series_names) {
$series->{series_name} = '' unless defined $series->{series_name};
$series->{series_name} =~ s/\"//g;
$series->{series_name} = 'ohne' if $series->{series_name} eq '';
$series->{series_name} = 'Einzelsendung' if $series->{series_name} eq '_single_';
}
for my $series (@$series_names) {
$series->{series_name} = '' unless defined $series->{series_name};
$series->{series_name} =~ s/\"//g;
$series->{series_name} = 'ohne' if $series->{series_name} eq '';
$series->{series_name} = 'Einzelsendung' if $series->{series_name} eq '_single_';
}
return $series_names;
return $series_names;
}
sub check_params {
my $config = shift;
my $params = shift;
my $config = shift;
my $params = shift;
my $template = template::check($config, $params->{template}, 'series_names.html' );
my $template = template::check( $config, $params->{template}, 'series_names.html' );
my $debug = $params->{debug} || '';
if ( $debug =~ /([a-z\_\,]+)/ ) {
$debug = $1;
}
my $debug = $params->{debug} || '';
if ( $debug =~ /([a-z\_\,]+)/ ) {
$debug = $1;
}
my $search = $params->{q} || $params->{search} || $params->{term} || '';
if ( $search =~ /([a-z0-9A-Z\_\,]+)/ ) {
$search = $1;
}
my $search = $params->{q} || $params->{search} || $params->{term} || '';
if ( $search =~ /([a-z0-9A-Z\_\,]+)/ ) {
$search = $1;
}
return {
template => $template,
debug => $debug,
search => $search,
};
return {
template => $template,
debug => $debug,
search => $search,
};
}