Changeset 28295

Timestamp:

Jun 10, 2010, 12:40:25 PM (16 years ago)

Author:

heather

Message:

adding a separation between minidvodb and dvodb paths

Location:

trunk

Files:

• ippScripts/scripts/minidvodb_createdb.pl (modified) (4 diffs)
• ippTasks/minidvodb.pro (modified) (4 diffs)
• ippTools/src/addtool.c (modified) (1 diff)

trunk/ippScripts/scripts/minidvodb_createdb.pl

@@ -39 +39 @@
 }
 
-my (  $outroot, $dbname, $dvodb,$minidvodb_interval, $minidvodb_group, $camera,  $verbose, $no_update,
+my (  $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_group, $camera,  $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(    
@@ -47 +47 @@
     'outroot|w=s'       => \$outroot, # output file base name
     'dvodb|w=s'         => \$dvodb,  # output DVO database
+    'minidvodb|w=s'     => \$minidvodb, # output miniDVODB
     'interval|w=s'      => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day)
     'verbose'           => \$verbose,   # Print to stdout
@@ -97 +98 @@
     exit(4);
 }
+my $minidvodbReal;
+if (defined $minidvodb) {
+    $minidvodbReal = $ipprc->dvo_catdir( $minidvodb ); # catdir for DVO
+    $minidvodbReal = $ipprc->convert_filename_absolute( $minidvodbReal );
+} else {
+    warn("minidvodb undefined:\n");
+    exit(4);
+}
+
 
 if (!defined $minidvodb_interval) {
@@ -215 +225 @@
     my $fpaCommand = "$addtool -addminidvodbrun";
     $fpaCommand .= " -set_minidvodb_group $minidvodb_group";
+    $fpaCommand .= " -set_minidvodb_path  $minidvodbReal" if defined $minidvodbReal;
     $fpaCommand .= " -set_mergedvodb_path $dvodbReal";
     $fpaCommand .= " -dbname $dbname" if defined $dbname;

trunk/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)

trunk/ippTools/src/addtool.c

@@ -817 +817 @@
   }
 
+  if (minidvodb_path) {
+    psStringAppend(&minidvodb_path,"/%s",minidvodb_name);
+  }
+
+
   psString query = NULL;