Fixed URL extraction

[gosa.git] / gosa-si / modules / DBsqlite.pm

diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm
index 95ac1b68bc04fa5251ae5808bfe52101eaf2a801..78592fff7629763f99298c51f0ff778a450c5039 100644 (file)
--- a/gosa-si/modules/DBsqlite.pm
+++ b/gosa-si/modules/DBsqlite.pm
@@ -8,7 +8,7 @@ use Data::Dumper;
 use GOSA::GosaSupportDaemon;
 use threads;
 use Time::HiRes qw(usleep);
-
+use utf8;
 
 
 my $col_names = {};
@@ -71,8 +71,15 @@ 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 $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);
@@ -93,63 +100,71 @@ 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 != length(@$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;
         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)."')";
-
         &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; }
@@ -159,7 +174,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 );
 
     }
@@ -192,6 +207,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]);
         }
@@ -264,4 +280,7 @@ sub count_dbentries {
     return $count;
 }
 
+
+
+
 1;