[patch] New cleaned up patch.

XUpdateImpl.java.patch.new (text/plain), 2.54 KB, created by Todd Byrne on 2004-08-30 16:25:33 UTC

(hide)

Description: New cleaned up patch.

Filename:

MIME Type:

Creator: Todd Byrne

Created: 2004-08-30 16:25:33 UTC

Size: 2.54 KB

patch

obsolete

>--- xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateImpl.java 2004-02-07 19:50:54.000000000 -0700 >+++ /home/byrne/jbproject/xindice-cvs-src/xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateImpl.java 2004-08-30 10:30:39.000000000 -0600 >@@ -24,6 +24,7 @@ > import org.apache.xindice.xml.NodeSource; > import org.apache.xindice.xml.dom.CompressedNode; > import org.apache.xindice.xml.dom.DBNode; >+import org.apache.xindice.core.data.Key; > > import org.w3c.dom.Document; > import org.w3c.dom.Node; >@@ -150,6 +151,7 @@ > public void execute(Collection col) throws Exception { > > int attribIndex = 0; >+ Hashtable docsUpdated = new Hashtable(); > for (int i = 0; i < super.query[0].size(); i++) { > int cmdID = ((Integer) super.query[0].elementAt(i)).intValue(); > >@@ -159,29 +161,32 @@ > String selector = (String) attribs.get("select"); > > // If we found an XPath selector we need to execute the commands. >- if (selector != null) { >+ if (selector != null && !selector.startsWith("$")) { > NodeSet ns = col.queryCollection("XPath", selector, nsMap); > Document lastDoc = null; > while (ns != null && ns.hasMoreNodes()) { > DBNode node = (DBNode) ns.getNextNode(); > Document doc = node.getOwnerDocument(); >+ NodeSource source = node.getSource(); >+ Node contextNode = doc.getDocumentElement(); > >- if (doc == lastDoc) { >+ if (docsUpdated.containsKey(source.getKey())) { > continue; // We only have to process it once > } else { >- lastDoc = doc; >+ docsUpdated.put(source.getKey(), doc); > } >- >- NodeSource source = node.getSource(); >- >- Node contextNode = doc.getDocumentElement(); > execute(contextNode); >- >- col.setDocument(source.getKey(), doc); > } > } > } > } >+ // update all documents at once >+ // this way we don't get any half run xupdate commands. >+ Enumeration keys = docsUpdated.keys(); >+ while(keys.hasMoreElements()) { >+ Key docID = (Key)keys.nextElement(); >+ col.setDocument(docID, (Document)docsUpdated.get(docID)); >+ } > } > > public int getModifiedCount() { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]