From e13529e6604b548568ade7a580ed356b6e3551bc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Wed, 11 Jun 2025 13:48:23 -0400 Subject: [PATCH] * Wed Jun 11 2025 Jean-Philippe Pialasse 11.0.0-15.sme - open db flat file using UTF8 [SME: 13035] --- .../lib/SrvMngr/Controller/Nutups-Custom.pm | 22 +++-------- .../smanager/lib/SrvMngr/Controller/Nutups.pm | 37 +++---------------- smeserver-nutUPS.spec | 5 ++- 3 files changed, 16 insertions(+), 48 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm index 028ef22..35557e6 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm @@ -7,22 +7,12 @@ # use esmith::util; use esmith::util::network; -use esmith::ConfigDB; -use esmith::HostsDB; -use esmith::AccountsDB; -use esmith::NetworksDB; -use esmith::DomainsDB; +use esmith::ConfigDB::UTF8; use constant FALSE => 0; use constant TRUE => 1; - -#The most common ones -my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); -#our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); -#our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); -#our $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); -#our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); +our $cdb; # Validation routines - parameters for each panel @@ -76,7 +66,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); sub get_data_for_panel_STATUS { # Return a hash with the fields required which will be loaded into the shared data my $c = shift; - $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); + $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my %ret = ( #'Data1'=>'Data for STATUS', #Example # fields from Inputs in STATUS $fields['STATUS'] @@ -92,7 +82,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); sub get_data_for_panel_CONFIG { # Return a hash with the fields required which will be loaded into the shared data my $c = shift; - $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); + $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my %ret = ( 'Data1'=>'Data for CONFIG', #Example 'localip'=>$cdb->get_value('LocalIP'), @@ -159,7 +149,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); my $c = shift; my $prefix_data = shift; #Data hash as parameter my $ret = ""; - $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); + $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my $db = $cdb; #maybe one of the others my $dbkey = 'nut'; my $driverkey = 'nut-driver@ups'; @@ -246,7 +236,7 @@ sub get_model_options { sub get_ups_status { my $c = shift; - $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); + $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my $nutmode = $cdb->get_prop('nut', 'Mode') || 'standalone'; if ($cdb->get_prop('nut', 'status', 'disabled') eq 'disabled'){ return $c->l('nut_status_is_disabled') diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm index 59008d2..6d70173 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm @@ -36,11 +36,7 @@ use Data::Dumper; use esmith::util; use esmith::util::network; -use esmith::ConfigDB; -use esmith::AccountsDB; -use esmith::NetworksDB; -use esmith::HostsDB; -use esmith::DomainsDB; +use esmith::ConfigDB::UTF8; @@ -60,14 +56,7 @@ sub main { my $c = shift; $c->app->log->info( $c->log_req ); - - #The most common ones - my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); - my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); - my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); - my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); - my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); - + my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my %nut_data = (); my $title = $c->l('nut_NutUPS_configuration'); my $modul = ''; @@ -111,15 +100,8 @@ sub do_update { my $c = shift; $c->app->log->info($c->log_req); - my $modul = ''; - - #The most common ones - you might want to comment out any not used. - my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); - my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); - my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); - my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); - my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); - + my $modul = ''; + my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my %nut_data = (); my $title = $c->l('nut_NutUPS_configuration'); @@ -220,14 +202,7 @@ sub do_display { my ($c,$trt) = @_; $c->app->log->info($c->log_req); - - #The most common ones - you might want to comment out any not used. - my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); - my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); - my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); - my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); - my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); - + my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db"); my %nut_data = (); my $title = $c->l('nut_NutUPS_configuration'); my $modul = ""; @@ -309,4 +284,4 @@ sub do_display { ); $c->render(template => "nutups"); } -1; \ No newline at end of file +1; diff --git a/smeserver-nutUPS.spec b/smeserver-nutUPS.spec index 505a68f..a95828d 100644 --- a/smeserver-nutUPS.spec +++ b/smeserver-nutUPS.spec @@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module %define name smeserver-nutUPS Name: %{name} %define version 11.0.0 -%define release 14 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,6 +26,9 @@ A module which configures the Network UPS Tools suite for operation with the SME server software. %changelog +* Wed Jun 11 2025 Jean-Philippe Pialasse 11.0.0-15.sme +- open db flat file using UTF8 [SME: 13035] + * Mon Jun 02 2025 Jean-Philippe Pialasse 11.0.0-14.sme - fix typo preventing netserver enabling [SME: 13021]