Changeset 28334 for branches/czw_branch/20100519/ippTasks/minidvodb.pro

Timestamp:

Jun 15, 2010, 11:22:56 AM (16 years ago)

Author:

watersc1

Message:

association and jpegs look fine. random simtest errors are a bit worrying, though.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ippTasks/minidvodb.pro (modified) (4 diffs)

branches/czw_branch/20100519/ippTasks/minidvodb.pro

@@ -131 +131 @@
 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
 macro add.minidvodb
-  if ($0 != 5)
-    echo "USAGE: add.minidvodb (minidvodb_group) (dvodb) (interval days) (camera)"
+  if ($0 != 6)
+    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (camera)"
     break
   end
@@ -139 +139 @@
   book newpage MINIDVODB $1
   book setword MINIDVODB $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB $1 DVODB $2
+  book setword MINIDVODB $1 DVODB $3
   book setword MINIDVODB $1 STATE PENDING
   #merge  
   book newpage MINIDVODB_MERGE $1
   book setword MINIDVODB_MERGE $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB_MERGE $1 DVODB $2
+  book setword MINIDVODB_MERGE $1 DVODB $3
   book setword MINIDVODB_MERGE $1 STATE PENDING
   #active  
   book newpage MINIDVODB_ACTIVE $1
   book setword MINIDVODB_ACTIVE $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB_ACTIVE $1 DVODB $2
+  book setword MINIDVODB_ACTIVE $1 DVODB $3
   book setword MINIDVODB_ACTIVE $1 STATE PENDING
 
@@ -155 +155 @@
   book newpage MINIDVODB_CREATE $1
   book setword MINIDVODB_CREATE $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB_CREATE $1 DVODB $2
-  book setword MINIDVODB_CREATE $1 DVODB_DAYS $3
-  book setword MINIDVODB_CREATE $1 CAMERA $4  
+  book setword MINIDVODB_CREATE $1 MINIDVODB $2
+  book setword MINIDVODB_CREATE $1 DVODB $3
+  book setword MINIDVODB_CREATE $1 DVODB_DAYS $4
+  book setword MINIDVODB_CREATE $1 CAMERA $5  
   book setword MINIDVODB_CREATE $1 STATE PENDING  
 end
@@ -542 +543 @@
      
     book setword MINIDVODB_CREATE $minidvodb_group STATE DONE
+    book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB -var minidvodb 
     book getword MINIDVODB_CREATE $minidvodb_group DVODB -var dvodb 
     book getword MINIDVODB_CREATE $minidvodb_group DVODB_DAYS -var dvodb_days
     book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
-    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb_group $minidvodb_group --interval $dvodb_days
+    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days
  
     if ($DB:n == 0)