X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FDBsqlite.pm;h=bce1e620cebb432b6325b374cf7dd7c6461d2415;hb=6994da4a295f9e62685b4fa06181b9231ec750f2;hp=46d13beaa74130331f1f93e7be070110652fe4bd;hpb=bb8d718b481d94fedc1d223cf66763f02885adba;p=gosa.git

diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm
index 46d13beaa..bce1e620c 100644
--- a/gosa-si/modules/DBsqlite.pm
+++ b/gosa-si/modules/DBsqlite.pm
@@ -5,228 +5,243 @@ use strict;
 use warnings;
 use DBI;
 use Data::Dumper;
+use GOSA::GosaSupportDaemon;
+use threads;
+use Time::HiRes qw(usleep);
 
 
 
+my $col_names = {};
+
 sub new {
-    my $object = shift;
+    my $class = shift;
     my $db_name = shift;
 
-    my $obj_ref = {};
-    bless($obj_ref,$object);
+    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");
-    $obj_ref->{dbh} = $dbh;
+    $self->{dbh} = $dbh;
+    $self->{db_name} = $db_name;
+    $self->{db_lock} = $lock;
+    bless($self,$class);
+
+    return($self);
+}
+
+sub lock_exists : locked {
+    my $self=shift;
+    my $funcname=shift;
+    my $lock = $self->{db_lock};
+    my $result=(-f $lock);
+    if($result) {
+        #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found", 8);
+        usleep 100;
+    }
+    return $result;
+}
+
+sub create_lock : locked {
+    my $self=shift;
+    my $funcname=shift;
+    #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Creating Lock (PID ".$$.") ".($self->{db_lock}),8);
+
+    my $lock = $self->{db_lock};
+    while( -f $lock ) {
+		#&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found",8);
+        sleep 1;
+    }
+
+    open($self->{db_lock_handle},'>',$self->{db_lock});
+}
 
