[Exist-commits] eXist-1.0/src/org/exist/xupdate XUpdateProcessor.java,1.24,1.25 Modification.java,1.30,1.31

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

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

Modified Files:
	XUpdateProcessor.java Modification.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: XUpdateProcessor.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xupdate/XUpdateProcessor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** XUpdateProcessor.java	16 Jun 2004 13:36:53 -0000	1.24
--- XUpdateProcessor.java	12 Sep 2004 09:25:22 -0000	1.25
***************
*** 21,32 ****
  import org.exist.dom.NodeListImpl;
  import org.exist.dom.XMLUtil;
- import org.exist.xquery.parser.XQueryLexer;
- import org.exist.xquery.parser.XQueryParser;
- import org.exist.xquery.parser.XQueryTreeParser;
  import org.exist.storage.DBBroker;
  import org.exist.util.FastStringBuffer;
  import org.exist.xquery.PathExpr;
- import org.exist.xquery.XQueryContext;
  import org.exist.xquery.XPathException;
  import org.exist.xquery.value.Sequence;
  import org.exist.xquery.value.Type;
--- 21,32 ----
  import org.exist.dom.NodeListImpl;
  import org.exist.dom.XMLUtil;
  import org.exist.storage.DBBroker;
  import org.exist.util.FastStringBuffer;
  import org.exist.xquery.PathExpr;
  import org.exist.xquery.XPathException;
+ import org.exist.xquery.XQueryContext;
+ import org.exist.xquery.parser.XQueryLexer;
+ import org.exist.xquery.parser.XQueryParser;
+ import org.exist.xquery.parser.XQueryTreeParser;
  import org.exist.xquery.value.Sequence;
  import org.exist.xquery.value.Type;
***************
*** 34,38 ****
  import org.w3c.dom.Comment;
  import org.w3c.dom.Document;
- import org.w3c.dom.DocumentFragment;
  import org.w3c.dom.Element;
  import org.w3c.dom.Node;
--- 34,37 ----
***************
*** 122,129 ****
  		SAXParser sax = saxFactory.newSAXParser();
  		XMLReader reader = sax.getXMLReader();
- 		reader.setContentHandler(this);
  		reader.setProperty(
! 			"http://xml.org/sax/properties/lexical-handler",
! 			this);
  		reader.parse(is);
  		Modification mods[] = new Modification[modifications.size()];
--- 121,129 ----
  		SAXParser sax = saxFactory.newSAXParser();
  		XMLReader reader = sax.getXMLReader();
  		reader.setProperty(
! 				"http://xml.org/sax/properties/lexical-handler",
! 				this);
! 		reader.setContentHandler(this);
! 		
  		reader.parse(is);
  		Modification mods[] = new Modification[modifications.size()];
***************
*** 483,487 ****
  					(String) entry.getValue());
  			}
! 			XQueryLexer lexer = new XQueryLexer(new StringReader(select));
  			XQueryParser parser = new XQueryParser(lexer);
  			XQueryTreeParser treeParser = new XQueryTreeParser(context);
--- 483,487 ----
  					(String) entry.getValue());
  			}
! 			XQueryLexer lexer = new XQueryLexer(context, new StringReader(select));
  			XQueryParser parser = new XQueryParser(lexer);
  			XQueryTreeParser treeParser = new XQueryTreeParser(context);

Index: Modification.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xupdate/Modification.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Modification.java	19 Jul 2004 13:06:25 -0000	1.30
--- Modification.java	12 Sep 2004 09:25:23 -0000	1.31
***************
*** 123,127 ****
  					(String) entry.getValue());
  			}
! 			XQueryLexer lexer = new XQueryLexer(new StringReader(selectStmt));
  			XQueryParser parser = new XQueryParser(lexer);
  			XQueryTreeParser treeParser = new XQueryTreeParser(context);
--- 123,127 ----
  					(String) entry.getValue());
  			}
! 			XQueryLexer lexer = new XQueryLexer(context, new StringReader(selectStmt));
  			XQueryParser parser = new XQueryParser(lexer);
  			XQueryTreeParser treeParser = new XQueryTreeParser(context);