--- trunk/scripts/estcp.pl	2006/01/21 17:37:07	87
+++ trunk/scripts/estcp.pl	2006/01/21 18:25:09	88
@@ -32,7 +32,7 @@
 );
 
 unless(eval{ $to_n->name }) {
-	if ($to =~ m#^(http://.+)/node/(\w+)$#) {
+	if ($to =~ m#^(http://.+)/node/([^/]+)$#) {
 		my ($url,$name) = ($1,$2);
 		print "Creating '$name' on $url\n";
 		$to_n->shuttle_url( $url . '/master?action=nodeadd',
@@ -76,7 +76,7 @@
 
 		$i++;
 	}
-	warn "$prev\n";
+	warn "$prev\n" if ($debug);
 
 	my $rate = ( $i / (time() - $t) );
 	printf("%d records, %1.2f%% [%1.2f rec/s] estimated finish: %s\n",