Index: branches/haf_branches/ipp.20100512/ippScripts/scripts/minidvodb_createdb.pl
===================================================================
--- branches/haf_branches/ipp.20100512/ippScripts/scripts/minidvodb_createdb.pl	(revision 28104)
+++ branches/haf_branches/ipp.20100512/ippScripts/scripts/minidvodb_createdb.pl	(revision 28168)
@@ -4,5 +4,8 @@
 use strict;
 use Carp;
-
+use DateTime;
+
+use DateTime::Format::Strptime;
+use DateTime::Duration;
 ## report the program and machine
 use Sys::Hostname;
@@ -12,5 +15,5 @@
 print "Starting script $0 on $host at $date\n\n";
 
-use DateTime;
+
 my $mjd_start = DateTime->now->mjd;   # MJD of starting script
 
@@ -36,5 +39,5 @@
 }
 
-my (  $outroot, $dbname, $dvodb, $minidvodb_group, $camera,  $verbose, $no_update,
+my (  $outroot, $dbname, $dvodb,$minidvodb_interval, $minidvodb_group, $camera,  $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(    
@@ -44,4 +47,5 @@
     'outroot|w=s'       => \$outroot, # output file base name
     'dvodb|w=s'         => \$dvodb,  # output DVO database
+    'interval|w=s'      => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day)
     'verbose'           => \$verbose,   # Print to stdout
     'no-update'         => \$no_update, # Update the database?
@@ -57,6 +61,6 @@
           ) unless
     defined $minidvodb_group and
-    #defined $camera and 
-   #defined $outroot and
+    defined $camera and 
+    defined $outroot and
     defined $dvodb;
 
@@ -72,4 +76,5 @@
 }
 
+
 # Recipes to use based on reduction class
 
@@ -82,5 +87,5 @@
 
 # the camera configurations should define the psastro output to be a single file (MEF), regardless of the inputs
-
+ my $create_new = 0;
 # convert supplied DVO database name to UNIX filename
 my $dvodbReal;
@@ -93,28 +98,32 @@
 }
 
-
+if (!defined $minidvodb_interval) {
+    $minidvodb_interval = 1;
+}
 
 
 unless ($no_op) {
     
-    
-
-#see if there is already a new_not_ready
+  
+
+#see if there is already one in new state
     my $fpaCommand1 = "$addtool -listminidvodbrun";
     $fpaCommand1 .= " -minidvodb_group '$minidvodb_group'";
     $fpaCommand1 .= " -state 'new'";
-     $fpaCommand1 .= " -dbname $dbname" if defined $dbname;
-
-    print $fpaCommand1;
+    $fpaCommand1 .= " -dbname $dbname" if defined $dbname;
+
+    
 unless ($no_update) {
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $fpaCommand1, verbose => $verbose);
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("Unable to list minidvodb database: $error_code\n");
-        exit($error_code);
-    }
-    print "xxx";
-    print scalar(@{$stdout_buf});
+    
+
+
+   unless ($success) {
+       $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+       warn("Unable to list minidvodb database: $error_code\n");
+       exit($error_code);
+    }
+   
     if (scalar(@{$stdout_buf})) {
 	$error_code = 3;
@@ -122,6 +131,84 @@
         exit($error_code);
     }
