![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 618dd00c7869a624b9ea9a955ed835afbb068e26..e03152960c16d113e269f4e4368304dd9cd35ccd 100644 (file)
my $lock = $self->{db_lock};
my $result=(-f $lock);
if($result) {
- print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n";
+ #print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n";
usleep 100;
}
return $result;
sub create_lock : locked {
my $self=shift;
my $funcname=shift;
- print STDERR "(".((defined $funcname)?$funcname:"").") Erzeuge Lock (PID ".$$.") ".($self->{db_lock})."\n";
+ #print STDERR "(".((defined $funcname)?$funcname:"").") Erzeuge Lock (PID ".$$.") ".($self->{db_lock})."\n";
my $lock = $self->{db_lock};
while( -f $lock ) {
- print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n";
+ #print STDERR "(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock gefunden\n";
sleep 1;
}
sub remove_lock : locked {
my $self=shift;
my $funcname=shift;
- print STDERR "(".((defined $funcname)?$funcname:"").") Entferne Lock (PID ".$$.") ".$self->{db_lock}."\n";
+ #print STDERR "(".((defined $funcname)?$funcname:"").") Entferne Lock (PID ".$$.") ".$self->{db_lock}."\n";
close($self->{db_lock_handle});
unlink($self->{db_lock});
}
my $col_names_ref = shift;
$col_names->{ $table_name } = $col_names_ref;
my $col_names_string = join(', ', @{$col_names_ref});
- while(&lock_exists($self,'create_table')) {
- print STDERR "Lock in create_table\n";
- }
- &create_lock($self,'create_table');
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 $self = shift;
my $arg = shift;
- while(&lock_exists($self,'add_dbentry')) {
- print STDERR "Lock in add_dbentry\n";
- }
- &create_lock($self,'add_dbentry');
# if dbh not specified, return errorflag 1
my $table = $arg->{table};
- if (not defined $table) {
- &remove_lock($self,'add_dbentry');
- return 1;
+ if( not defined $table ) {
+ return 1 ;
}
# specify primary key in table
if (not exists $arg->{primkey}) {
- &remove_lock($self,'add_dbentry');
return 2;
}
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(id) FROM $table";
+ 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 {
# check wether value to primary key is specified
if ( not exists $arg->{ $primkey } ) {
- &remove_lock($self,'add_dbentry');
return 3;
}
$arg->{timestamp} = &get_time;
}
- # check wether primkey is unique in table, otherwise return errorflag 3
+ # 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) {
# fetch column names of table
my $col_names = &get_table_columns("",$table);
}
}
- my $sql_statement = "BEGIN TRANSACTION; INSERT INTO $table VALUES ('".join("', '", @add_list)."'); COMMIT;";
+ 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 ) {
- &remove_lock($self,'add_dbentry');
- return 1;
+ return 4;
} else {
- &remove_lock($self,'add_dbentry');
return 0;
}
}
my $db_res = &update_dbentry( $self, $update_hash );
if( $db_res != 1 ) {
- &remove_lock($self,'add_dbentry');
- return 1;
+ return 5;
} else {
- &remove_lock($self,'add_dbentry');
return 0;
}
}
- &remove_lock($self,'add_dbentry');
}
my $self = shift;
my $arg = shift;
- while(&lock_exists($self,'update_dbentry')) {
- print STDERR "Lock in update_dbentry\n";
- }
- &create_lock($self,'update_dbentry');
+
# check completeness of function parameter
# extract table statement from arg hash
my $table = $arg->{table};
if (not defined $table) {
- &remove_lock($self,'update_dbentry');
return 1;
} else {
delete $arg->{table};
$update_statement .= join(', ', @update_list);
}
- my $sql_statement = "BEGIN TRANSACTION; UPDATE $table SET $update_statement $where_statement; COMMIT;";
+ 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');
return $db_answer;
my $self = shift;
my $arg = shift;
- while(&lock_exists($self,'del_dbentry')) {
- print STDERR "Lock in del_dbentry\n";
- }
- &create_lock($self,'del_dbentry');
+
# check completeness of function parameter
# extract table statement from arg hash
my $table = $arg->{table};
if (not defined $table) {
- &remove_lock($self,'del_dbentry');
return 1;
} else {
delete $arg->{table};
$where_statement = "WHERE ".join(' AND ', @del_list);
}
- my $sql_statement = "BEGIN TRANSACTION; DELETE FROM $table $where_statement; COMMIT;";
+ 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');
return $db_res;
}
sub get_table_columns {
my $self = shift;
my $table = shift;
-
- my @column_names = @{$col_names->{$table}};
+ 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');
+ foreach my $column (@res) {
+ push(@column_names, @$column[1]);
+ }
+ }
return \@column_names;
}
my $self = shift;
my $arg = shift;
- while(&lock_exists($self,'select_dbentry')) {
- print STDERR "Lock in select_dbentry\n";
- }
- &create_lock($self,'select_dbentry');
# check completeness of function parameter
# extract table statement from arg hash
my $table = $arg->{table};
if (not defined $table) {
- &remove_lock($self,'select_dbentry');
return 1;
} else {
delete $arg->{table};
}
if (@select_list == 0) {
- $sql_statement = "SELECT ROWID, * FROM '$table'";
+ $sql_statement = "SELECT * FROM '$table'";
} else {
- $sql_statement = "SELECT ROWID, * FROM '$table' WHERE ".join(' AND ', @select_list);
+ $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');
# fetch column list of db and create a hash with column_name->column_value of the select query
my $column_list = &get_table_columns($self, $table);
my $answer = {};
my $hit_counter = 0;
-
foreach my $hit ( @{ $query_answer }) {
$hit_counter++;
- $answer->{ $hit_counter }->{ 'ROWID' } = shift @{ $hit };
for ( my $i = 0; $i < $list_len; $i++) {
$answer->{ $hit_counter }->{ @{ $column_list }[$i] } = @{ $hit }[$i];
}
}
- &remove_lock($self,'select_dbentry');
return $answer;
}
sub show_table {
my $self = shift;
my $table_name = shift;
- while(&lock_exists($self,'show_table')) {
- print STDERR "Lock in show_table\n";
- }
&create_lock($self,'show_table');
my @res = @{$self->{dbh}->selectall_arrayref( "SELECT * FROM $table_name")};
+ &remove_lock($self,'show_table');
my @answer;
foreach my $hit (@res) {
push(@answer, "hit: ".join(', ', @{$hit}));
}
- &remove_lock($self,'show_table');
return join("\n", @answer);
}
sub exec_statement {
my $self = shift;
my $sql_statement = shift;
- while(&lock_exists($self,'exec_statement')) {
- print STDERR "Lock in exec_statement\n";
- }
&create_lock($self,'exec_statement');
my @res = @{$self->{dbh}->selectall_arrayref($sql_statement)};
- &remove_locK;
+ &remove_lock($self, 'exec_statement');
return \@res;
}