Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ippTools/src/laptool.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/laptool.c (modified) (2 diffs)

branches/eam_branches/ps2-tc3-20130727/ippTools/src

@@ -47 +47 @@
 sctool
 releasetool
+fftool
+remotetool
+

@@ -47 +47 @@
 sctool
 releasetool
+fftool
+remotetool
+

branches/eam_branches/ps2-tc3-20130727/ippTools/src/laptool.c

@@ -1170 +1170 @@
   // we only want projection cells which do not already of an entry
   psStringAppend(&query, "\nWHERE lapGroup.projection_cell IS NULL\n");
-  psStringAppend(&query, "\nORDER by projection_cell\n");
+  // Projection cell's don't have a convienient order. Queue runs in the order of lap_id
+  // psStringAppend(&query, "\nORDER by projection_cell\n");
+  psStringAppend(&query, "\nORDER by lap_id_0\n");
 
   if (limit) {
@@ -1289 +1291 @@
     psFree(whereClause);
   }
+  psStringAppend(&query, "\nGROUP by projection_cell ORDER by MIN(lap_id)");
   if (limit) {
     psString limitString = psDBGenerateLimitSQL(limit);

@@ -47 +47 @@
 sctool
 releasetool
+fftool
+remotetool
+