From: <bar...@us...> - 2009-06-18 23:25:22
|
Revision: 8912 http://bacula.svn.sourceforge.net/bacula/?rev=8912&view=rev Author: bartleyd2 Date: 2009-06-18 23:25:21 +0000 (Thu, 18 Jun 2009) Log Message: ----------- Add job type and first volume of the job to the 4th pane the version table. This is so that when looking at what version to restore with copy jobs the user can make a better decision as to which job to restore from Modified Paths: -------------- trunk/bacula/src/qt-console/restore/restoretree.cpp Modified: trunk/bacula/src/qt-console/restore/restoretree.cpp =================================================================== --- trunk/bacula/src/qt-console/restore/restoretree.cpp 2009-06-18 21:19:11 UTC (rev 8911) +++ trunk/bacula/src/qt-console/restore/restoretree.cpp 2009-06-18 23:25:21 UTC (rev 8912) @@ -617,7 +617,7 @@ QBrush blackBrush(Qt::black); QStringList headerlist = (QStringList() - << tr("Job Id") << tr("Type") << tr("End Time") << tr("Hash") << tr("FileId")); + << tr("Job Id") << tr("Type") << tr("End Time") << tr("Hash") << tr("FileId") << tr("Job Type") << tr("First Volume")); versionTable->clear(); versionTable->setColumnCount(headerlist.size()); versionTable->setHorizontalHeaderLabels(headerlist); @@ -626,7 +626,10 @@ int pathid = m_directoryPathIdHash.value(directory, -1); if ((pathid != -1) && (fileNameId != -1)) { QString cmd = - "SELECT Job.JobId AS JobId,Job.Level AS Type,Job.EndTime AS EndTime,File.MD5 AS MD5,File.FileId AS FileId" + "SELECT Job.JobId AS JobId, Job.Level AS Type," + " Job.EndTime AS EndTime, File.MD5 AS MD5," + " File.FileId AS FileId, Job.Type AS JobType," + " (SELECT Media.VolumeName FROM JobMedia JOIN Media ON JobMedia.MediaId=Media.MediaId WHERE JobMedia.JobId=Job.JobId ORDER BY JobMediaId LIMIT 1) AS FirstVolume" " FROM File" " INNER JOIN Filename on (Filename.FilenameId=File.FilenameId)" " INNER JOIN Path ON (Path.PathId=File.PathId)" @@ -657,6 +660,12 @@ /* Iterate through fields in the record */ foreach (field, fieldlist) { field = field.trimmed(); /* strip leading & trailing spaces */ + if (column == 5 ) { + QByteArray jtype(field.trimmed().toAscii()); + if (jtype.size()) { + field = job_type_to_str(jtype[0]); + } + } tableItem = new QTableWidgetItem(field, 1); tableItem->setFlags(0); tableItem->setForeground(blackBrush); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |