--- index.cgi	2009/04/18 23:14:41	23
+++ index.cgi	2009/04/18 23:54:30	26
@@ -76,7 +76,7 @@
 		}, shift @data, # extract where
 		'group by', join(',', @group_by), qq{
 		order by count($group_by) desc
-		limit 10
+		limit $limit
 		}
 	);
 
@@ -86,14 +86,15 @@
 	my $sth = $dbh->prepare( $sql );
 	$sth->execute( @data );
 	$t = time() - $t;
-	print qq|$t<table><tr><th>|, join(qq|</th><th>|, @cols), qq|</th></tr>|;
+	print qq|<code>$sql<code>|;
+	print qq|<table><tr><th>|, join(qq|</th><th>|, @cols), qq|</th></tr>|;
 	while ( my @row = $sth->fetchrow_array ) {
 		my $n = shift @row;
 		$n = 'NULL' unless defined $n;
 		print qq|<tr><td><a href="#">$n</a></td><td>|, join(qq|</td><td>|, @row), qq|</td></tr>|;
 	}
 	print qq|</table>|;
-	print qq|<code>$sql</code>|;
+	print $sth->rows, qq| rows in $t s|;
 	exit;
 }
 
@@ -153,39 +154,10 @@
 
 print $sth->rows, qq| rows in $t s</code>|;
 
-#my @types = map { scalar $dbh->type_info($_)->{TYPE_NAME} } @{ $sth->{TYPE} };
-my $types = dump( $sth->{TYPE} );
-print qq{
-<script type="text/javascript">
-var column_type = $types ;
-</script>
-};
-
 @columns = @{ $sth->{NAME} } if $#columns == 0 && $columns[0] eq '*';
 
-print qq|<table id="results">|;
-
-my $counter = 0;
-sub table_row {
-	my $cell = shift;
-	my $class = $counter++ % 2 == 0 ? ' class=o' : '';
-	return
-		  qq|<tr $class><$cell>|
-		. join( qq|</$cell><$cell>|, @_ )
-		. qq|</$cell></tr>|
-		;
-
-}
-
-print table_row( 'th', @columns );
-
-while ( my @row = $sth->fetchrow_array ) {
-	print table_row( 'td', @row );
-}
-
 print
-	qq|</table>|
-	, start_form( -id => 'sql', -class => 'fixed' )
+	  start_form( -id => 'sql', -class => 'fixed' )
 
 	, qq|<input type=button value="[=]" onclick="\$('form#sql').toggleClass('fixed'); return false;" title="toggle fixed position" class="right">|
 	, qq|<input type=button value="[x]" onclick="\$('form#sql').toggleClass('visible'); return false;" title="hide sql editor" class="right">|
@@ -206,7 +178,7 @@
 		<input type=button name=lookup_col title="lookup column details">
 		<input type=button name=close_group_by value="[x]" disabled=1>
 		<div id="lookup"></div>
-		<span>
+		</span>
 	|
 
 	, qq|<label for=group_by>group by</label>|
@@ -224,7 +196,36 @@
 	, submit( -name => 'execute', -value => 'execute' )
 
 	, end_form
+	;
+
+#my @types = map { scalar $dbh->type_info($_)->{TYPE_NAME} } @{ $sth->{TYPE} };
+my $types = dump( $sth->{TYPE} );
+print qq{
+<script type="text/javascript">
+var column_type = $types ;
+</script>
+};
+
+print qq|<table id="results">|;
+
+my $counter = 0;
+sub table_row {
+	my $cell = shift;
+	my $class = $counter++ % 2 == 0 ? ' class=o' : '';
+	return
+		  qq|<tr $class><$cell>|
+		. join( qq|</$cell><$cell>|, @_ )
+		. qq|</$cell></tr>|
+		;
 
+}
+
+print table_row( 'th', @columns );
+
+while ( my @row = $sth->fetchrow_array ) {
+	print table_row( 'td', @row );
+}
 
+print qq|</table>|
 	, qq|</body></html>|
 	;