(Not part of build yet) Moving find/search into its own component.

suite/browser/public/nsISearchService.idl

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  The Browser Search service
+
+*/
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(1222e6f0-a5e3-11d2-8b7c-00805f8a7db6)]
+interface nsILocalSearchService : nsISupports
+{
+};
+
+[scriptable, uuid(6bd1d803-1c67-11d3-9820-ed1b357eb3c4)]
+interface nsInternetSearchService : nsISupports
+{
+};
+
+%{C++
+
+#define NS_IINTERNETSEARCHDATASOURCECALLBACK_IID \
+{ 0x88774583, 0x1edd, 0x11d3, { 0x98, 0x20, 0xbf, 0x1b, 0xe7, 0x7e, 0x61, 0xc4 } }
+
+#define NS_IINTERNETSEARCHDATAOURCE_IID \
+{ 0x6bd1d803, 0x1c67, 0x11d3, { 0x98, 0x20, 0xed, 0x1b, 0x35, 0x7e, 0xb3, 0xc4 } }
+
+#define NS_ILOCALSEARCHDATASOURCE_IID \
+{ 0x1222e6f0, 0xa5e3, 0x11d2, { 0x8b, 0x7c, 0x00, 0x80, 0x5f, 0x8a, 0x7d, 0xb6 } }
+
+#define NS_LOCALSEARCH_SERVICE_PROGID \
+    "component://netscape/browser/localsearch-service"
+#define NS_LOCALSEARCH_DATASOURCE_PROGID \
+    "component://netscape/rdf/datasource?name=localsearch"
+
+#define NS_INTERNETSEARCH_SERVICE_PROGID \
+    "component://netscape/browser/internetsearch-service"
+#define NS_INTERNETSEARCH_DATASOURCE_PROGID \
+    "component://netscape/rdf/datasource?name=internetsearch"
+
+%}

suite/browser/src/nsLocalSearchService.cpp

