--- trunk/bin/BackupPC_updatedb	2005/10/10 13:39:11	160
+++ trunk/bin/BackupPC_updatedb	2005/11/17 17:56:25	241
@@ -143,7 +143,7 @@
 
 		my $where = '';
 		my @data;
-		if ($host_id && $share_id && $num) {
+		if (defined($host_id) && defined($share_id) && defined($num)) {
 			$where = qq{
 			WHERE
 				hosts.id = ? AND
@@ -209,7 +209,7 @@
 			$doc->add_attr('@uri', $uri);
 
 			foreach my $c (@{ $sth->{NAME} }) {
-				$doc->add_attr($c, $row->{$c}) if ($row->{$c});
+				$doc->add_attr($c, $row->{$c}) if (defined($row->{$c}));
 			}
 
 			#$doc->add_attr('@cdate', fmt_date($row->{'date'}));
@@ -256,10 +256,10 @@
 
 
 ## update index ##
-if (($opt{i} || $opt{j} || ($index_path && ! -e $index_path)) && !$opt{c}) {
+if (($opt{i} || $opt{j} || ($index_path && ! -e $TopDir . $index_path)) && !$opt{c}) {
 	# update all
 	print "force update of HyperEstraier index ";
-	print "importing existing data" unless (-e $index_path);
+	print "importing existing data" unless (-e $TopDir . $index_path);
 	print "by -i flag" if ($opt{i});
 	print "by -j flag" if ($opt{j});
 	print "\n";
@@ -278,34 +278,28 @@
 	}
 
 	print "creating tables...\n";
-      
-	$dbh->do(qq{
+
+	$dbh->do( qq{
 		create table hosts (
 			ID	SERIAL		PRIMARY KEY,
 			name	VARCHAR(30)	NOT NULL,
 			IP	VARCHAR(15)
 		);	      
-	});
-	      
-	$dbh->do(qq{
+
 		create table shares (
 			ID	SERIAL		PRIMARY KEY,
 			hostID	INTEGER		NOT NULL references hosts(id),
 			name	VARCHAR(30)	NOT NULL,
 			share	VARCHAR(200)	NOT NULL
 		);	      
-	});
 
-	$dbh->do(qq{
 		create table dvds (
 			ID	SERIAL		PRIMARY KEY, 
 			num     INTEGER		NOT NULL,
 			name	VARCHAR(255)	NOT NULL,
 			mjesto	VARCHAR(255)
 		);
-	});
-	
-	$dbh->do(qq{
+
 		create table backups (
 			id	serial,
 			hostID	INTEGER		NOT NULL references hosts(id),
@@ -316,11 +310,10 @@
 			size	bigint		not null,
 			inc_size bigint		not null default -1,
 			inc_deleted boolean	default false,
+			parts	integer		not null default 1,
 			PRIMARY KEY(id)
 		); 	      
-	});
 
-	$dbh->do(qq{     
 		create table files (
 			ID		SERIAL,
 			shareID		INTEGER	NOT NULL references shares(id),
@@ -332,10 +325,7 @@
 			size		bigint	NOT NULL,
 			primary key(id)
 		);
-	});
 
-
-	$dbh->do( qq{
 		create table archive (
 			id 		serial,
 			dvd_nr		int not null,
@@ -345,16 +335,32 @@
 			date		timestamp default now(),
 			primary key(id)
 		);	
-	}
-	);
 
-	$dbh->do( qq{
-		create table archive_backup
-		(
+		create table archive_backup (
 			archive_id	int not null references archive(id) on delete cascade,
 			backup_id	int not null references backups(id),
 			primary key(archive_id, backup_id)
 		);
+
+		create table archive_burned (
+			archive_id	int references archive(id),
+			date		timestamp default now(),
+			part		int not null default 1,
+			copy		int not null default 1,
+			iso_size bigint default -1
+		);
+
+		create table backup_parts (
+			id serial,
+			backup_id int references backups(id),
+			part_nr int not null check (part_nr > 0),
+			tar_size bigint not null check (tar_size > 0),
+			size bigint not null check (size > 0),
+			md5 text not null,
+			items int not null check (items > 0),
+			date timestamp default now(),
+			primary key(id)
+		);
 	});
 
 	print "creating indexes: ";
@@ -372,6 +378,8 @@
 		files:date
 		files:size
 		archive:dvd_nr
+		archive_burned:archive_id
+		backup_parts:backup_id,part_nr
 	)) {
 		do_index($index);
 	}
@@ -622,8 +630,32 @@
 				$filesInBackup->{$path_key}->{'size'}
 			));
 
+			# daylight saving time change offset for 1h
+			my $dst_offset = 60 * 60;
+
+			my $key_dst1 = join(" ", (
+				$shareID,
+				$dir,
+				$path_key,
+				$filesInBackup->{$path_key}->{'mtime'} - $dst_offset,
+				$filesInBackup->{$path_key}->{'size'}
+			));
+
+			my $key_dst2 = join(" ", (
+				$shareID,
+				$dir,
+				$path_key,
+				$filesInBackup->{$path_key}->{'mtime'} + $dst_offset,
+				$filesInBackup->{$path_key}->{'size'}
+			));
+
 			my $found;
-			if (! defined($beenThere->{$key}) && ! ($found = found_in_db($key, @data)) ) {
+			if (
+				! defined($beenThere->{$key}) &&
+				! defined($beenThere->{$key_dst1}) &&
+				! defined($beenThere->{$key_dst2}) &&
+				! ($found = found_in_db($key, @data))
+			) {
 				print STDERR "# key: $key [", $beenThere->{$key},"]" if ($debug >= 2);
 
 				if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {