tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '39_Macro_para_el_dato_anterior_data_string' into 'pandora_6.0' 

add prevdata modules string

See merge request !390
This commit is contained in:
vgilc 2017-04-24 09:13:10 +02:00
parent 4ba957dc40 ef36f8c682
commit 1e640564a6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -3496,8 +3496,13 @@ sub on_demand_macro($$$$$$) {
return (defined($field_value)) ? $field_value : ''; return (defined($field_value)) ? $field_value : '';
} elsif ($macro eq '_prevdata_') { } elsif ($macro eq '_prevdata_') {
return '' unless defined ($module); return '' unless defined ($module);
if ($module->{'id_tipo_modulo'} eq 3){
my $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos_string where id_agente_modulo = ? order by utimestamp desc limit 1 offset 1', $module->{'id_agente_modulo'});
}
else{
my $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos where id_agente_modulo = ? order by utimestamp desc limit 1 offset 1', $module->{'id_agente_modulo'}); my $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos where id_agente_modulo = ? order by utimestamp desc limit 1 offset 1', $module->{'id_agente_modulo'});
} }
}
} }
########################################################################## ##########################################################################