From 0d3a7fe9b1feec64fc4320959e6b79f5f2b2378b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 2 Feb 2005 17:04:58 +0000
Subject: [PATCH] Moved over to the new live query notification API. Fixed a
 stupid bug in Query::LiveUpdate() that prevented it to work correctly before:
 instead of the file name, the attribute value was passed to
 send_notification().

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11225 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/file_systems/bfs/Query.cpp | 58 ++++++++++++-------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/bfs/Query.cpp b/src/add-ons/kernel/file_systems/bfs/Query.cpp
index 94984d9688..2219bc9b7b 100644
--- a/src/add-ons/kernel/file_systems/bfs/Query.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Query.cpp
@@ -4,7 +4,7 @@
  * by J. Kercheval, and on code written by Kenneth Almquist, though
  * it shares no code.
  *
- * Copyright 2001-2004, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2001-2005, Axel Dörfler, axeld@pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 
@@ -1573,29 +1573,47 @@ Query::LiveUpdate(Inode *inode, const char *attribute, int32 type, const uint8 *
 	status_t oldStatus = fExpression->Root()->Match(inode, attribute, type, oldKey, oldLength);
 	status_t newStatus = fExpression->Root()->Match(inode, attribute, type, newKey, newLength);
 
-	int32 op;
-	if (oldStatus == MATCH_OK && newStatus == MATCH_OK) {
-		// only send out a notification if the name was changed 
+	const char *name = NULL;
+	bool entryCreated;
+
+	if (oldStatus != MATCH_OK) {
+		if (newStatus != MATCH_OK) {
+			// nothing has changed
+			return;
+		}
+		entryCreated = true;
+	} else if (newStatus != MATCH_OK) {
+		// entry got removed
+		entryCreated = false;
+	} else {
+		// the entry stays in the query - only notify in case the name of the inode was changed
 		if (oldKey == NULL || strcmp(attribute, "name"))
 			return;
 
-		send_notification(fPort, fToken, B_QUERY_UPDATE, B_ENTRY_REMOVED, fVolume->ID(), 0,
-			fVolume->ToVnode(inode->Parent()), 0, inode->ID(), (const char *)oldKey);
-		op = B_ENTRY_CREATED;
-	} else if (oldStatus != MATCH_OK && newStatus != MATCH_OK) {
-		// nothing has changed
-		return;
-	} else if (oldStatus == MATCH_OK && newStatus != MATCH_OK)
-		op = B_ENTRY_REMOVED;
-	else
-		op = B_ENTRY_CREATED;
+		notify_query_entry_removed(fPort, fToken, fVolume->ID(),
+			fVolume->ToVnode(inode->Parent()), (const char *)oldKey, inode->ID());
+		name = (const char *)newKey;
+		entryCreated = true;
+	}
 
-	// if "value" is NULL, send_notification() crashes...
-	const char *value = (const char *)newKey;
-	if (type != B_STRING_TYPE || value == NULL)
-		value = "";
+	// we may need to get the name of the inode
 
-	send_notification(fPort, fToken, B_QUERY_UPDATE, op, fVolume->ID(), 0,
-		fVolume->ToVnode(inode->Parent()), 0, inode->ID(), value);
+	char nameBuffer[B_FILE_NAME_LENGTH];
+
+	if (name == NULL) {
+		if (inode->GetName(nameBuffer) != B_OK)
+			nameBuffer[0] = '\0';
+		name = nameBuffer;
+	}
+
+	// notify query listeners
+
+	if (entryCreated) {
+		notify_query_entry_created(fPort, fToken, fVolume->ID(),
+			fVolume->ToVnode(inode->Parent()), name, inode->ID());
+	} else {
+		notify_query_entry_removed(fPort, fToken, fVolume->ID(),
+			fVolume->ToVnode(inode->Parent()), name, inode->ID());
+	}
 }