Don't add delay type when delay_capacity is 0.

Added query count printout when debug flag is set.

tbsetup/libptop_new.pm.in

@@ -1167,12 +1167,14 @@ sub addDelayCapacity($)
     my $delay = $self->type()->delay_capacity();
     if (defined($delaycap_override) &&
 	$delaycap_override > 0 &&
-	$delaycap_override < $delay) {
+	(! defined($delay) ||
+	 $delaycap_override < $delay)) {
 	$delay = $delaycap_override
     }
-    $self->addPType("delay", $delay);
-    $self->addPType("delay-".$self->node()->type(), $delay);
-    
+    if (defined($delay) && $delay > 0) {
+	$self->addPType("delay", $delay);
+	$self->addPType("delay-".$self->node()->type(), $delay);
+    }
 }
 
 #

tbsetup/ptopgen_new.in

@@ -6,14 +6,13 @@
 # All rights reserved.
 #
 
-# TODO: USER_COMPONENT --> No caching, willPrint, available, etc.
-
 use strict;
 use English;
 use Getopt::Std;
 
 use lib "@prefix@/lib";
 use libdb;
+use emdbi;
 use libptop_new;
 use GeniXML;
 
@@ -32,11 +31,16 @@ $| = 1;
 my $print_xml = 0;
 my $print_ns = $GeniXML::RSPEC_2_NS;
 my $typelimitfile;
+my $debug = 0;
 
 # Initialize permissions table for the current project
+emdbi::ClearQueryCount();
 processArgs();
 consultDatabase();
 printResults();
+if ($debug) {
+    print STDERR "# of Queries: " . emdbi::GetQueryCount() . "\n";
+}
 
 sub usage()
 {
@@ -102,6 +106,9 @@ sub processArgs()
     if (defined($options{"l"})) {
 	$typelimitfile = $options{"l"};
     }
+    if (defined($options{"d"})) {
+	$debug = 1;
+    }
     libptop_new::ProcessArgs(\%options);
 }