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

fix template configuration

Browse Source
This commit is contained in:
Milan
2018-09-06 23:06:48 +02:00
parent 2481490e7d
commit e043493847
30 changed files with 4482 additions and 4487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/calcms/images.pm
View File

@@ -204,7 +204,7 @@ sub update {
set $set
where $conditions
};
print STDERR Dumper($query) . Dumper($bind_values);
#print STDERR Dumper($query) . Dumper($bind_values);
my $result = db::put( $dbh, $query, $bind_values );
images::setSeriesLabels( $dbh, $image );
@@ -491,10 +491,10 @@ sub setEventLabels {
where image=?
};
my $bind_values = [ $image->{licence}, $image->{filename} ];
print STDERR Dumper($query) . Dumper($bind_values);
#print STDERR Dumper($query) . Dumper($bind_values);
my $results = db::put( $dbh, $query, $bind_values );
print STDERR Dumper($results) . " changes\n";
#print STDERR Dumper($results) . " changes\n";
return $results;
}
@@ -521,10 +521,10 @@ sub setSeriesLabels {
where series_image=?
};
my $bind_values = [ $image->{licence}, $image->{filename} ];
print STDERR Dumper($query) . Dumper($bind_values);
#print STDERR Dumper($query) . Dumper($bind_values);
my $results = db::put( $dbh, $query, $bind_values );
print STDERR Dumper($results) . " changes\n";
#print STDERR Dumper($results) . " changes\n";
return $results;
}

2
lib/calcms/markup.pm
View File

@@ -307,7 +307,7 @@ sub plain_to_xml {
}
sub fix_utf8 {
$_[0] = decode( 'cp1252', $_[0] );
$_[0] = Encode::decode( 'cp1252', $_[0] );
return $_[0];
}

7
lib/calcms/studios.pm
View File

@@ -53,7 +53,7 @@ sub get {
my $query = '';
unless ( ( defined $condition->{project_id} ) && ( $condition->{project_id} ne '' ) ) {
my $conditions = '';
$conditions = " where " . join( " and ", @conditions ) if ( @conditions > 0 );
$conditions = " where " . join( " and ", @conditions ) if ( scalar @conditions > 0 );
$query = qq{
select *
from calcms_studios s
@@ -62,11 +62,10 @@ sub get {
};
} else {
push @conditions, 's.id=ps.studio_id';
push @conditions, 'ps.project_id=?';
push @bind_values, $condition->{project_id};
my $conditions = '';
$condition .= " where " . join( " and ", @conditions ) if ( scalar @conditions > 0 );
my $conditions = " where " . join( " and ", @conditions );
$query = qq{
select *
from calcms_studios s, calcms_project_studios ps