--- trunk/lib/BackupPC/SearchLib.pm 2005/07/11 00:07:25 15 +++ trunk/lib/BackupPC/SearchLib.pm 2005/07/11 11:51:09 16 @@ -126,25 +126,22 @@ "", "", { RaiseError => 1, AutoCommit => 1 } ); my $sql = q{ - SELECT files.id AS fid, - hosts.name AS hname, - shares.name AS sname, - shares.share AS sharename, - backups.num AS backupNum, - files.name AS filename, - files.path AS filepath, - shares.share||files.fullpath AS networkPath, - date(files.date, 'unixepoch', 'localtime') AS date, - files.type AS filetype, - files.size AS size, - dvds.name AS dvd - FROM - files - INNER JOIN shares ON files.shareID=shares.ID - INNER JOIN hosts ON hosts.ID = shares.hostID - INNER JOIN backups ON backups.hostID = hosts.ID - LEFT JOIN dvds ON dvds.ID = files.dvdid - + SELECT files.id AS fid, + hosts.name AS hname, + shares.name AS sname, + shares.share AS sharename, + files.backupNum AS backupNum, + files.name AS filename, + files.path AS filepath, + shares.share||files.fullpath AS networkPath, + date(files.date, 'unixepoch', 'localtime') AS date, + files.type AS filetype, + files.size AS size, + dvds.name AS dvd + FROM files + INNER JOIN shares ON files.shareID=shares.ID + INNER JOIN hosts ON hosts.ID = shares.hostID + LEFT JOIN dvds ON dvds.ID = files.dvdid }; if (defined($where) && $where ne "")