[Exist-commits] eXist-1.0/src/org/exist/storage DBBroker.java,1.32,1.33 NativeBroker.java,1.80,1.81

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

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

Modified Files:
	DBBroker.java NativeBroker.java 
Log Message:
Index configuration settings were not applied during xupdate:remove.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** NativeBroker.java	8 Jun 2004 08:16:11 -0000	1.80
--- NativeBroker.java	17 Jun 2004 13:14:58 -0000	1.81
***************
*** 1534,1538 ****
  	}
  
! 	public void removeNode(final NodeImpl node, String currentPath) {
  		final IndexPaths idx =
  			(IndexPaths) idxPathMap.get(node.getOwnerDocument().getDoctype().getName());
--- 1534,1538 ----
  	}
  
! 	public void removeNode(final NodeImpl node, NodePath currentPath) {
  		final IndexPaths idx =
  			(IndexPaths) idxPathMap.get(node.getOwnerDocument().getDoctype().getName());
***************
*** 1573,1577 ****
  				// check if attribute value should be fulltext-indexed
  				// by calling IndexPaths.match(path) 
! 				if (idx == null || idx.getIncludeAttributes())
  					textEngine.storeAttribute(idx, (AttrImpl) node);
  				// if the attribute has type ID, store the ID-value
--- 1573,1586 ----
  				// check if attribute value should be fulltext-indexed
  				// by calling IndexPaths.match(path) 
! 				boolean indexAttribs = true;
! 				if(idx != null) {
! 				    if(idx.getIncludeAttributes()) {
! 					    currentPath.addComponent('@' + ((AttrImpl)node).getName());
! 					    indexAttribs = idx.match(currentPath);
! 					    currentPath.removeLastComponent();
! 				    } else
! 				        indexAttribs = false;
! 				}
! 				if (indexAttribs)
  					textEngine.storeAttribute(idx, (AttrImpl) node);
  				// if the attribute has type ID, store the ID-value
***************
*** 1586,1591 ****
  				// check if this textual content should be fulltext-indexed
  				// by calling IndexPaths.match(path)
! 				// if (idx == null || idx.match(currentPath))
! 				textEngine.storeText(idx, (TextImpl) node, false);
  				break;
  		}
--- 1595,1601 ----
  				// check if this textual content should be fulltext-indexed
  				// by calling IndexPaths.match(path)
! 				if (idx == null || idx.match(currentPath)){
! 					boolean valore = (idx == null ? false : idx.preserveContent(currentPath));
! 					textEngine.storeText(idx, (TextImpl) node, valore);}
  				break;
  		}

Index: DBBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/DBBroker.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** DBBroker.java	8 Jun 2004 08:16:11 -0000	1.32
--- DBBroker.java	17 Jun 2004 13:14:58 -0000	1.33
***************
*** 40,55 ****
  import org.exist.dom.NodeProxy;
  import org.exist.dom.NodeSet;
- import org.exist.dom.QName;
  import org.exist.dom.SymbolTable;
  import org.exist.security.PermissionDeniedException;
  import org.exist.security.User;
  import org.exist.storage.io.VariableByteInput;
- import org.exist.storage.io.VariableByteOutputStream;
  import org.exist.storage.io.VariableByteInputStream;
  import org.exist.storage.serializers.Serializer;
  import org.exist.util.Configuration;
  import org.exist.util.LockException;
- import org.exist.util.Occurrences;
- import org.exist.xquery.NodeSelector;
  import org.exist.xquery.XQuery;
  import org.w3c.dom.Document;
--- 40,52 ----
  import org.exist.dom.NodeProxy;
  import org.exist.dom.NodeSet;
  import org.exist.dom.SymbolTable;
  import org.exist.security.PermissionDeniedException;
  import org.exist.security.User;
  import org.exist.storage.io.VariableByteInput;
  import org.exist.storage.io.VariableByteInputStream;
+ import org.exist.storage.io.VariableByteOutputStream;
  import org.exist.storage.serializers.Serializer;
  import org.exist.util.Configuration;
  import org.exist.util.LockException;
  import org.exist.xquery.XQuery;
  import org.w3c.dom.Document;
***************
*** 487,491 ****
  	}
  
! 	public void removeNode(final NodeImpl node, String currentPath) {
  		throw new RuntimeException("not implemented");
  	}
--- 484,488 ----
  	}
  
! 	public void removeNode(final NodeImpl node, NodePath currentPath) {
  		throw new RuntimeException("not implemented");
  	}