[Exist-commits] eXist-1.0/src/org/exist/http RESTServer.java,1.15,1.16 HttpServerConnection.java,1.18,1.19

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/http
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21081/src/org/exist/http

Modified Files:
	RESTServer.java HttpServerConnection.java 
Log Message:
* Added support for XQuery pragmas to set serialization and watchdog settings.
* org.exist.storage.serializers.Serializer now passes all output to an instance of the Receiver interface instead of a SAX ContentHandler. Receiver resembles SAX, but has 
methods that are closer to eXist's internal storage. For example, it directly accepts a QName in startElement to avoid unnecessary string allocations.
* Fixed various performance leaks in cross-document joins.

Index: RESTServer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/RESTServer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RESTServer.java	3 Aug 2004 15:26:00 -0000	1.15
--- RESTServer.java	12 Sep 2004 09:25:19 -0000	1.16
***************
*** 581,586 ****
  			sax.setOutputProperties(outputProperties);
  			serializer.setProperties(outputProperties);
- 			serializer.setContentHandler(sax);
  			serializer.setLexicalHandler(sax);
  			
  			AttributesImpl attrs = new AttributesImpl();
--- 581,586 ----
  			sax.setOutputProperties(outputProperties);
  			serializer.setProperties(outputProperties);
  			serializer.setLexicalHandler(sax);
+ 			serializer.setContentHandler(sax);
  			
  			AttributesImpl attrs = new AttributesImpl();

Index: HttpServerConnection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/HttpServerConnection.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** HttpServerConnection.java	23 Apr 2004 13:07:47 -0000	1.18
--- HttpServerConnection.java	12 Sep 2004 09:25:19 -0000	1.19
***************
*** 247,257 ****
  		for (Iterator i = ((NodeSet) resultSet).iterator(); i.hasNext(); ) {
  			p = (NodeProxy) i.next();
! 			docName = p.doc.getFileName();
! 			doctype = p.doc.getDoctype();
  			if (map.containsKey(docName)) {
  				counter = (NodeCount) map.get(docName);
  				counter.inc();
  			} else {
! 				counter = new NodeCount(p.doc);
  				map.put(docName, counter);
  			}
--- 247,257 ----
  		for (Iterator i = ((NodeSet) resultSet).iterator(); i.hasNext(); ) {
  			p = (NodeProxy) i.next();
! 			docName = p.getDocument().getFileName();
! 			doctype = p.getDocument().getDoctype();
  			if (map.containsKey(docName)) {
  				counter = (NodeCount) map.get(docName);
  				counter.inc();
  			} else {
! 				counter = new NodeCount(p.getDocument());
  				map.put(docName, counter);
  			}