"AND Job.Level='F' "
"AND Job.JobStatus='T' "
"AND Job.FileSetId=DelCandidates.FileSetId) "
- "GROUP BY JobId";
+ "GROUP BY DelCandidates.JobId";
/* Select Jobs from the DelCandidates table that have a
* more recent InitCatalog -- i.e. are not the only InitCatalog
"AND Job.Level='V' "
"AND Job.JobStatus='T' "
"AND Job.FileSetId=DelCandidates.FileSetId "
- "GROUP BY JobId";
+ "GROUP BY DelCandidates.JobId";
/* Select Jobs from the DelCandidates table.
"WHERE Job.JobTDate>%s "
"AND Job.ClientId=%u "
"AND Job.Type='R' "
- "GROUP BY JobId";
+ "GROUP BY DelCandidates.JobId";
/* List last 20 Jobs */
char *uar_list_jobs =
- "SELECT JobId,Client.Name as Client,StartTime,Type as "
- "JobType,JobFiles,JobBytes "
+ "SELECT JobId,Client.Name as Client,StartTime,Level as "
+ "JobLevel,JobFiles,JobBytes "
"FROM Client,Job WHERE Client.ClientId=Job.ClientId AND JobStatus='T' "
- "AND Type='B' LIMIT 20";
+ "AND Type='B' ORDER BY StartTime DESC LIMIT 20";
#ifdef HAVE_MYSQL
/* MYSQL IS NOT STANDARD SQL !!!!! */
"INSERT INTO temp1 SELECT Job.JobId,JobTdate "
"FROM Client,Job,JobMedia,Media WHERE Client.ClientId=%u "
"AND Job.ClientId=%u "
+ "AND Job.StartTime<'%s' "
"AND Level='F' AND JobStatus='T' "
"AND JobMedia.JobId=Job.JobId "
"AND JobMedia.MediaId=Media.MediaId "
"AND JobMedia.JobId=Job.JobId "
"AND JobMedia.MediaId=Media.MediaId";
-char *uar_inc =
+char *uar_inc_dec =
"INSERT INTO temp SELECT Job.JobId,Job.JobTDate,Job.ClientId,"
"Job.Level,Job.JobFiles,Job.StartTime,Media.VolumeName,JobMedia.StartFile,"
"Job.VolSessionId,Job.VolSessionTime "
"FROM Job,JobMedia,Media "
- "WHERE Job.JobTDate>%s AND Job.ClientId=%u "
+ "WHERE Job.JobTDate>%s AND Job.StartTime < '%s' "
+ "AND Job.ClientId=%u "
"AND JobMedia.JobId=Job.JobId "
"AND JobMedia.MediaId=Media.MediaId "
"AND Job.Level IN ('I', 'D') AND JobStatus='T' "
/* Select filesets for this Client */
char *uar_sel_fileset =
- "SELECT FileSet.FileSetId,FileSet.FileSet,FileSet.MD5 FROM Job,"
+ "SELECT FileSet.FileSetId,FileSet.FileSet,FileSet.CreateTime FROM Job,"
"Client,FileSet WHERE Job.FileSetId=FileSet.FileSetId "
"AND Job.ClientId=%u AND Client.ClientId=%u "
- "GROUP BY FileSet.FileSetId";
+ "GROUP BY FileSet.FileSetId ORDER BY FileSet.FileSetId";
/* Find MediaType used by this Job */
char *uar_mediatype =