index e03152960c16d113e269f4e4368304dd9cd35ccd..bce1e620cebb432b6325b374cf7dd7c6461d2415 100644 (file)
use warnings;
use DBI;
use Data::Dumper;
use warnings;
use DBI;
use Data::Dumper;
+use GOSA::GosaSupportDaemon;
use threads;
use Time::HiRes qw(usleep);
use threads;
use Time::HiRes qw(usleep);
+
+
my $col_names = {};
sub new {
my $class = shift;
my $db_name = shift;
my $col_names = {};
sub new {
my $class = shift;
my $db_name = shift;
- my $lock='/tmp/gosa_si_lock';
- my $_lock = $db_name;
- $_lock =~ tr/\//_/;
- $lock.=$_lock;
+ my $lock = $db_name.".lock";
+ # delete existing lock - instance should be running only once
+ if(stat($lock)) {
+ unlink($lock);
+ }
my $self = {dbh=>undef,db_name=>undef,db_lock=>undef,db_lock_handle=>undef};
my $dbh = DBI->connect("dbi:SQLite:dbname=$db_name");
$self->{dbh} = $dbh;
my $self = {dbh=>undef,db_name=>undef,db_lock=>undef,db_lock_handle=>undef};
my $dbh = DBI->connect("dbi:SQLite:dbname=$db_name");
$self->{dbh} = $dbh;
my $lock = $self->{db_lock};
my $result=(-f $lock);
if($result) {
my $lock = $self->{db_lock};
my $result=(-f $lock);
if($result) {
- #print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n";
+ #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found", 8);
usleep 100;
}
return $result;
usleep 100;
}
return $result;
sub create_lock : locked {
my $self=shift;
my $funcname=shift;
sub create_lock : locked {
my $self=shift;
my $funcname=shift;
- #print STDERR "(".((defined $funcname)?$funcname:"").") Erzeuge Lock (PID ".$$.") ".($self->{db_lock})."\n";
+ #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Creating Lock (PID ".$$.") ".($self->{db_lock}),8);
my $lock = $self->{db_lock};
while( -f $lock ) {
my $lock = $self->{db_lock};
while( -f $lock ) {
- #print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n";
+ #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found",8);
sleep 1;
}
sleep 1;
}
sub remove_lock : locked {
my $self=shift;
my $funcname=shift;
sub remove_lock : locked {
my $self=shift;
my $funcname=shift;
- #print STDERR "(".((defined $funcname)?$funcname:"").") Entferne Lock (PID ".$$.") ".$self->{db_lock}."\n";
+ #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Removing Lock (PID ".$$.") ".$self->{db_lock}, 8);
close($self->{db_lock_handle});
unlink($self->{db_lock});
}
close($self->{db_lock_handle});
unlink($self->{db_lock});
}
+
sub create_table {
my $self = shift;
my $table_name = shift;
my $col_names_ref = shift;
sub create_table {
my $self = shift;
my $table_name = shift;
my $col_names_ref = shift;
+ my @col_names;
+ foreach my $col_name (@$col_names_ref) {
+ my @t = split(" ", $col_name);
+ $col_name = $t[0];
+ push(@col_names, $col_name);
+ }
+
$col_names->{ $table_name } = $col_names_ref;
$col_names->{ $table_name } = $col_names_ref;
- my $col_names_string = join(', ', @{$col_names_ref});
+ my $col_names_string = join(', ', @col_names);
my $sql_statement = "CREATE TABLE IF NOT EXISTS $table_name ( $col_names_string )";
&create_lock($self,'create_table');
$self->{dbh}->do($sql_statement);
&remove_lock($self,'create_table');
return 0;
}
my $sql_statement = "CREATE TABLE IF NOT EXISTS $table_name ( $col_names_string )";
&create_lock($self,'create_table');
$self->{dbh}->do($sql_statement);
&remove_lock($self,'create_table');
return 0;
}
-
sub add_dbentry {
sub add_dbentry {
$arg->{id} = $id;
}
$arg->{id} = $id;
}
- # check wether value to primary key is specified
- if ( not exists $arg->{ $primkey } ) {
- return 3;
- }
-
# if timestamp is not provided, add timestamp
if( not exists $arg->{timestamp} ) {
$arg->{timestamp} = &get_time;
# if timestamp is not provided, add timestamp
if( not exists $arg->{timestamp} ) {
$arg->{timestamp} = &get_time;
my $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) };
&remove_lock($self,'add_dbentry');
if ($res == 0) {
my $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) };
&remove_lock($self,'add_dbentry');
if ($res == 0) {
+ # primekey is unique
+
# fetch column names of table
# fetch column names of table
- my $col_names = &get_table_columns("",$table);
+ my $col_names = &get_table_columns($self, $table);
# assign values to column name variables
my @add_list;
foreach my $col_name (@{$col_names}) {
# assign values to column name variables
my @add_list;
foreach my $col_name (@{$col_names}) {
- # use function parameter for column values
+ # use function parameter for column values
+
if (exists $arg->{$col_name}) {
push(@add_list, $arg->{$col_name});
}
}
my $sql_statement = "INSERT INTO $table VALUES ('".join("', '", @add_list)."')";
if (exists $arg->{$col_name}) {
push(@add_list, $arg->{$col_name});
}
}
my $sql_statement = "INSERT INTO $table VALUES ('".join("', '", @add_list)."')";
- print STDERR $sql_statement;
&create_lock($self,'add_dbentry');
my $db_res = $self->{dbh}->do($sql_statement);
&remove_lock($self,'add_dbentry');
if( $db_res != 1 ) {
return 4;
&create_lock($self,'add_dbentry');
my $db_res = $self->{dbh}->do($sql_statement);
&remove_lock($self,'add_dbentry');
if( $db_res != 1 ) {
return 4;
- } else {
- return 0;
- }
+ }
} else {
} else {
- my $update_hash = { table=>$table };
- $update_hash->{where} = [ { $primkey=>[ $arg->{$primkey} ] } ];
- $update_hash->{update} = [ {} ];
+ # entry already exists, so update it
+ my $where_str= " WHERE $primkey='".$arg->{$primkey}."'";
+
+ my @update_l;
while( my ($pram, $val) = each %{$arg} ) {
if( $pram eq 'table' ) { next; }
if( $pram eq 'primkey' ) { next; }
while( my ($pram, $val) = each %{$arg} ) {
if( $pram eq 'table' ) { next; }
if( $pram eq 'primkey' ) { next; }
- $update_hash->{update}[0]->{$pram} = [$val];
+ push(@update_l, "$pram='$val'");
}
}
- my $db_res = &update_dbentry( $self, $update_hash );
- if( $db_res != 1 ) {
- return 5;
- } else {
- return 0;
- }
-
- }
-}
+ my $update_str= join(", ", @update_l);
+ $update_str= " SET $update_str";
+ my $sql_statement= "UPDATE $table $update_str $where_str";
+ my $db_res = &update_dbentry($self, $sql_statement );
-# error-flags
-# 1 no table ($table) defined
-# 2 no restriction parameter ($restric_pram) defined
-# 3 no restriction value ($restric_val) defined
-# 4 column name not known in table
-# 5 no column names to change specified
-sub update_dbentry {
- my $self = shift;
- my $arg = shift;
-
-
- # check completeness of function parameter
- # extract table statement from arg hash
- my $table = $arg->{table};
- if (not defined $table) {
- return 1;
- } else {
- delete $arg->{table};
- }
-
- # extract where parameter from arg hash
- my $where_statement = "";
- if( exists $arg->{where} ) {
- my $where_hash = @{ $arg->{where} }[0];
- if( 0 < keys %{ $where_hash } ) {
- my @where_list;
- while( my ($rest_pram, $rest_val) = each %{ $where_hash } ) {
- my $statement;
- if( $rest_pram eq 'timestamp' ) {
- $statement = "$rest_pram<'@{ $rest_val }[0]'";
- } else {
- $statement = "$rest_pram='@{ $rest_val }[0]'";
- }
- push( @where_list, $statement );
- }
- $where_statement .= "WHERE ".join('AND ', @where_list);
- }
}
}
- # extract update parameter from arg hash
- my $update_hash = @{ $arg->{update} }[0];
- my $update_statement = "";
- if( 0 < keys %{ $update_hash } ) {
- my @update_list;
- while( my ($rest_pram, $rest_val) = each %{ $update_hash } ) {
- my $statement = "$rest_pram='@{ $rest_val }[0]'";
- push( @update_list, $statement );
- }
- $update_statement .= join(', ', @update_list);
- }
+ return 0;
+}
- my $sql_statement = "UPDATE $table SET $update_statement $where_statement";
- &create_lock($self,'update_dbentry');
- my $db_answer = $self->{dbh}->do($sql_statement);
- &remove_lock($self,'update_dbentry');
+sub update_dbentry {
+ my ($self, $sql)= @_;
+ my $db_answer= &exec_statement($self, $sql);
return $db_answer;
return $db_answer;
-}
+}
sub del_dbentry {
sub del_dbentry {
- my $self = shift;
- my $arg = shift;
-
-
- # check completeness of function parameter
- # extract table statement from arg hash
- my $table = $arg->{table};
- if (not defined $table) {
- return 1;
- } else {
- delete $arg->{table};
- }
-
- # collect select statements
- my @del_list;
- while (my ($pram, $val) = each %{$arg}) {
- if ( $pram eq 'timestamp' ) {
- push(@del_list, "$pram < '$val'");
- } else {
- push(@del_list, "$pram = '$val'");
- }
- }
-
- my $where_statement;
- if( not @del_list ) {
- $where_statement = "";
- } else {
- $where_statement = "WHERE ".join(' AND ', @del_list);
- }
-
- my $sql_statement = "DELETE FROM $table $where_statement";
- &create_lock($self,'del_dbentry');
- my $db_res = $self->{dbh}->do($sql_statement);
- &remove_lock($self,'del_dbentry');
+ my ($self, $sql)= @_;;
+ my $db_res= &exec_statement($self, $sql);
return $db_res;
}
return $db_res;
}
&create_lock($self,'get_table_columns');
my @res = @{$self->{dbh}->selectall_arrayref("pragma table_info('$table')")};
&remove_lock($self,'get_table_columns');
&create_lock($self,'get_table_columns');
my @res = @{$self->{dbh}->selectall_arrayref("pragma table_info('$table')")};
&remove_lock($self,'get_table_columns');
+
foreach my $column (@res) {
push(@column_names, @$column[1]);
}
foreach my $column (@res) {
push(@column_names, @$column[1]);
}
}
}
-sub select_dbentry {
- my $self = shift;
- my $arg = shift;
+sub select_dbentry {
+ my ($self, $sql)= @_;
+ my $error= 0;
+ my $answer= {};
- # check completeness of function parameter
- # extract table statement from arg hash
- my $table = $arg->{table};
- if (not defined $table) {
- return 1;
- } else {
- delete $arg->{table};
- }
-
- # collect select statements
- my @select_list;
- my $sql_statement;
- while (my ($pram, $val) = each %{$arg}) {
- if ( $pram eq 'timestamp' ) {
- push(@select_list, "$pram < '$val'");
- } else {
- push(@select_list, "$pram = '$val'");
- }
- }
-
- if (@select_list == 0) {
- $sql_statement = "SELECT * FROM '$table'";
- } else {
- $sql_statement = "SELECT * FROM '$table' WHERE ".join(' AND ', @select_list);
- }
-
- # query db
- &create_lock($self,'select_dbentry');
- my $query_answer = $self->{dbh}->selectall_arrayref($sql_statement);
- &remove_lock($self,'select_dbentry');
+ my $db_answer= &exec_statement($self, $sql);
# fetch column list of db and create a hash with column_name->column_value of the select query
# fetch column list of db and create a hash with column_name->column_value of the select query
+ $sql =~ /FROM ([\S]*?)( |$)/g;
+ my $table = $1;
my $column_list = &get_table_columns($self, $table);
my $list_len = @{ $column_list } ;
my $column_list = &get_table_columns($self, $table);
my $list_len = @{ $column_list } ;
- my $answer = {};
my $hit_counter = 0;
my $hit_counter = 0;
-
- foreach my $hit ( @{ $query_answer }) {
+ foreach my $hit ( @{ $db_answer }) {
$hit_counter++;
for ( my $i = 0; $i < $list_len; $i++) {
$answer->{ $hit_counter }->{ @{ $column_list }[$i] } = @{ $hit }[$i];
}
}
$hit_counter++;
for ( my $i = 0; $i < $list_len; $i++) {
$answer->{ $hit_counter }->{ @{ $column_list }[$i] } = @{ $hit }[$i];
}
}
-
+
return $answer;
}
return $answer;
}
sub show_table {
my $self = shift;
my $table_name = shift;
sub show_table {
my $self = shift;
my $table_name = shift;
- &create_lock($self,'show_table');
- my @res = @{$self->{dbh}->selectall_arrayref( "SELECT * FROM $table_name")};
- &remove_lock($self,'show_table');
+
+ my $sql_statement= "SELECT * FROM $table_name ORDER BY timestamp";
+ my $res= &exec_statement($self, $sql_statement);
+
my @answer;
my @answer;
- foreach my $hit (@res) {
+ foreach my $hit (@{$res}) {
push(@answer, "hit: ".join(', ', @{$hit}));
}
return join("\n", @answer);
push(@answer, "hit: ".join(', ', @{$hit}));
}
return join("\n", @answer);
sub exec_statement {
my $self = shift;
my $sql_statement = shift;
sub exec_statement {
my $self = shift;
my $sql_statement = shift;
+
&create_lock($self,'exec_statement');
&create_lock($self,'exec_statement');
- my @res = @{$self->{dbh}->selectall_arrayref($sql_statement)};
+ my @db_answer = @{$self->{dbh}->selectall_arrayref($sql_statement)};
&remove_lock($self, 'exec_statement');
&remove_lock($self, 'exec_statement');
- return \@res;
-}
-sub get_time {
- my ($seconds, $minutes, $hours, $monthday, $month,
- $year, $weekday, $yearday, $sommertime) = localtime(time);
- $hours = $hours < 10 ? $hours = "0".$hours : $hours;
- $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
- $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
- $month+=1;
- $month = $month < 10 ? $month = "0".$month : $month;
- $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
- $year+=1900;
- return "$year$month$monthday$hours$minutes$seconds";
+ return \@db_answer;
}
}
+sub count_dbentries {
+ my ($self, $table)= @_;
+ my $error= 0;
+ my $answer= -1;
+
+ my $sql_statement= "SELECT * FROM $table";
+ my $db_answer= &select_dbentry($self, $sql_statement);
+
+ my $count = keys(%{$db_answer});
+ return $count;
+}
+
1;
1;