X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FDBsqlite.pm;h=8eba13d478cf28edeaadfc914db033ef716cfda2;hb=e6affacc914e6ebdb0062ee8bea3a50d37367c54;hp=d5775bd26f0be7cd0d2e11c6fa6381391f433b01;hpb=1abb94850fb3c1c1f6a7e694431615a6f4b15d1c;p=gosa.git diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm index d5775bd26..8eba13d47 100644 --- a/gosa-si/modules/DBsqlite.pm +++ b/gosa-si/modules/DBsqlite.pm @@ -10,17 +10,17 @@ use threads; use Time::HiRes qw(usleep); - 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; @@ -37,7 +37,7 @@ sub lock_exists : locked { my $lock = $self->{db_lock}; my $result=(-f $lock); if($result) { - #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden", 8); + #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found", 8); usleep 100; } return $result; @@ -46,12 +46,12 @@ sub lock_exists : locked { sub create_lock : locked { my $self=shift; my $funcname=shift; -# &main::daemon_log("(".((defined $funcname)?$funcname:"").") Erzeuge Lock (PID ".$$.") ".($self->{db_lock}),8); + #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Creating Lock (PID ".$$.") ".($self->{db_lock}),8); my $lock = $self->{db_lock}; while( -f $lock ) { - #print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n"; - sleep 1; + #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found",8); + usleep 100; } open($self->{db_lock_handle},'>',$self->{db_lock}); @@ -60,7 +60,7 @@ sub create_lock : locked { sub remove_lock : locked { my $self=shift; my $funcname=shift; -# &main::daemon_log("(".((defined $funcname)?$funcname:"").") Entferne Lock (PID ".$$.") ".$self->{db_lock}, 8); + #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Removing Lock (PID ".$$.") ".$self->{db_lock}, 8); close($self->{db_lock_handle}); unlink($self->{db_lock}); } @@ -70,9 +70,16 @@ 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; - my $col_names_string = join(', ', @{$col_names_ref}); - my $sql_statement = "CREATE TABLE IF NOT EXISTS $table_name ( $col_names_string )"; + 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'); @@ -92,63 +99,73 @@ sub add_dbentry { # specify primary key in table if (not exists $arg->{primkey}) { - return 2; + return (2, "a hash key 'primkey' with at least an empty list as value is necessary for add_dbentry"); } - my $primkey = $arg->{primkey}; - - # if primkey is id, fetch max id from table and give new job id= max(id)+1 - if ($primkey eq 'id') { - my $id; - my $sql_statement = "SELECT MAX(CAST(id AS INTEGER)) FROM $table"; - &create_lock($self,'add_dbentry'); - my $max_id = @{ @{ $self->{dbh}->selectall_arrayref($sql_statement) }[0] }[0]; - &remove_lock($self,'add_dbentry'); - if( defined $max_id) { - $id = $max_id + 1; - } else { - $id = 1; + my $primkeys = $arg->{'primkey'}; + my $prim_statement=""; + if( 0 != @$primkeys ) { + my @prim_list; + foreach my $primkey (@$primkeys) { + if($primkey eq 'id') { + # if primkey is id, fetch max id from table and give new job id= max(id)+1 + my $sql_statement = "SELECT MAX(CAST(id AS INTEGER)) FROM $table"; + &create_lock($self,'add_dbentry'); + my $max_id = @{ @{ $self->{dbh}->selectall_arrayref($sql_statement) }[0] }[0]; + &remove_lock($self,'add_dbentry'); + my $id; + if( defined $max_id) { + $id = $max_id + 1; + } else { + $id = 1; + } + $arg->{id} = $id; + } + if( not exists $arg->{$primkey} ) { + return (3, "primkey '$primkey' has no value for add_dbentry"); + } + push(@prim_list, "$primkey='".$arg->{$primkey}."'"); } - $arg->{id} = $id; + $prim_statement = "WHERE ".join(" AND ", @prim_list); } - + # if timestamp is not provided, add timestamp if( not exists $arg->{timestamp} ) { $arg->{timestamp} = &get_time; } # check wether primkey is unique in table, otherwise return errorflag - my $sql_statement = "SELECT * FROM $table WHERE $primkey='$arg->{$primkey}'"; + my $sql_statement = "SELECT * FROM $table $prim_statement"; &create_lock($self,'add_dbentry'); my $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) }; &remove_lock($self,'add_dbentry'); + if ($res == 0) { # primekey is unique # 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; + my @col_list; + my @val_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}); + push(@col_list, $col_name); + push(@val_list, $arg->{$col_name}); } } - my $sql_statement = "INSERT INTO $table VALUES ('".join("', '", @add_list)."')"; - + my $sql_statement = "INSERT INTO $table (".join(", ", @col_list).") VALUES ('".join("', '", @val_list)."')"; &create_lock($self,'add_dbentry'); my $db_res = $self->{dbh}->do($sql_statement); &remove_lock($self,'add_dbentry'); if( $db_res != 1 ) { - return 4; + return (4, $sql_statement); } } else { # 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; } @@ -158,7 +175,7 @@ sub add_dbentry { my $update_str= join(", ", @update_l); $update_str= " SET $update_str"; - my $sql_statement= "UPDATE $table $update_str $where_str"; + my $sql_statement= "UPDATE $table $update_str $prim_statement"; my $db_res = &update_dbentry($self, $sql_statement ); } @@ -191,6 +208,7 @@ sub 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]); } @@ -251,6 +269,20 @@ sub exec_statement { } +sub exec_statementlist { + my $self = shift; + my $sql_list = shift; + my @db_answer; + + &create_lock($self,'exec_statement'); + foreach my $sql (@$sql_list) { + @db_answer = @{$self->{dbh}->selectall_arrayref($sql)}; + } + &remove_lock($self, 'exec_statement'); + + return \@db_answer; +} + sub count_dbentries { my ($self, $table)= @_; my $error= 0; @@ -263,4 +295,20 @@ sub count_dbentries { return $count; } + + +sub move_table { + my ($self, $from, $to) = @_; + + my $sql_statement_drop = "DROP TABLE IF EXISTS $to"; + my $sql_statement_alter = "ALTER TABLE $from RENAME TO $to"; + &create_lock($self,'move_table'); + my $db_res = $self->{dbh}->do($sql_statement_drop); + $db_res = $self->{dbh}->do($sql_statement_alter); + &remove_lock($self,'move_table'); + + return; +} + + 1;