[Exist-commits] eXist-1.0/src/org/exist/xmldb LocalResourceSet.java,1.18,1.19 LocalXUpdateQueryService.java,1.12,1.13 LocalXPathQueryService.java,1.38,1.39

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

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

Modified Files:
	LocalResourceSet.java LocalXUpdateQueryService.java 
	LocalXPathQueryService.java 
Log Message:
XUpdate:

* Btree not correctly updated after node changes, leading to NullPointerException
* Attribute values truncated
* Page splitting error results in NullPointerException after a few hundred XUpdates
* New configuration parameter to control XUpdate behaviour

Other:

* Properties passed to Collection, XPathQueryService, XQueryService had no effect.
* Modified evaluation of index settings in conf.xml.

Index: LocalXPathQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalXPathQueryService.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** LocalXPathQueryService.java	3 May 2004 12:58:11 -0000	1.38
--- LocalXPathQueryService.java	10 May 2004 11:22:51 -0000	1.39
***************
*** 161,165 ****
  			context.setBackwardsCompatibility(xpathCompatible);
  			context.setStaticallyKnownDocuments(docs);
- 			LOG.debug("docs: " + docs.getLength());
  			Map.Entry entry;
  			// declare namespace/prefix mappings
--- 161,164 ----

Index: LocalXUpdateQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalXUpdateQueryService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** LocalXUpdateQueryService.java	3 May 2004 12:58:11 -0000	1.12
--- LocalXUpdateQueryService.java	10 May 2004 11:22:51 -0000	1.13
***************
*** 36,40 ****
  	private User user;
  	private LocalCollection parent;
! 
  	/**
  	 * Constructor for LocalXUpdateQueryService.
--- 36,40 ----
  	private User user;
  	private LocalCollection parent;
! 	
  	/**
  	 * Constructor for LocalXUpdateQueryService.

Index: LocalResourceSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalResourceSet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** LocalResourceSet.java	3 May 2004 12:58:11 -0000	1.18
--- LocalResourceSet.java	10 May 2004 11:22:51 -0000	1.19
***************
*** 159,162 ****
--- 159,163 ----
  				|| coll.getCollection().getId() != p.doc.getCollection().getId()) {
  				coll = new LocalCollection(user, brokerPool, null, p.doc.getCollection().getName());
+ 				coll.properties = outputProperties;
  			}
  			res = new LocalXMLResource(user, brokerPool, coll, p);