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

2011-11-21 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* lib/PandoraFMS/Core.pm: Changed tag field in events insertion from
	tag name to tag name and URL. Pending to change it for Oracle and 
	PostgreSQL. 

	Fixes: #3439792



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-21 16:04:12 +00:00
parent d3ec9bc2da
commit f01c611520
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2011-11-21 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/Core.pm: Changed tag field in events insertion from
tag name to tag name and URL. Pending to change it for Oracle and
PostgreSQL.
Fixes: #3439792
2011-11-17 Tomas Palacios <tomas.palacios@artica.es> 2011-11-17 Tomas Palacios <tomas.palacios@artica.es>
* conf/pandora_server.conf: Removed checksum token since it is * conf/pandora_server.conf: Removed checksum token since it is

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

@ -2556,8 +2556,9 @@ Get a list of module tags in the format: |tag|tag| ... |tag|
########################################################################## ##########################################################################
sub pandora_get_module_tags ($$$) { sub pandora_get_module_tags ($$$) {
my ($pa_config, $dbh, $id_agentmodule) = @_; my ($pa_config, $dbh, $id_agentmodule) = @_;
my @tags = get_db_rows ($dbh, 'SELECT ttag.name FROM ttag, ttag_module #TODO: Fix for Oracle and PostgreSQL
my @tags = get_db_rows ($dbh, 'SELECT concat(ttag.name, " ", ttag.url) name_url FROM ttag, ttag_module
WHERE ttag.id_tag = ttag_module.id_tag WHERE ttag.id_tag = ttag_module.id_tag
AND ttag_module.id_agente_modulo = ?', $id_agentmodule); AND ttag_module.id_agente_modulo = ?', $id_agentmodule);
@ -2566,7 +2567,7 @@ sub pandora_get_module_tags ($$$) {
my $tag_string = ''; my $tag_string = '';
foreach my $tag (@tags) { foreach my $tag (@tags) {
$tag_string .= $tag->{'name'} . ','; $tag_string .= $tag->{'name_url'} . ',';
} }
# Remove the trailing ',' # Remove the trailing ','