@@ -0,0 +1,937 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8; c-file-style: "stroustrup" -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+  Implementation for a find RDF data store.
+ */
+
+#include <ctype.h> // for toupper()
+#include <stdio.h>
+#include "nscore.h"
+#include "nsCOMPtr.h"
+#include "nsIRDFDataSource.h"
+#include "nsIRDFNode.h"
+#include "nsIRDFObserver.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsEnumeratorUtils.h"
+#include "nsString.h"
+#include "nsVoidArray.h"  // XXX introduces dependency on raptorbase
+#include "nsXPIDLString.h"
+#include "nsRDFCID.h"
+//#include "rdfutil.h"
+#include "nsIRDFService.h"
+#include "xp_core.h"
+#include "plhash.h"
+#include "plstr.h"
+#include "prmem.h"
+#include "prprf.h"
+#include "prio.h"
+#include "rdf.h"
+#include "nsISearchService.h"
+
+static NS_DEFINE_CID(kRDFServiceCID,               NS_RDFSERVICE_CID);
+static NS_DEFINE_IID(kISupportsIID,                NS_ISUPPORTS_IID);
+static NS_DEFINE_CID(kRDFInMemoryDataSourceCID,    NS_RDFINMEMORYDATASOURCE_CID);
+
+
+typedef	struct	_findTokenStruct
+{
+	char			*token;
+	char			*value;
+} findTokenStruct, *findTokenPtr;
+
+
+
+class LocalSearchDataSource : public nsILocalSearchService
+{
+private:
+	nsCOMPtr<nsISupportsArray> mObservers;
+
+	static PRInt32		gRefCnt;
+
+    // pseudo-constants
+	static nsIRDFResource	*kNC_Child;
+	static nsIRDFResource	*kNC_Name;
+	static nsIRDFResource	*kNC_URL;
+	static nsIRDFResource	*kNC_FindObject;
+	static nsIRDFResource	*kNC_pulse;
+	static nsIRDFResource	*kRDF_InstanceOf;
+	static nsIRDFResource	*kRDF_type;
+
+friend	NS_IMETHODIMP	NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+
+	NS_METHOD	getFindResults(nsIRDFResource *source, nsISimpleEnumerator** aResult);
+
+	NS_METHOD	getFindName(nsIRDFResource *source, nsIRDFLiteral** aResult);
+
+	NS_METHOD	parseResourceIntoFindTokens(nsIRDFResource *u,
+				findTokenPtr tokens);
+	NS_METHOD	doMatch(nsIRDFLiteral *literal, char *matchMethod,
+				char *matchText);
+	NS_METHOD	parseFindURL(nsIRDFResource *u,
+				nsISupportsArray *array);
+
+public:
+
+	NS_DECL_ISUPPORTS
+
+			LocalSearchDataSource(void);
+	virtual		~LocalSearchDataSource(void);
+
+	nsresult	Init();
+
+	// nsIRDFDataSource methods
+
+	NS_IMETHOD	GetURI(char **uri);
+	NS_IMETHOD	GetSource(nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv,
+				nsIRDFResource **source /* out */);
+	NS_IMETHOD	GetSources(nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv,
+				nsISimpleEnumerator **sources /* out */);
+	NS_IMETHOD	GetTarget(nsIRDFResource *source,
+				nsIRDFResource *property,
+				PRBool tv,
+				nsIRDFNode **target /* out */);
+	NS_IMETHOD	GetTargets(nsIRDFResource *source,
+				nsIRDFResource *property,
+				PRBool tv,
+				nsISimpleEnumerator **targets /* out */);
+	NS_IMETHOD	Assert(nsIRDFResource *source,
+				nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv);
+	NS_IMETHOD	Unassert(nsIRDFResource *source,
+				nsIRDFResource *property,
+				nsIRDFNode *target);
+	NS_IMETHOD	Change(nsIRDFResource* aSource,
+				nsIRDFResource* aProperty,
+				nsIRDFNode* aOldTarget,
+				nsIRDFNode* aNewTarget);
+	NS_IMETHOD	Move(nsIRDFResource* aOldSource,
+				nsIRDFResource* aNewSource,
+				nsIRDFResource* aProperty,
+				nsIRDFNode* aTarget);
+	NS_IMETHOD	HasAssertion(nsIRDFResource *source,
+				nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv,
+				PRBool *hasAssertion /* out */);
+	NS_IMETHOD	ArcLabelsIn(nsIRDFNode *node,
+				nsISimpleEnumerator **labels /* out */);
+	NS_IMETHOD	ArcLabelsOut(nsIRDFResource *source,
+				nsISimpleEnumerator **labels /* out */);
+	NS_IMETHOD	GetAllResources(nsISimpleEnumerator** aCursor);
+	NS_IMETHOD	AddObserver(nsIRDFObserver *n);
+	NS_IMETHOD	RemoveObserver(nsIRDFObserver *n);
+	NS_IMETHOD	GetAllCommands(nsIRDFResource* source,
+				nsIEnumerator/*<nsIRDFResource>*/** commands);
+	NS_IMETHOD	GetAllCmds(nsIRDFResource* source,
+				nsISimpleEnumerator/*<nsIRDFResource>*/** commands);
+	NS_IMETHOD	IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments,
+                PRBool* aResult);
+	NS_IMETHOD	DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments);
+};
+
+
+
+static	nsIRDFService		*gRDFService = nsnull;
+static	LocalSearchDataSource		*gLocalSearchDataSource = nsnull;
+
+PRInt32 LocalSearchDataSource::gRefCnt;
+
+nsIRDFResource		*LocalSearchDataSource::kNC_Child;
+nsIRDFResource		*LocalSearchDataSource::kNC_Name;
+nsIRDFResource		*LocalSearchDataSource::kNC_URL;
+nsIRDFResource		*LocalSearchDataSource::kNC_FindObject;
+nsIRDFResource		*LocalSearchDataSource::kNC_pulse;
+nsIRDFResource		*LocalSearchDataSource::kRDF_InstanceOf;
+nsIRDFResource		*LocalSearchDataSource::kRDF_type;
+
+static const char	kFindProtocol[] = "find:";
+
+
+
+static PRBool
+isFindURI(nsIRDFResource *r)
+{
+	PRBool		isFindURIFlag = PR_FALSE;
+	const char	*uri = nsnull;
+	
+	r->GetValueConst(&uri);
+	if ((uri) && (!strncmp(uri, kFindProtocol, sizeof(kFindProtocol) - 1)))
+	{
+		isFindURIFlag = PR_TRUE;
+	}
+	return(isFindURIFlag);
+}
+
+
+
+LocalSearchDataSource::LocalSearchDataSource(void)
+{
+	NS_INIT_REFCNT();
+
+	if (gRefCnt++ == 0)
+	{
+		nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
+		                           nsIRDFService::GetIID(),
+		                           (nsISupports**) &gRDFService);
+
+		PR_ASSERT(NS_SUCCEEDED(rv));
+
+		gRDFService->GetResource(NC_NAMESPACE_URI "child",       &kNC_Child);
+		gRDFService->GetResource(NC_NAMESPACE_URI "Name",        &kNC_Name);
+		gRDFService->GetResource(NC_NAMESPACE_URI "URL",         &kNC_URL);
+		gRDFService->GetResource(NC_NAMESPACE_URI "FindObject",  &kNC_FindObject);
+		gRDFService->GetResource(NC_NAMESPACE_URI "pulse",       &kNC_pulse);
+
+		gRDFService->GetResource(RDF_NAMESPACE_URI "instanceOf", &kRDF_InstanceOf);
+		gRDFService->GetResource(RDF_NAMESPACE_URI "type",       &kRDF_type);
+
+		gLocalSearchDataSource = this;
+	}
+}
+
+
+
+LocalSearchDataSource::~LocalSearchDataSource (void)
+{
+	if (--gRefCnt == 0)
+	{
+		NS_RELEASE(kNC_Child);
+		NS_RELEASE(kNC_Name);
+		NS_RELEASE(kNC_URL);
+		NS_RELEASE(kNC_FindObject);
+		NS_RELEASE(kNC_pulse);
+		NS_RELEASE(kRDF_InstanceOf);
+		NS_RELEASE(kRDF_type);
+
+		gLocalSearchDataSource = nsnull;
+		nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
+		gRDFService = nsnull;
+	}
+}
+
+
+
+nsresult
+LocalSearchDataSource::Init()
+{
+	nsresult	rv = NS_ERROR_OUT_OF_MEMORY;
+
+#if 0
+	// register this as a named data source with the service manager
+	if (NS_FAILED(rv = gRDFService->RegisterDataSource(this, PR_FALSE)))
+		return(rv);
+#endif
+
+	return(rv);
+}
+
+
+
+NS_IMPL_ISUPPORTS(LocalSearchDataSource, nsIRDFDataSource::GetIID());
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetURI(char **uri)
+{
+	NS_PRECONDITION(uri != nsnull, "null ptr");
+	if (! uri)
+		return NS_ERROR_NULL_POINTER;
+
+	if ((*uri = nsXPIDLCString::Copy("rdf:find")) == nsnull)
+		return NS_ERROR_OUT_OF_MEMORY;
+
+	return NS_OK;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetSource(nsIRDFResource* property,
+                          nsIRDFNode* target,
+                          PRBool tv,
+                          nsIRDFResource** source /* out */)
+{
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(target != nsnull, "null ptr");
+	if (! target)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	*source = nsnull;
+	return NS_RDF_NO_VALUE;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetSources(nsIRDFResource *property,
+                           nsIRDFNode *target,
+			   PRBool tv,
+                           nsISimpleEnumerator **sources /* out */)
+{
+	NS_NOTYETIMPLEMENTED("write me");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetTarget(nsIRDFResource *source,
+                          nsIRDFResource *property,
+                          PRBool tv,
+                          nsIRDFNode **target /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(target != nsnull, "null ptr");
+	if (! target)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv = NS_RDF_NO_VALUE;
+
+	// we only have positive assertions in the find data source.
+	if (! tv)
+		return rv;
+
+	if (isFindURI(source))
+	{
+		if (property == kNC_Name)
+		{
+//			rv = GetName(source, &array);
+		}
+		else if (property == kNC_URL)
+		{
+			// note: lie and say there is no URL
+//			rv = GetURL(source, &array);
+			nsAutoString	url("");
+			nsIRDFLiteral	*literal;
+			gRDFService->GetLiteral(url.GetUnicode(), &literal);
+			*target = literal;
+			rv = NS_OK;
+		}
+		else if (property == kRDF_type)
+		{
+			const char	*uri = nsnull;
+			rv = kNC_FindObject->GetValueConst(&uri);
+			if (NS_FAILED(rv)) return rv;
+
+			nsAutoString	url(uri);
+			nsIRDFLiteral	*literal;
+			gRDFService->GetLiteral(url.GetUnicode(), &literal);
+
+			*target = literal;
+			return NS_OK;
+		}
+		else if (property == kNC_pulse)
+		{
+			nsAutoString	pulse("15");
+			nsIRDFLiteral	*pulseLiteral;
+			rv = gRDFService->GetLiteral(pulse.GetUnicode(), &pulseLiteral);
+			if (NS_FAILED(rv)) return rv;
+
+			*target = pulseLiteral;
+			return NS_OK;
+		}
+	}
+	return NS_RDF_NO_VALUE;
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::parseResourceIntoFindTokens(nsIRDFResource *u, findTokenPtr tokens)
+{
+	const char		*uri = nsnull;
+	char			*id, *token, *value;
+	int			loop;
+	nsresult		rv;
+
+	if (NS_FAILED(rv = u->GetValueConst(&uri)))	return(rv);
+
+#ifdef	DEBUG
+	printf("Find: %s\n", (const char*) uri);
+#endif
+
+	if (!(id = PL_strdup(uri + sizeof(kFindProtocol) - 1)))
+		return(NS_ERROR_OUT_OF_MEMORY);
+
+	/* parse ID, build up token list */
+	if ((token = strtok(id, "&")) != NULL)
+	{
+		while (token != NULL)
+		{
+			if ((value = strstr(token, "=")) != NULL)
+			{
+				*value++ = '\0';
+			}
+			for (loop=0; tokens[loop].token != NULL; loop++)
+			{
+				if (!strcmp(token, tokens[loop].token))
+				{
+					tokens[loop].value = PL_strdup(value);
+					break;
+				}
+			}
+			token = strtok(NULL, "&");
+		}
+	}
+	PL_strfree(id);
+	return(NS_OK);
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::doMatch(nsIRDFLiteral *literal, char *matchMethod, char *matchText)
+{
+	PRBool		found = PR_FALSE;
+
+	if ((nsnull == literal) || (nsnull == matchMethod) || (nsnull == matchText))
+		return(found);
+
+        nsXPIDLString	str;
+	literal->GetValue( getter_Copies(str) );
+	if (! str)	return(found);
+	nsAutoString	value(str);
+
+	if (!PL_strcmp(matchMethod, "contains"))
+	{
+		if (value.Find(matchText, PR_TRUE) >= 0)
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "startswith"))
+	{
+		if (value.Find(matchText, PR_TRUE) == 0)
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "endswith"))
+	{
+		PRInt32 pos = value.RFind(matchText, PR_TRUE);
+		if ((pos >= 0) && (pos == (value.Length() - PRInt32(strlen(matchText)))))
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "is"))
+	{
+		if (value.EqualsIgnoreCase(matchText))
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "isnot"))
+	{
+		if (!value.EqualsIgnoreCase(matchText))
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "doesntcontain"))
+	{
+		if (value.Find(matchText, PR_TRUE) < 0)
+			found = PR_TRUE;
+	}
+	return(found);
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::parseFindURL(nsIRDFResource *u, nsISupportsArray *array)
+{
+	findTokenStruct		tokens[5];
+	nsresult		rv;
+	int			loop;
+
+	/* build up a token list */
+	tokens[0].token = "datasource";		tokens[0].value = NULL;
+	tokens[1].token = "match";		tokens[1].value = NULL;
+	tokens[2].token = "method";		tokens[2].value = NULL;
+	tokens[3].token = "text";		tokens[3].value = NULL;
+	tokens[4].token = NULL;			tokens[4].value = NULL;
+
+	// parse find URI, get parameters, search in appropriate datasource(s), return results
+	if (NS_SUCCEEDED(rv = parseResourceIntoFindTokens(u, tokens)))
+	{
+		nsIRDFDataSource	*datasource;
+		if (NS_SUCCEEDED(rv = gRDFService->GetDataSource(tokens[0].value, &datasource)))
+		{
+			nsISimpleEnumerator	*cursor = nsnull;
+			if (NS_SUCCEEDED(rv = datasource->GetAllResources(&cursor)))
+			{
+				while (1) 
+				{
+					PRBool hasMore;
+					rv = cursor->HasMoreElements(&hasMore);
+					if (NS_FAILED(rv))
+						break;
+
+					if (! hasMore)
+						break;
+
+					nsCOMPtr<nsISupports> isupports;
+					rv = cursor->GetNext(getter_AddRefs(isupports));
+					if (NS_SUCCEEDED(rv))
+					{
+						nsIRDFResource	*source = nsnull;
+						if (NS_SUCCEEDED(rv = isupports->QueryInterface(nsIRDFResource::GetIID(), (void **)&source)))
+						{
+							const char	*uri = nsnull;
+							source->GetValueConst(&uri);
+
+							// never match against a "find:" URI
+							if ((uri) && (PL_strncmp(uri, kFindProtocol, sizeof(kFindProtocol) - 1)))
+							{
+								nsIRDFResource	*property = nsnull;
+								if (NS_SUCCEEDED(rv = gRDFService->GetResource(tokens[1].value, &property)) &&
+									(rv != NS_RDF_NO_VALUE) && (nsnull != property))
+								{
+									nsIRDFNode	*value = nsnull;
+									if (NS_SUCCEEDED(rv = datasource->GetTarget(source, property, PR_TRUE, &value)) &&
+										(rv != NS_RDF_NO_VALUE) && (nsnull != value))
+									{
+										nsIRDFLiteral	*literal = nsnull;
+										if (NS_SUCCEEDED(rv = value->QueryInterface(nsIRDFLiteral::GetIID(), (void **)&literal)) &&
+											(rv != NS_RDF_NO_VALUE) && (nsnull != literal))
+										{
+											if (PR_TRUE == doMatch(literal, tokens[2].value, tokens[3].value))
+											{
+												array->AppendElement(source);
+											}
+											NS_RELEASE(literal);
+										}
+									}
+									NS_RELEASE(property);
+								}
+							}
+							NS_RELEASE(source);
+						}
+					}
+				}
+				if (rv == NS_RDF_CURSOR_EMPTY)
+				{
+					rv = NS_OK;
+				}
+				NS_RELEASE(cursor);
+			}
+			NS_RELEASE(datasource);
+		}
+	}
+	/* free values in token list */
+	for (loop=0; tokens[loop].token != NULL; loop++)
+	{
+		if (tokens[loop].value != NULL)
+		{
+			PL_strfree(tokens[loop].value);
+			tokens[loop].value = NULL;
+		}
+	}
+	return(rv);
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::getFindResults(nsIRDFResource *source, nsISimpleEnumerator** aResult)
+{
+	nsresult			rv;
+	nsCOMPtr<nsISupportsArray>	nameArray;
+	rv = NS_NewISupportsArray( getter_AddRefs(nameArray) );
+	if (NS_FAILED(rv)) return rv;
+
+	rv = parseFindURL(source, nameArray);
+	if (NS_FAILED(rv)) return rv;
+
+	nsISimpleEnumerator* result = new nsArrayEnumerator(nameArray);
+	if (! result)
+		return(NS_ERROR_OUT_OF_MEMORY);
+
+	NS_ADDREF(result);
+	*aResult = result;
+
+	return NS_OK;
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::getFindName(nsIRDFResource *source, nsIRDFLiteral** aResult)
+{
+	// XXX construct find URI human-readable name
+	*aResult = nsnull;
+	return(NS_OK);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetTargets(nsIRDFResource *source,
+                           nsIRDFResource *property,
+                           PRBool tv,
+                           nsISimpleEnumerator **targets /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(targets != nsnull, "null ptr");
+	if (! targets)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv = NS_ERROR_FAILURE;
+
+	// we only have positive assertions in the find data source.
+	if (! tv)
+		return rv;
+
+	if (isFindURI(source))
+	{
+		if (property == kNC_Child)
+		{
+			return getFindResults(source, targets);
+		}
+		else if (property == kNC_Name)
+		{
+			nsCOMPtr<nsIRDFLiteral>	name;
+			rv = getFindName(source, getter_AddRefs(name));
+			if (NS_FAILED(rv)) return rv;
+
+			nsISimpleEnumerator* result =
+			new nsSingletonEnumerator(name);
+
+			if (! result)
+				return NS_ERROR_OUT_OF_MEMORY;
+
+			NS_ADDREF(result);
+			*targets = result;
+			return NS_OK;
+		}
+		else if (property == kRDF_type)
+		{
+			nsXPIDLCString	uri;
+			rv = kNC_FindObject->GetValue( getter_Copies(uri) );
+			if (NS_FAILED(rv)) return rv;
+
+			nsAutoString	url(uri);
+			nsIRDFLiteral	*literal;
+			rv = gRDFService->GetLiteral(url.GetUnicode(), &literal);
+			if (NS_FAILED(rv)) return rv;
+
+			nsISimpleEnumerator* result = new nsSingletonEnumerator(literal);
+
+			NS_RELEASE(literal);
+
+			if (! result)
+				return NS_ERROR_OUT_OF_MEMORY;
+
+			NS_ADDREF(result);
+			*targets = result;
+			return NS_OK;
+		}
+		else if (property == kNC_pulse)
+		{
+			nsAutoString	pulse("15");
+			nsIRDFLiteral	*pulseLiteral;
+			rv = gRDFService->GetLiteral(pulse.GetUnicode(), &pulseLiteral);
+			if (NS_FAILED(rv)) return rv;
+
+			nsISimpleEnumerator* result = new nsSingletonEnumerator(pulseLiteral);
+
+			NS_RELEASE(pulseLiteral);
+
+			if (! result)
+				return NS_ERROR_OUT_OF_MEMORY;
+
+			NS_ADDREF(result);
+			*targets = result;
+			return NS_OK;
+		}
+	}
+
+	return NS_NewEmptyEnumerator(targets);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Assert(nsIRDFResource *source,
+                       nsIRDFResource *property,
+                       nsIRDFNode *target,
+                       PRBool tv)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Unassert(nsIRDFResource *source,
+                         nsIRDFResource *property,
+                         nsIRDFNode *target)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Change(nsIRDFResource* aSource,
+                       nsIRDFResource* aProperty,
+                       nsIRDFNode* aOldTarget,
+                       nsIRDFNode* aNewTarget)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Move(nsIRDFResource* aOldSource,
+                     nsIRDFResource* aNewSource,
+                     nsIRDFResource* aProperty,
+                     nsIRDFNode* aTarget)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::HasAssertion(nsIRDFResource *source,
+                             nsIRDFResource *property,
+                             nsIRDFNode *target,
+                             PRBool tv,
+                             PRBool *hasAssertion /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(target != nsnull, "null ptr");
+	if (! target)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(hasAssertion != nsnull, "null ptr");
+	if (! hasAssertion)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv = NS_OK;
+
+	*hasAssertion = PR_FALSE;
+
+	// we only have positive assertions in the find data source.
+	if (! tv)
+		return rv;
+
+	if (isFindURI(source))
+	{
+		if (property == kRDF_type)
+		{
+			if ((nsIRDFResource *)target == kRDF_type)
+			{
+				*hasAssertion = PR_TRUE;
+			}
+		}
+	}
+	return (rv);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::ArcLabelsIn(nsIRDFNode *node,
+                            nsISimpleEnumerator ** labels /* out */)
+{
+	NS_NOTYETIMPLEMENTED("write me");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::ArcLabelsOut(nsIRDFResource *source,
+                             nsISimpleEnumerator **labels /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(labels != nsnull, "null ptr");
+	if (! labels)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv;
+
+	if (isFindURI(source))
+	{
+		nsCOMPtr<nsISupportsArray> array;
+		rv = NS_NewISupportsArray( getter_AddRefs(array) );
+		if (NS_FAILED(rv)) return rv;
+
+		array->AppendElement(kNC_Child);
+		array->AppendElement(kNC_pulse);
+
+		nsISimpleEnumerator* result = new nsArrayEnumerator(array);
+		if (! result)
+			return NS_ERROR_OUT_OF_MEMORY;
+
+		NS_ADDREF(result);
+		*labels = result;
+		return(NS_OK);
+	}
+	return(NS_NewEmptyEnumerator(labels));
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetAllResources(nsISimpleEnumerator** aCursor)
+{
+	NS_NOTYETIMPLEMENTED("sorry!");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::AddObserver(nsIRDFObserver *n)
+{
+	NS_PRECONDITION(n != nsnull, "null ptr");
+	if (! n)
+		return NS_ERROR_NULL_POINTER;
+
+	if (! mObservers)
+	{
+		nsresult	rv;
+		rv = NS_NewISupportsArray(getter_AddRefs(mObservers));
+		if (NS_FAILED(rv)) return rv;
+	}
+	return mObservers->AppendElement(n) ? NS_OK : NS_ERROR_FAILURE;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::RemoveObserver(nsIRDFObserver *n)
+{
+	NS_PRECONDITION(n != nsnull, "null ptr");
+	if (! n)
+		return NS_ERROR_NULL_POINTER;
+
+	if (! mObservers)
+		return(NS_OK);
+
+	NS_VERIFY(mObservers->RemoveElement(n), "observer not present");
+	return(NS_OK);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetAllCommands(nsIRDFResource* source,nsIEnumerator/*<nsIRDFResource>*/** commands)
+{
+	NS_NOTYETIMPLEMENTED("write me!");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
+{
+	return(NS_NewEmptyEnumerator(commands));
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments,
+                                PRBool* aResult)
+{
+	return(NS_ERROR_NOT_IMPLEMENTED);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments)
+{
+	return(NS_ERROR_NOT_IMPLEMENTED);
+}
+
+
+
+nsresult
+NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult)
+{
+	NS_PRECONDITION(aResult != nsnull, "null ptr");
+	if (! aResult)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(aOuter == nsnull, "no aggregation");
+	if (aOuter)
+		return NS_ERROR_NO_AGGREGATION;
+
+	nsresult rv = NS_OK;
+
+	LocalSearchDataSource* result = new LocalSearchDataSource();
+	if (! result)
+		return NS_ERROR_OUT_OF_MEMORY;
+
+	rv = result->Init();
+	if (NS_SUCCEEDED(rv))
+		rv = result->QueryInterface(aIID, aResult);
+
+	if (NS_FAILED(rv)) {
+		delete result;
+		*aResult = nsnull;
+		return rv;
+	}
+
+	return rv;
+}

xpfe/components/search/macbuild/SearchPrefix.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
+#define _IMPL_NS_APPSHELL
+
+#include "MacSharedPrefix.h"

xpfe/components/search/macbuild/SearchPrefix_debug.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
+#define _IMPL_NS_APPSHELL
+
+#include "MacSharedPrefix_debug.h"

xpfe/components/search/public/nsISearchService.idl

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  The Browser Search service
+
+*/
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(1222e6f0-a5e3-11d2-8b7c-00805f8a7db6)]
+interface nsILocalSearchService : nsISupports
+{
+};
+
+[scriptable, uuid(6bd1d803-1c67-11d3-9820-ed1b357eb3c4)]
+interface nsInternetSearchService : nsISupports
+{
+};
+
+%{C++
+
+#define NS_IINTERNETSEARCHDATASOURCECALLBACK_IID \
+{ 0x88774583, 0x1edd, 0x11d3, { 0x98, 0x20, 0xbf, 0x1b, 0xe7, 0x7e, 0x61, 0xc4 } }
+
+#define NS_IINTERNETSEARCHDATAOURCE_IID \
+{ 0x6bd1d803, 0x1c67, 0x11d3, { 0x98, 0x20, 0xed, 0x1b, 0x35, 0x7e, 0xb3, 0xc4 } }
+
+#define NS_ILOCALSEARCHDATASOURCE_IID \
+{ 0x1222e6f0, 0xa5e3, 0x11d2, { 0x8b, 0x7c, 0x00, 0x80, 0x5f, 0x8a, 0x7d, 0xb6 } }
+
+#define NS_LOCALSEARCH_SERVICE_PROGID \
+    "component://netscape/browser/localsearch-service"
+#define NS_LOCALSEARCH_DATASOURCE_PROGID \
+    "component://netscape/rdf/datasource?name=localsearch"
+
+#define NS_INTERNETSEARCH_SERVICE_PROGID \
+    "component://netscape/browser/internetsearch-service"
+#define NS_INTERNETSEARCH_DATASOURCE_PROGID \
+    "component://netscape/rdf/datasource?name=internetsearch"
+
+%}

xpfe/components/search/src/nsLocalSearchService.cpp

@@ -0,0 +1,937 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8; c-file-style: "stroustrup" -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+  Implementation for a find RDF data store.
+ */
+
+#include <ctype.h> // for toupper()
+#include <stdio.h>
+#include "nscore.h"
+#include "nsCOMPtr.h"
+#include "nsIRDFDataSource.h"
+#include "nsIRDFNode.h"
+#include "nsIRDFObserver.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsEnumeratorUtils.h"
+#include "nsString.h"
+#include "nsVoidArray.h"  // XXX introduces dependency on raptorbase
+#include "nsXPIDLString.h"
+#include "nsRDFCID.h"
+//#include "rdfutil.h"
+#include "nsIRDFService.h"
+#include "xp_core.h"
+#include "plhash.h"
+#include "plstr.h"
+#include "prmem.h"
+#include "prprf.h"
+#include "prio.h"
+#include "rdf.h"
+#include "nsISearchService.h"
+
+static NS_DEFINE_CID(kRDFServiceCID,               NS_RDFSERVICE_CID);
+static NS_DEFINE_IID(kISupportsIID,                NS_ISUPPORTS_IID);
+static NS_DEFINE_CID(kRDFInMemoryDataSourceCID,    NS_RDFINMEMORYDATASOURCE_CID);
+
+
+typedef	struct	_findTokenStruct
+{
+	char			*token;
+	char			*value;
+} findTokenStruct, *findTokenPtr;
+
+
+
+class LocalSearchDataSource : public nsILocalSearchService
+{
+private:
+	nsCOMPtr<nsISupportsArray> mObservers;
+
+	static PRInt32		gRefCnt;
+
+    // pseudo-constants
+	static nsIRDFResource	*kNC_Child;
+	static nsIRDFResource	*kNC_Name;
+	static nsIRDFResource	*kNC_URL;
+	static nsIRDFResource	*kNC_FindObject;
+	static nsIRDFResource	*kNC_pulse;
+	static nsIRDFResource	*kRDF_InstanceOf;
+	static nsIRDFResource	*kRDF_type;
+
+friend	NS_IMETHODIMP	NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+
+	NS_METHOD	getFindResults(nsIRDFResource *source, nsISimpleEnumerator** aResult);
+
+	NS_METHOD	getFindName(nsIRDFResource *source, nsIRDFLiteral** aResult);
+
+	NS_METHOD	parseResourceIntoFindTokens(nsIRDFResource *u,
+				findTokenPtr tokens);
+	NS_METHOD	doMatch(nsIRDFLiteral *literal, char *matchMethod,
+				char *matchText);
+	NS_METHOD	parseFindURL(nsIRDFResource *u,
+				nsISupportsArray *array);
+
+public:
+
+	NS_DECL_ISUPPORTS
+
+			LocalSearchDataSource(void);
+	virtual		~LocalSearchDataSource(void);
+
+	nsresult	Init();
+
+	// nsIRDFDataSource methods
+
+	NS_IMETHOD	GetURI(char **uri);
+	NS_IMETHOD	GetSource(nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv,
+				nsIRDFResource **source /* out */);
+	NS_IMETHOD	GetSources(nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv,
+				nsISimpleEnumerator **sources /* out */);
+	NS_IMETHOD	GetTarget(nsIRDFResource *source,
+				nsIRDFResource *property,
+				PRBool tv,
+				nsIRDFNode **target /* out */);
+	NS_IMETHOD	GetTargets(nsIRDFResource *source,
+				nsIRDFResource *property,
+				PRBool tv,
+				nsISimpleEnumerator **targets /* out */);
+	NS_IMETHOD	Assert(nsIRDFResource *source,
+				nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv);
+	NS_IMETHOD	Unassert(nsIRDFResource *source,
+				nsIRDFResource *property,
+				nsIRDFNode *target);
+	NS_IMETHOD	Change(nsIRDFResource* aSource,
+				nsIRDFResource* aProperty,
+				nsIRDFNode* aOldTarget,
+				nsIRDFNode* aNewTarget);
+	NS_IMETHOD	Move(nsIRDFResource* aOldSource,
+				nsIRDFResource* aNewSource,
+				nsIRDFResource* aProperty,
+				nsIRDFNode* aTarget);
+	NS_IMETHOD	HasAssertion(nsIRDFResource *source,
+				nsIRDFResource *property,
+				nsIRDFNode *target,
+				PRBool tv,
+				PRBool *hasAssertion /* out */);
+	NS_IMETHOD	ArcLabelsIn(nsIRDFNode *node,
+				nsISimpleEnumerator **labels /* out */);
+	NS_IMETHOD	ArcLabelsOut(nsIRDFResource *source,
+				nsISimpleEnumerator **labels /* out */);
+	NS_IMETHOD	GetAllResources(nsISimpleEnumerator** aCursor);
+	NS_IMETHOD	AddObserver(nsIRDFObserver *n);
+	NS_IMETHOD	RemoveObserver(nsIRDFObserver *n);
+	NS_IMETHOD	GetAllCommands(nsIRDFResource* source,
+				nsIEnumerator/*<nsIRDFResource>*/** commands);
+	NS_IMETHOD	GetAllCmds(nsIRDFResource* source,
+				nsISimpleEnumerator/*<nsIRDFResource>*/** commands);
+	NS_IMETHOD	IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments,
+                PRBool* aResult);
+	NS_IMETHOD	DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments);
+};
+
+
+
+static	nsIRDFService		*gRDFService = nsnull;
+static	LocalSearchDataSource		*gLocalSearchDataSource = nsnull;
+
+PRInt32 LocalSearchDataSource::gRefCnt;
+
+nsIRDFResource		*LocalSearchDataSource::kNC_Child;
+nsIRDFResource		*LocalSearchDataSource::kNC_Name;
+nsIRDFResource		*LocalSearchDataSource::kNC_URL;
+nsIRDFResource		*LocalSearchDataSource::kNC_FindObject;
+nsIRDFResource		*LocalSearchDataSource::kNC_pulse;
+nsIRDFResource		*LocalSearchDataSource::kRDF_InstanceOf;
+nsIRDFResource		*LocalSearchDataSource::kRDF_type;
+
+static const char	kFindProtocol[] = "find:";
+
+
+
+static PRBool
+isFindURI(nsIRDFResource *r)
+{
+	PRBool		isFindURIFlag = PR_FALSE;
+	const char	*uri = nsnull;
+	
+	r->GetValueConst(&uri);
+	if ((uri) && (!strncmp(uri, kFindProtocol, sizeof(kFindProtocol) - 1)))
+	{
+		isFindURIFlag = PR_TRUE;
+	}
+	return(isFindURIFlag);
+}
+
+
+
+LocalSearchDataSource::LocalSearchDataSource(void)
+{
+	NS_INIT_REFCNT();
+
+	if (gRefCnt++ == 0)
+	{
+		nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
+		                           nsIRDFService::GetIID(),
+		                           (nsISupports**) &gRDFService);
+
+		PR_ASSERT(NS_SUCCEEDED(rv));
+
+		gRDFService->GetResource(NC_NAMESPACE_URI "child",       &kNC_Child);
+		gRDFService->GetResource(NC_NAMESPACE_URI "Name",        &kNC_Name);
+		gRDFService->GetResource(NC_NAMESPACE_URI "URL",         &kNC_URL);
+		gRDFService->GetResource(NC_NAMESPACE_URI "FindObject",  &kNC_FindObject);
+		gRDFService->GetResource(NC_NAMESPACE_URI "pulse",       &kNC_pulse);
+
+		gRDFService->GetResource(RDF_NAMESPACE_URI "instanceOf", &kRDF_InstanceOf);
+		gRDFService->GetResource(RDF_NAMESPACE_URI "type",       &kRDF_type);
+
+		gLocalSearchDataSource = this;
+	}
+}
+
+
+
+LocalSearchDataSource::~LocalSearchDataSource (void)
+{
+	if (--gRefCnt == 0)
+	{
+		NS_RELEASE(kNC_Child);
+		NS_RELEASE(kNC_Name);
+		NS_RELEASE(kNC_URL);
+		NS_RELEASE(kNC_FindObject);
+		NS_RELEASE(kNC_pulse);
+		NS_RELEASE(kRDF_InstanceOf);
+		NS_RELEASE(kRDF_type);
+
+		gLocalSearchDataSource = nsnull;
+		nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
+		gRDFService = nsnull;
+	}
+}
+
+
+
+nsresult
+LocalSearchDataSource::Init()
+{
+	nsresult	rv = NS_ERROR_OUT_OF_MEMORY;
+
+#if 0
+	// register this as a named data source with the service manager
+	if (NS_FAILED(rv = gRDFService->RegisterDataSource(this, PR_FALSE)))
+		return(rv);
+#endif
+
+	return(rv);
+}
+
+
+
+NS_IMPL_ISUPPORTS(LocalSearchDataSource, nsIRDFDataSource::GetIID());
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetURI(char **uri)
+{
+	NS_PRECONDITION(uri != nsnull, "null ptr");
+	if (! uri)
+		return NS_ERROR_NULL_POINTER;
+
+	if ((*uri = nsXPIDLCString::Copy("rdf:find")) == nsnull)
+		return NS_ERROR_OUT_OF_MEMORY;
+
+	return NS_OK;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetSource(nsIRDFResource* property,
+                          nsIRDFNode* target,
+                          PRBool tv,
+                          nsIRDFResource** source /* out */)
+{
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(target != nsnull, "null ptr");
+	if (! target)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	*source = nsnull;
+	return NS_RDF_NO_VALUE;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetSources(nsIRDFResource *property,
+                           nsIRDFNode *target,
+			   PRBool tv,
+                           nsISimpleEnumerator **sources /* out */)
+{
+	NS_NOTYETIMPLEMENTED("write me");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetTarget(nsIRDFResource *source,
+                          nsIRDFResource *property,
+                          PRBool tv,
+                          nsIRDFNode **target /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(target != nsnull, "null ptr");
+	if (! target)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv = NS_RDF_NO_VALUE;
+
+	// we only have positive assertions in the find data source.
+	if (! tv)
+		return rv;
+
+	if (isFindURI(source))
+	{
+		if (property == kNC_Name)
+		{
+//			rv = GetName(source, &array);
+		}
+		else if (property == kNC_URL)
+		{
+			// note: lie and say there is no URL
+//			rv = GetURL(source, &array);
+			nsAutoString	url("");
+			nsIRDFLiteral	*literal;
+			gRDFService->GetLiteral(url.GetUnicode(), &literal);
+			*target = literal;
+			rv = NS_OK;
+		}
+		else if (property == kRDF_type)
+		{
+			const char	*uri = nsnull;
+			rv = kNC_FindObject->GetValueConst(&uri);
+			if (NS_FAILED(rv)) return rv;
+
+			nsAutoString	url(uri);
+			nsIRDFLiteral	*literal;
+			gRDFService->GetLiteral(url.GetUnicode(), &literal);
+
+			*target = literal;
+			return NS_OK;
+		}
+		else if (property == kNC_pulse)
+		{
+			nsAutoString	pulse("15");
+			nsIRDFLiteral	*pulseLiteral;
+			rv = gRDFService->GetLiteral(pulse.GetUnicode(), &pulseLiteral);
+			if (NS_FAILED(rv)) return rv;
+
+			*target = pulseLiteral;
+			return NS_OK;
+		}
+	}
+	return NS_RDF_NO_VALUE;
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::parseResourceIntoFindTokens(nsIRDFResource *u, findTokenPtr tokens)
+{
+	const char		*uri = nsnull;
+	char			*id, *token, *value;
+	int			loop;
+	nsresult		rv;
+
+	if (NS_FAILED(rv = u->GetValueConst(&uri)))	return(rv);
+
+#ifdef	DEBUG
+	printf("Find: %s\n", (const char*) uri);
+#endif
+
+	if (!(id = PL_strdup(uri + sizeof(kFindProtocol) - 1)))
+		return(NS_ERROR_OUT_OF_MEMORY);
+
+	/* parse ID, build up token list */
+	if ((token = strtok(id, "&")) != NULL)
+	{
+		while (token != NULL)
+		{
+			if ((value = strstr(token, "=")) != NULL)
+			{
+				*value++ = '\0';
+			}
+			for (loop=0; tokens[loop].token != NULL; loop++)
+			{
+				if (!strcmp(token, tokens[loop].token))
+				{
+					tokens[loop].value = PL_strdup(value);
+					break;
+				}
+			}
+			token = strtok(NULL, "&");
+		}
+	}
+	PL_strfree(id);
+	return(NS_OK);
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::doMatch(nsIRDFLiteral *literal, char *matchMethod, char *matchText)
+{
+	PRBool		found = PR_FALSE;
+
+	if ((nsnull == literal) || (nsnull == matchMethod) || (nsnull == matchText))
+		return(found);
+
+        nsXPIDLString	str;
+	literal->GetValue( getter_Copies(str) );
+	if (! str)	return(found);
+	nsAutoString	value(str);
+
+	if (!PL_strcmp(matchMethod, "contains"))
+	{
+		if (value.Find(matchText, PR_TRUE) >= 0)
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "startswith"))
+	{
+		if (value.Find(matchText, PR_TRUE) == 0)
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "endswith"))
+	{
+		PRInt32 pos = value.RFind(matchText, PR_TRUE);
+		if ((pos >= 0) && (pos == (value.Length() - PRInt32(strlen(matchText)))))
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "is"))
+	{
+		if (value.EqualsIgnoreCase(matchText))
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "isnot"))
+	{
+		if (!value.EqualsIgnoreCase(matchText))
+			found = PR_TRUE;
+	}
+	else if (!PL_strcmp(matchMethod, "doesntcontain"))
+	{
+		if (value.Find(matchText, PR_TRUE) < 0)
+			found = PR_TRUE;
+	}
+	return(found);
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::parseFindURL(nsIRDFResource *u, nsISupportsArray *array)
+{
+	findTokenStruct		tokens[5];
+	nsresult		rv;
+	int			loop;
+
+	/* build up a token list */
+	tokens[0].token = "datasource";		tokens[0].value = NULL;
+	tokens[1].token = "match";		tokens[1].value = NULL;
+	tokens[2].token = "method";		tokens[2].value = NULL;
+	tokens[3].token = "text";		tokens[3].value = NULL;
+	tokens[4].token = NULL;			tokens[4].value = NULL;
+
+	// parse find URI, get parameters, search in appropriate datasource(s), return results
+	if (NS_SUCCEEDED(rv = parseResourceIntoFindTokens(u, tokens)))
+	{
+		nsIRDFDataSource	*datasource;
+		if (NS_SUCCEEDED(rv = gRDFService->GetDataSource(tokens[0].value, &datasource)))
+		{
+			nsISimpleEnumerator	*cursor = nsnull;
+			if (NS_SUCCEEDED(rv = datasource->GetAllResources(&cursor)))
+			{
+				while (1) 
+				{
+					PRBool hasMore;
+					rv = cursor->HasMoreElements(&hasMore);
+					if (NS_FAILED(rv))
+						break;
+
+					if (! hasMore)
+						break;
+
+					nsCOMPtr<nsISupports> isupports;
+					rv = cursor->GetNext(getter_AddRefs(isupports));
+					if (NS_SUCCEEDED(rv))
+					{
+						nsIRDFResource	*source = nsnull;
+						if (NS_SUCCEEDED(rv = isupports->QueryInterface(nsIRDFResource::GetIID(), (void **)&source)))
+						{
+							const char	*uri = nsnull;
+							source->GetValueConst(&uri);
+
+							// never match against a "find:" URI
+							if ((uri) && (PL_strncmp(uri, kFindProtocol, sizeof(kFindProtocol) - 1)))
+							{
+								nsIRDFResource	*property = nsnull;
+								if (NS_SUCCEEDED(rv = gRDFService->GetResource(tokens[1].value, &property)) &&
+									(rv != NS_RDF_NO_VALUE) && (nsnull != property))
+								{
+									nsIRDFNode	*value = nsnull;
+									if (NS_SUCCEEDED(rv = datasource->GetTarget(source, property, PR_TRUE, &value)) &&
+										(rv != NS_RDF_NO_VALUE) && (nsnull != value))
+									{
+										nsIRDFLiteral	*literal = nsnull;
+										if (NS_SUCCEEDED(rv = value->QueryInterface(nsIRDFLiteral::GetIID(), (void **)&literal)) &&
+											(rv != NS_RDF_NO_VALUE) && (nsnull != literal))
+										{
+											if (PR_TRUE == doMatch(literal, tokens[2].value, tokens[3].value))
+											{
+												array->AppendElement(source);
+											}
+											NS_RELEASE(literal);
+										}
+									}
+									NS_RELEASE(property);
+								}
+							}
+							NS_RELEASE(source);
+						}
+					}
+				}
+				if (rv == NS_RDF_CURSOR_EMPTY)
+				{
+					rv = NS_OK;
+				}
+				NS_RELEASE(cursor);
+			}
+			NS_RELEASE(datasource);
+		}
+	}
+	/* free values in token list */
+	for (loop=0; tokens[loop].token != NULL; loop++)
+	{
+		if (tokens[loop].value != NULL)
+		{
+			PL_strfree(tokens[loop].value);
+			tokens[loop].value = NULL;
+		}
+	}
+	return(rv);
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::getFindResults(nsIRDFResource *source, nsISimpleEnumerator** aResult)
+{
+	nsresult			rv;
+	nsCOMPtr<nsISupportsArray>	nameArray;
+	rv = NS_NewISupportsArray( getter_AddRefs(nameArray) );
+	if (NS_FAILED(rv)) return rv;
+
+	rv = parseFindURL(source, nameArray);
+	if (NS_FAILED(rv)) return rv;
+
+	nsISimpleEnumerator* result = new nsArrayEnumerator(nameArray);
+	if (! result)
+		return(NS_ERROR_OUT_OF_MEMORY);
+
+	NS_ADDREF(result);
+	*aResult = result;
+
+	return NS_OK;
+}
+
+
+
+NS_METHOD
+LocalSearchDataSource::getFindName(nsIRDFResource *source, nsIRDFLiteral** aResult)
+{
+	// XXX construct find URI human-readable name
+	*aResult = nsnull;
+	return(NS_OK);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetTargets(nsIRDFResource *source,
+                           nsIRDFResource *property,
+                           PRBool tv,
+                           nsISimpleEnumerator **targets /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(targets != nsnull, "null ptr");
+	if (! targets)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv = NS_ERROR_FAILURE;
+
+	// we only have positive assertions in the find data source.
+	if (! tv)
+		return rv;
+
+	if (isFindURI(source))
+	{
+		if (property == kNC_Child)
+		{
+			return getFindResults(source, targets);
+		}
+		else if (property == kNC_Name)
+		{
+			nsCOMPtr<nsIRDFLiteral>	name;
+			rv = getFindName(source, getter_AddRefs(name));
+			if (NS_FAILED(rv)) return rv;
+
+			nsISimpleEnumerator* result =
+			new nsSingletonEnumerator(name);
+
+			if (! result)
+				return NS_ERROR_OUT_OF_MEMORY;
+
+			NS_ADDREF(result);
+			*targets = result;
+			return NS_OK;
+		}
+		else if (property == kRDF_type)
+		{
+			nsXPIDLCString	uri;
+			rv = kNC_FindObject->GetValue( getter_Copies(uri) );
+			if (NS_FAILED(rv)) return rv;
+
+			nsAutoString	url(uri);
+			nsIRDFLiteral	*literal;
+			rv = gRDFService->GetLiteral(url.GetUnicode(), &literal);
+			if (NS_FAILED(rv)) return rv;
+
+			nsISimpleEnumerator* result = new nsSingletonEnumerator(literal);
+
+			NS_RELEASE(literal);
+
+			if (! result)
+				return NS_ERROR_OUT_OF_MEMORY;
+
+			NS_ADDREF(result);
+			*targets = result;
+			return NS_OK;
+		}
+		else if (property == kNC_pulse)
+		{
+			nsAutoString	pulse("15");
+			nsIRDFLiteral	*pulseLiteral;
+			rv = gRDFService->GetLiteral(pulse.GetUnicode(), &pulseLiteral);
+			if (NS_FAILED(rv)) return rv;
+
+			nsISimpleEnumerator* result = new nsSingletonEnumerator(pulseLiteral);
+
+			NS_RELEASE(pulseLiteral);
+
+			if (! result)
+				return NS_ERROR_OUT_OF_MEMORY;
+
+			NS_ADDREF(result);
+			*targets = result;
+			return NS_OK;
+		}
+	}
+
+	return NS_NewEmptyEnumerator(targets);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Assert(nsIRDFResource *source,
+                       nsIRDFResource *property,
+                       nsIRDFNode *target,
+                       PRBool tv)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Unassert(nsIRDFResource *source,
+                         nsIRDFResource *property,
+                         nsIRDFNode *target)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Change(nsIRDFResource* aSource,
+                       nsIRDFResource* aProperty,
+                       nsIRDFNode* aOldTarget,
+                       nsIRDFNode* aNewTarget)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::Move(nsIRDFResource* aOldSource,
+                     nsIRDFResource* aNewSource,
+                     nsIRDFResource* aProperty,
+                     nsIRDFNode* aTarget)
+{
+	return NS_RDF_ASSERTION_REJECTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::HasAssertion(nsIRDFResource *source,
+                             nsIRDFResource *property,
+                             nsIRDFNode *target,
+                             PRBool tv,
+                             PRBool *hasAssertion /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(property != nsnull, "null ptr");
+	if (! property)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(target != nsnull, "null ptr");
+	if (! target)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(hasAssertion != nsnull, "null ptr");
+	if (! hasAssertion)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv = NS_OK;
+
+	*hasAssertion = PR_FALSE;
+
+	// we only have positive assertions in the find data source.
+	if (! tv)
+		return rv;
+
+	if (isFindURI(source))
+	{
+		if (property == kRDF_type)
+		{
+			if ((nsIRDFResource *)target == kRDF_type)
+			{
+				*hasAssertion = PR_TRUE;
+			}
+		}
+	}
+	return (rv);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::ArcLabelsIn(nsIRDFNode *node,
+                            nsISimpleEnumerator ** labels /* out */)
+{
+	NS_NOTYETIMPLEMENTED("write me");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::ArcLabelsOut(nsIRDFResource *source,
+                             nsISimpleEnumerator **labels /* out */)
+{
+	NS_PRECONDITION(source != nsnull, "null ptr");
+	if (! source)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(labels != nsnull, "null ptr");
+	if (! labels)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult		rv;
+
+	if (isFindURI(source))
+	{
+		nsCOMPtr<nsISupportsArray> array;
+		rv = NS_NewISupportsArray( getter_AddRefs(array) );
+		if (NS_FAILED(rv)) return rv;
+
+		array->AppendElement(kNC_Child);
+		array->AppendElement(kNC_pulse);
+
+		nsISimpleEnumerator* result = new nsArrayEnumerator(array);
+		if (! result)
+			return NS_ERROR_OUT_OF_MEMORY;
+
+		NS_ADDREF(result);
+		*labels = result;
+		return(NS_OK);
+	}
+	return(NS_NewEmptyEnumerator(labels));
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetAllResources(nsISimpleEnumerator** aCursor)
+{
+	NS_NOTYETIMPLEMENTED("sorry!");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::AddObserver(nsIRDFObserver *n)
+{
+	NS_PRECONDITION(n != nsnull, "null ptr");
+	if (! n)
+		return NS_ERROR_NULL_POINTER;
+
+	if (! mObservers)
+	{
+		nsresult	rv;
+		rv = NS_NewISupportsArray(getter_AddRefs(mObservers));
+		if (NS_FAILED(rv)) return rv;
+	}
+	return mObservers->AppendElement(n) ? NS_OK : NS_ERROR_FAILURE;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::RemoveObserver(nsIRDFObserver *n)
+{
+	NS_PRECONDITION(n != nsnull, "null ptr");
+	if (! n)
+		return NS_ERROR_NULL_POINTER;
+
+	if (! mObservers)
+		return(NS_OK);
+
+	NS_VERIFY(mObservers->RemoveElement(n), "observer not present");
+	return(NS_OK);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetAllCommands(nsIRDFResource* source,nsIEnumerator/*<nsIRDFResource>*/** commands)
+{
+	NS_NOTYETIMPLEMENTED("write me!");
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
+{
+	return(NS_NewEmptyEnumerator(commands));
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments,
+                                PRBool* aResult)
+{
+	return(NS_ERROR_NOT_IMPLEMENTED);
+}
+
+
+
+NS_IMETHODIMP
+LocalSearchDataSource::DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				nsIRDFResource*   aCommand,
+				nsISupportsArray/*<nsIRDFResource>*/* aArguments)
+{
+	return(NS_ERROR_NOT_IMPLEMENTED);
+}
+
+
+
+nsresult
+NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult)
+{
+	NS_PRECONDITION(aResult != nsnull, "null ptr");
+	if (! aResult)
+		return NS_ERROR_NULL_POINTER;
+
+	NS_PRECONDITION(aOuter == nsnull, "no aggregation");
+	if (aOuter)
+		return NS_ERROR_NO_AGGREGATION;
+
+	nsresult rv = NS_OK;
+
+	LocalSearchDataSource* result = new LocalSearchDataSource();
+	if (! result)
+		return NS_ERROR_OUT_OF_MEMORY;
+
+	rv = result->Init();
+	if (NS_SUCCEEDED(rv))
+		rv = result->QueryInterface(aIID, aResult);
+
+	if (NS_FAILED(rv)) {
+		delete result;
+		*aResult = nsnull;
+		return rv;
+	}
+
+	return rv;
+}

xpfe/components/search/src/nsRegisterSearch.cpp

@@ -0,0 +1,137 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8; c-file-style: "stroustrup" -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsRDFCID.h"
+#include "nscore.h"
+#include "nsCOMPtr.h"
+#include "nsIFactory.h"
+#include "nsIGenericFactory.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIRDFDataSource.h"
+#include "nsISearchService.h"
+
+static NS_DEFINE_CID(kLocalSearchServiceCID,         NS_RDFFINDDATASOURCE_CID);
+static NS_DEFINE_CID(kInternetSearchServiceCID,      NS_RDFSEARCHDATASOURCE_CID);
+static NS_DEFINE_CID(kComponentManagerCID,           NS_COMPONENTMANAGER_CID);
+static NS_DEFINE_CID(kGenericFactoryCID,             NS_GENERICFACTORY_CID);
+
+nsresult	NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+nsresult	NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Component Exports
+
+
+
+extern "C" PR_IMPLEMENT(nsresult)
+NSGetFactory(nsISupports* aServiceMgr,
+             const nsCID &aClass,
+             const char *aClassName,
+             const char *aProgID,
+             nsIFactory **aFactory)
+{
+	NS_PRECONDITION(aFactory != nsnull, "null ptr");
+	if (! aFactory)
+		return NS_ERROR_NULL_POINTER;
+
+	nsIGenericFactory::ConstructorProcPtr constructor;
+
+	if (aClass.Equals(kInternetSearchServiceCID)) {
+		constructor = NS_NewInternetSearchService;
+	}
+	else if (aClass.Equals(kLocalSearchServiceCID)) {
+		constructor = NS_NewLocalSearchService;
+	}
+	else {
+		*aFactory = nsnull;
+		return NS_NOINTERFACE; // XXX
+	}
+
+	nsresult rv;
+	NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServiceMgr, kComponentManagerCID, &rv);
+	if (NS_FAILED(rv)) return rv;
+
+	nsCOMPtr<nsIGenericFactory> factory;
+	rv = compMgr->CreateInstance(kGenericFactoryCID,
+				     nsnull,
+				     nsIGenericFactory::GetIID(),
+				     getter_AddRefs(factory));
+
+	if (NS_FAILED(rv)) return rv;
+
+	rv = factory->SetConstructor(constructor);
+	if (NS_FAILED(rv)) return rv;
+
+	*aFactory = factory;
+	NS_ADDREF(*aFactory);
+	return NS_OK;
+}
+
+
+
+extern "C" PR_IMPLEMENT(nsresult)
+NSRegisterSelf(nsISupports* aServMgr , const char* aPath)
+{
+	nsresult rv;
+
+	nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
+	if (NS_FAILED(rv)) return rv;
+
+	NS_WITH_SERVICE1(nsIComponentManager, compMgr, servMgr, kComponentManagerCID, &rv);
+	if (NS_FAILED(rv)) return rv;
+
+	rv = compMgr->RegisterComponent(kLocalSearchServiceCID, "LocalSearch",
+					NS_LOCALSEARCH_SERVICE_PROGID,
+					aPath, PR_TRUE, PR_TRUE);
+
+	rv = compMgr->RegisterComponent(kLocalSearchServiceCID, "LocalSearch",
+					NS_LOCALSEARCH_DATASOURCE_PROGID,
+					aPath, PR_TRUE, PR_TRUE);
+
+	rv = compMgr->RegisterComponent(kInternetSearchServiceCID, "InternetSearch",
+					NS_INTERNETSEARCH_SERVICE_PROGID,
+					aPath, PR_TRUE, PR_TRUE);
+
+	rv = compMgr->RegisterComponent(kInternetSearchServiceCID, "InternetSearch",
+					NS_INTERNETSEARCH_DATASOURCE_PROGID,
+					aPath, PR_TRUE, PR_TRUE);
+
+	return NS_OK;
+}
+
+
+
+extern "C" PR_IMPLEMENT(nsresult)
+NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
+{
+	nsresult rv;
+
+	nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
+	if (NS_FAILED(rv)) return rv;
+
+	NS_WITH_SERVICE1(nsIComponentManager, compMgr, servMgr, kComponentManagerCID, &rv);
+	if (NS_FAILED(rv)) return rv;
+
+	rv = compMgr->UnregisterComponent(kLocalSearchServiceCID, aPath);
+	rv = compMgr->UnregisterComponent(kInternetSearchServiceCID, aPath);
+
+	return NS_OK;
+}