[Exist-commits] eXist-1.0/src/org/exist/client InteractiveClient.java,1.27,1.28

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

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

Modified Files:
	InteractiveClient.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: InteractiveClient.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/client/InteractiveClient.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** InteractiveClient.java	3 May 2004 13:05:08 -0000	1.27
--- InteractiveClient.java	10 May 2004 11:22:51 -0000	1.28
***************
*** 69,73 ****
  import org.exist.security.Permission;
  import org.exist.security.User;
- import org.exist.storage.serializers.EXistOutputKeys;
  import org.exist.util.CollectionScanner;
  import org.exist.util.DirectoryScanner;
--- 69,72 ----
***************
*** 367,370 ****
--- 366,377 ----
  	}
  	
+ 	protected void setProperties() throws XMLDBException {
+ 	    String key;
+ 	    for(Iterator i = properties.keySet().iterator(); i.hasNext(); ) {
+ 	        key = (String)i.next();
+ 	        current.setProperty(key, properties.getProperty(key));
+ 	    }
+ 	}
+ 	
  	/**
  	 * Get list of resources contained in collection.
***************
*** 376,379 ****
--- 383,387 ----
  		if (current == null)
  			return;
+ 		setProperties();
  		UserManagementService mgtService = (UserManagementService) current
  				.getService("UserManagementService", "1.0");
***************
*** 1006,1009 ****
--- 1014,1018 ----
  						System.out.println(key + " = " + val);
  						properties.setProperty(key, val);
+ 						current.setProperty(key, val);
  						getResources();
  					} catch (Exception e) {
***************
*** 1145,1153 ****
  	protected final Resource retrieve(String resource, String indent)
  			throws XMLDBException {
- 		current.setProperty(OutputKeys.INDENT, indent);
- 		current.setProperty(OutputKeys.ENCODING, properties
- 				.getProperty("encoding"));
- 		current.setProperty(EXistOutputKeys.EXPAND_XINCLUDES, properties
- 				.getProperty("expand-xincludes"));
  		Resource res = current.getResource(resource);
  		if (res == null) {
--- 1154,1157 ----