+
+    my $creation_date;
+    my $addRun_count;
+    my $minidvodb_name;
+#find the active one's date, and find out if it has more than 1 addRun in it   
+    
+    my $fpaCommand2 = "$addtool -listminidvodbrun";
+    $fpaCommand2 .= " -minidvodb_group '$minidvodb_group'";
+    $fpaCommand2 .= " -state 'active'";
+    $fpaCommand2 .= " -limit 1";
+     $fpaCommand2 .= " -dbname $dbname" if defined $dbname;
+
+#print $fpaCommand2;
+
+    
+    my ( $success2, $error_code2, $full_buf2, $stdout_buf2, $stderr_buf2 ) =
+	run(command => $fpaCommand2, verbose => $verbose);
+    &my_die( "Unable to get listminidvodbrun",$minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success2;
+  # if it didn't list something in active state (what?) then we definitely need to create a new one
+    if (defined(@$stdout_buf2)) {
+  my  $metadata2 = $mdcParser->parse(join "", @$stdout_buf2) or
+	&my_die("Unable to parse metadata config", $minidvodb_group, $PS_EXIT_PROG_ERROR);
+    
+  my   $components2 = parse_md_list($metadata2) or
+	&my_die("Unable to parse metadata list", $minidvodb_group, $PS_EXIT_PROG_ERROR);
+  my   $comp2 = $$components2[0];
+    $minidvodb_name = $comp2->{minidvodb_name};
+    $creation_date  = $comp2->{creation_date};
+    if (!defined($minidvodb_name)) {
+	&my_die("Unable to parse minidvodb_name", $minidvodb_group, $PS_EXIT_PROG_ERROR);
+    } 
+    if (!defined($creation_date)) {
+	&my_die("Unable to parse creation_date", $minidvodb_group, $PS_EXIT_PROG_ERROR);
+    } 
+    } else { 
+	$create_new = 1; #this is to force it to make a new one
+	    }
+
+    #find the number of add_ids that have been proccessed
+    my $fpaCommand3 = "$addtool -checkminidvodbrunaddrun";
+    $fpaCommand3 .= " -minidvodb_group '$minidvodb_group'";
+    $fpaCommand3 .= " -state 'active'";
+    $fpaCommand3 .= " -minidvodb_name '$minidvodb_name'" if defined $minidvodb_name;
+    $fpaCommand3 .= " -limit 1";
+    $fpaCommand3 .= " -dbname $dbname" if defined $dbname;
+
    
-
+my ( $success3, $error_code3, $full_buf3, $stdout_buf3, $stderr_buf3 ) =
+	run(command => $fpaCommand3, verbose => $verbose);
+    &my_die( "Unable to get checkminidvodbunaddrun", $minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success3;
+   
+    if (defined(@$stdout_buf3)) {  #checkminidvodb returns nothing IF there have been no addruns added to the db yet
+    my  $metadata3 = $mdcParser->parse(join "", @$stdout_buf3) or
+	&my_die("Unable to parse metadata config", $minidvodb_group, $PS_EXIT_PROG_ERROR);
+    
+    my  $components3 = parse_md_list($metadata3) or
+	&my_die("Unable to parse metadata list", $minidvodb_group, $PS_EXIT_PROG_ERROR);
+   my  $comp = $$components3[0];
+    $addRun_count = $comp->{addRun_count};
+	} 
+    if (!defined($addRun_count)) {
+	 ## there's nothing to parse if there's nothing
+        $addRun_count = 0;
+    } 
+    
+
+    if ($addRun_count > 30000) {
+	#it's too big, create_new 
+        $create_new = 1;
+   }
+    if ($create_new == 0) {
+	my $parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%dT%H:%M:%S' );
+	my $creation_dt = $parser->parse_datetime( $creation_date )->mjd;
+	if ($mjd_start- $creation_dt > $minidvodb_interval && $addRun_count > 0 ) {
+	    #db is old and has stuff in it, want to create_new 
+	    $create_new = 1;
+	}
+    }
+    
+    
 }
 #create the minidvodb entry (well, the command for it)
@@ -129,18 +216,19 @@
     $fpaCommand .= " -set_minidvodb_group $minidvodb_group";
     $fpaCommand .= " -set_mergedvodb_path $dvodbReal";
-     $fpaCommand .= " -dbname $dbname" if defined $dbname;
-    print $fpaCommand;
-   # complain if it doesn't work
-unless ($no_update) {
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $fpaCommand, verbose => $verbose);
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("Unable to add result to database: $error_code\n");
-        exit($error_code);
-    }
-} else {
-    print "skipping command: $fpaCommand\n";
-}
+    $fpaCommand .= " -dbname $dbname" if defined $dbname;
+    
+    unless ($no_update or !$create_new) {
+
+
+	my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+	    run(command => $fpaCommand, verbose => $verbose);
+	unless ($success) {
+	    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+	    warn("Unable to add result to database: $error_code\n");
+	    exit($error_code);
+	}
+    } else {
+	print "skipping command: $fpaCommand\n";
+    }
 }
 
@@ -150,7 +238,7 @@
     my $minidvodb_group = shift; # Camtool identifier
     my $exit_code = shift; # Exit code to add
-
+    
     $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
-
+    
     carp($msg);