1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/XhtmlFormatter.java	Tue Jan 07 21:53:24 2014 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/XhtmlFormatter.java	Tue Jan 07 21:54:59 2014 +0100
     1.3 @@ -46,6 +46,7 @@
     1.4  	public static final String NAME = "xhtml"; // bash-completion:formatter
     1.5  	private static final String DOCTYPE = "html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN\" \"http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd\"";
     1.6  	private static final String CSS_FILE = "info/globalcode/sql/dk/formatter/XhtmlFormatter.css";
     1.7 +	private int statementCounter = 0;
     1.8  	private int resultSetCounter = 0;
     1.9  	private int updatesResultCounter = 0;
    1.10  
    1.11 @@ -115,7 +116,6 @@
    1.12  	@Override
    1.13  	public void writeQuery(String sql) {
    1.14  		super.writeQuery(sql);
    1.15 -		printTextElement(qname("h3"), null, "SQL:");
    1.16  		printTextElement(qname("pre"), null, sql);
    1.17  	}
    1.18  
    1.19 @@ -199,9 +199,11 @@
    1.20  	}
    1.21  
    1.22  	@Override
    1.23 -	public void writeColumnsHeader(ColumnsHeader header) {
    1.24 -		super.writeColumnsHeader(header);
    1.25 -		printTextElement(qname("h3"), null, "Data:");
    1.26 +	public void writeStartResultSet(ColumnsHeader header) {
    1.27 +		super.writeStartResultSet(header);
    1.28 +		resultSetCounter++;
    1.29 +		printEmptyElement(qname("hr"), null);
    1.30 +		printTextElement(qname("h3"), null, "Result set #" + resultSetCounter);
    1.31  		printStartElement(qname("table"));
    1.32  		printStartElement(qname("thead"));
    1.33  		printStartElement(qname("tr"));
    1.34 @@ -216,6 +218,14 @@
    1.35  	}
    1.36  
    1.37  	@Override
    1.38 +	public void writeEndResultSet() {
    1.39 +		super.writeEndResultSet();
    1.40 +		printEndElement();
    1.41 +		printEndElement();
    1.42 +		printTextElement(qname("p"), null, "Record count: " + getCurrentRowCount());
    1.43 +	}
    1.44 +
    1.45 +	@Override
    1.46  	public void writeStartRow() {
    1.47  		super.writeStartRow();
    1.48  		printStartElement(qname("tr"));
    1.49 @@ -234,33 +244,21 @@
    1.50  	}
    1.51  
    1.52  	@Override
    1.53 -	public void writeStartResultSet() {
    1.54 -		super.writeStartResultSet();
    1.55 -		resultSetCounter++;
    1.56 +	public void writeStartStatement() {
    1.57 +		super.writeStartStatement();
    1.58 +		statementCounter++;
    1.59  		printEmptyElement(qname("hr"), null);
    1.60 -		printTextElement(qname("h2"), null, "Result set #" + resultSetCounter);
    1.61 +		printTextElement(qname("h2"), null, "SQL statement #" + statementCounter);
    1.62 +		resultSetCounter = 0;
    1.63 +		updatesResultCounter = 0;
    1.64  	}
    1.65  
    1.66  	@Override
    1.67 -	public void writeEndResultSet() {
    1.68 -		super.writeEndResultSet();
    1.69 -		printEndElement();
    1.70 -		printEndElement();
    1.71 -
    1.72 -		printTextElement(qname("p"), null, "Record count: " + getCurrentRowCount());
    1.73 -	}
    1.74 -
    1.75 -	@Override
    1.76 -	public void writeStartUpdatesResult() {
    1.77 -		super.writeStartUpdatesResult();
    1.78 +	public void writeUpdatesResult(int updatedRowsCount) {
    1.79 +		super.writeUpdatesResult(updatedRowsCount);
    1.80  		updatesResultCounter++;
    1.81  		printEmptyElement(qname("hr"), null);
    1.82 -		printTextElement(qname("h2"), null, "Updates result #" + updatesResultCounter);
    1.83 -	}
    1.84 -
    1.85 -	@Override
    1.86 -	public void writeUpdatedRowsCount(int updatedRowsCount) {
    1.87 -		super.writeUpdatedRowsCount(updatedRowsCount);
    1.88 +		printTextElement(qname("h3"), null, "Updates result #" + updatesResultCounter);
    1.89  		printTextElement(qname("p"), null, "Updated rows: " + updatedRowsCount);
    1.90  	}
    1.91  }