-    return($obj_ref);
+sub remove_lock : locked {
+    my $self=shift;
+    my $funcname=shift;
+    #&main::daemon_log("(".((defined $funcname)?$funcname:"").") Removing Lock (PID ".$$.") ".$self->{db_lock}, 8);
+    close($self->{db_lock_handle});
+    unlink($self->{db_lock});
 }
 
 
 sub create_table {
-    my $object = shift;
+    my $self = shift;
     my $table_name = shift;
     my $col_names_ref = shift;
-    my $sql_statement = "CREATE TABLE IF NOT EXISTS $table_name (".join(', ', @{$col_names_ref}).")";
-    $object->{dbh}->do($sql_statement);
+    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);
+    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 {
-
-    my $obj = shift;
+    my $self = shift;
     my $arg = shift;
 
     # if dbh not specified, return errorflag 1
     my $table = $arg->{table};
-    if (not defined $table) { 
-        return 1; 
+    if( not defined $table ) { 
+        return 1 ; 
     }
- 
-    # incrementing running id
-    if (not exists $arg->{id}) {
-        my $max_id = @{@{$obj->{dbh}->selectall_arrayref("SELECT MAX(id) FROM $table")}[0]}[0];
-        if (not defined $max_id) {
-            $max_id = 0;
-        }
-        $arg->{id} = $max_id + 1;
+
+    # specify primary key in table
+    if (not exists $arg->{primkey}) {
+        return 2;
     }
-        
-   
-    # fetch column names of table
-    my $col_names = $obj->get_table_columns($table);
-    
-    # assign values to column name variables
-    my @add_list;
-    foreach my $col_name (@{$col_names}) {
-        if (exists $arg->{$col_name}) {
-            push(@add_list, $arg->{$col_name});
+    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 {
-            my $default_val = "none";
-            if ($col_name eq "timestamp") {
-                $default_val = "19700101000000";
-            }             
-            push(@add_list, $default_val);
+            $id = 1;
         }
-    
-    }    
-
-    # check wether id does not exists in table, otherwise return errorflag 2
-    my $res = @{$obj->{dbh}->selectall_arrayref( "SELECT * FROM $table WHERE id='$arg->{id}'")};
-    if ($res != 0) { 
-        return 2;
+        $arg->{id} = $id;
     }
 
-    my $sql_statement = " INSERT INTO $table VALUES ('".join("', '", @add_list)."') ";
-    print " INSERT INTO $table VALUES ('".join("', '", @add_list)."')\n";
-    $obj->{dbh}->do($sql_statement);
-
-    return 0;
-
-}
-
-sub change_dbentry {
-    my $obj = 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 $restric_pram = $arg->{where};
-    if (not defined $restric_pram) {
-        return 2;
-    } else {  
-        delete $arg->{'where'};
-    }
-    # extrac where value from arg hash
-    my $restric_val = $arg->{$restric_pram};
-    if (not defined $restric_val) {
-        return 3;
-    } else {
-        delete $arg->{$restric_pram};
+    # if timestamp is not provided, add timestamp   
+    if( not exists $arg->{timestamp} ) {
+        $arg->{timestamp} = &get_time;
     }
 
-    # check wether table has all specified columns
-    my $columns = {};
-    my @res = @{$obj->{dbh}->selectall_arrayref("pragma table_info('$table')")};
-    foreach my $column (@res) {
-        $columns->{@$column[1]} = "";
-    }
-    my @pram_list = keys %$arg;
-    foreach my $pram (@pram_list) {
-        if (not exists $columns->{$pram}) {
-            return 4;
-        }
-    }
+    # check wether primkey is unique in table, otherwise return errorflag
+    my $sql_statement = "SELECT * FROM $table WHERE $primkey='$arg->{$primkey}'";
+    &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($self, $table);
+
+        # assign values to column name variables
+        my @add_list;
+        foreach my $col_name (@{$col_names}) {
+            # 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)."')";
+        &create_lock($self,'add_dbentry');
+        my $db_res = $self->{dbh}->do($sql_statement);
+        &remove_lock($self,'add_dbentry');
+        if( $db_res != 1 ) {
+            return 4;
+        } 
 
-    # select all changes
-    my @change_list;
-    my $sql_part;
+    } else  {
+        # entry already exists, so update it 
+        my $where_str= " WHERE $primkey='".$arg->{$primkey}."'";
 
-    while (my($pram, $val) = each(%{$arg})) {
-        push(@change_list, "$pram='$val'");
-    }
+        my @update_l;
+        while( my ($pram, $val) = each %{$arg} ) {
+            if( $pram eq 'table' ) { next; }
+            if( $pram eq 'primkey' ) { next; }
+            push(@update_l, "$pram='$val'");
+        }
+        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 );
 
-    if (not@change_list) {
-        return 5;
     }
 
-    $obj->{dbh}->do("UPDATE $table SET ".join(', ',@change_list)." WHERE $restric_pram='$restric_val'");
     return 0;
-}  
-
+}
 
-sub del_dbentry {
-    my $obj = shift;
-    my $arg = shift;
+sub update_dbentry {
+    my ($self, $sql)= @_;
+    my $db_answer= &exec_statement($self, $sql); 
+    return $db_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};
-    }
-    # extract where parameter from arg hash
-    my $restric_pram = $arg->{where};
-    if (not defined $restric_pram) {
-        return 2;
-    } else {  
-        delete $arg->{'where'};
-    }
-    # extrac where value from arg hash
-    my $restric_val = $arg->{$restric_pram};
-    if (not defined $restric_val) {
-        return 3;
-    } else {
-        delete $arg->{$restric_pram};
-    }
-   
-    # check wether entry exists
-    my $res = @{$obj->{dbh}->selectall_arrayref( "SELECT * FROM $table WHERE $restric_pram='$restric_val'")};
-    if ($res == 0) { 
-        return 4;
-    }
 
-    $obj->{dbh}->do("DELETE FROM $table WHERE $restric_pram='$restric_val'");
- 
-    return 0;
+sub del_dbentry {
+    my ($self, $sql)= @_;;
+    my $db_res= &exec_statement($self, $sql);
+    return $db_res;
 }
 
 
 sub get_table_columns {
-    my $obj = shift;
+    my $self = shift;
     my $table = shift;
+    my @column_names;
+    
+    if(exists $col_names->{$table}) {
+        @column_names = @{$col_names->{$table}};
+    } else {
+        &create_lock($self,'get_table_columns');
+        my @res = @{$self->{dbh}->selectall_arrayref("pragma table_info('$table')")};
+        &remove_lock($self,'get_table_columns');
 
-    my @columns;
-    my @res = @{$obj->{dbh}->selectall_arrayref("pragma table_info('$table')")};
-    foreach my $column (@res) {
-        push(@columns, @$column[1]);
+        foreach my $column (@res) {
+            push(@column_names, @$column[1]);
+        }
     }
+    return \@column_names;
 
-    return \@columns; 
 }
 
-sub select_dbentry {
-    my $obj = 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 @select_list;
-    my $sql_part;
-    while (my ($pram, $val) = each %{$arg}) {
-        push(@select_list, "$pram = '$val'");
+sub select_dbentry {
+    my ($self, $sql)= @_;
+    my $error= 0;
+    my $answer= {};
+    
+    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
+    $sql =~ /FROM ([\S]*?)( |$)/g;
+    my $table = $1;
+    my $column_list = &get_table_columns($self, $table);    
+    my $list_len = @{ $column_list } ;
+    my $hit_counter = 0;
+    foreach my $hit ( @{ $db_answer }) {
+        $hit_counter++;
+        for ( my $i = 0; $i < $list_len; $i++) {
+            $answer->{ $hit_counter }->{ @{ $column_list }[$i] } = @{ $hit }[$i];
+        }
     }
     
-    my $sql_statement = "SELECT * FROM 'jobs' WHERE ".join(' AND ', @select_list);
-    my $answer = $obj->{dbh}->selectall_arrayref($sql_statement);
     return $answer;  
 }
 
 
 sub show_table {
-    my $obj = shift;
+    my $self = shift;
     my $table_name = shift;
-    my @res = @{$obj->{dbh}->selectall_arrayref( "SELECT * FROM $table_name")};
+
+    my $sql_statement= "SELECT * FROM $table_name ORDER BY timestamp";
+    my $res= &exec_statement($self, $sql_statement);
+
     my @answer;
-    foreach my $hit (@res) {
+    foreach my $hit (@{$res}) {
         push(@answer, "hit: ".join(', ', @{$hit}));
     }
     return join("\n", @answer);
@@ -234,10 +249,27 @@ sub show_table {
 
 
 sub exec_statement {
-    my $obj = shift;
+    my $self = shift;
     my $sql_statement = shift;
-    my @res = @{$obj->{dbh}->selectall_arrayref($sql_statement)};
-    return \@res;
+
+    &create_lock($self,'exec_statement');
+    my @db_answer = @{$self->{dbh}->selectall_arrayref($sql_statement)};
+    &remove_lock($self, 'exec_statement');
+
+    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;