header for updated datasource (also not part of build)

mailnews/base/search/src/makefile.win

@@ -29,21 +29,6 @@ MODULE=msgsearch
 
 DEFINES=-D_IMPL_NS_HTML
 
-CPPSRCS=    nsMsgFilterService.cpp\
-			nsMsgFilterList.cpp\
-			nsMsgFilter.cpp\
-			nsMsgSearchTerm.cpp\
-			nsMsgBodyHandler.cpp\
-			nsMsgLocalSearch.cpp\
-			nsMsgSearchAdapter.cpp\
-			nsMsgSearchSession.cpp\
-			nsMsgSearchValue.cpp \
-			nsMsgImapSearch.cpp\
-			nsMsgSearchNews.cpp \
-			nsMsgFilterDataSource.cpp \
-			nsMsgFilterDelegateFactory.cpp \
-			$(NULL)
-
 CPP_OBJS=   .\$(OBJDIR)\nsMsgFilterService.obj  \
 			.\$(OBJDIR)\nsMsgFilterList.obj\
 			.\$(OBJDIR)\nsMsgFilter.obj\
@@ -55,15 +40,17 @@ CPP_OBJS=   .\$(OBJDIR)\nsMsgFilterService.obj  \
 			.\$(OBJDIR)\nsMsgSearchSession.obj\
 			.\$(OBJDIR)\nsMsgSearchAdapter.obj\
 			.\$(OBJDIR)\nsMsgSearchValue.obj \
+			.\$(OBJDIR)\nsMsgSearchDataSource.obj \
 			.\$(OBJDIR)\nsMsgFilterDataSource.obj \
 			.\$(OBJDIR)\nsMsgFilterDelegateFactory.obj \
 			$(NULL)
 
 
-EXPORTS=	nsMsgFilterService.h\
-			nsMsgSearchSession.h\
-		nsMsgFilterDataSource.h \
-		nsMsgFilterDelegateFactory.h \
+EXPORTS=	nsMsgFilterService.h \
+			nsMsgSearchSession.h \
+			nsMsgFilterDataSource.h \
+			nsMsgFilterDelegateFactory.h \
+			nsMsgSearchDataSource.h \
 			$(NULL)
 
 

mailnews/base/search/src/nsMsgSearchDataSource.h

@@ -25,36 +25,40 @@
 #include "nsIRDFResource.h"
 #include "nsIMsgSearchHitNotify.h"
 #include "nsISupportsArray.h"
-
+#include "nsIMsgSearchSession.h"
 
 #include "nsCOMPtr.h"
 
 class nsMsgSearchDataSource : public nsMsgRDFDataSource,
                               public nsIMsgSearchHitNotify
 {
- public:
-  nsMsgSearchDataSource();
-  virtual ~nsMsgSearchDataSource();
+public:
+    nsMsgSearchDataSource();
+    virtual ~nsMsgSearchDataSource();
 
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIRDFDATASOURCE
-  NS_DECL_NSIMSGSEARCHHITNOTIFY
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIMSGSEARCHHITNOTIFY
 
-  nsresult Init();
+    NS_IMETHOD GetURI(char **aResult);
+    NS_IMETHOD GetTargets(nsIRDFResource *aSource,
+                          nsIRDFResource *aProperty,
+                          PRBool aTruthValue,
+                          nsISimpleEnumerator **aResult);
+    NS_IMETHOD HasAssertion(nsIRDFResource *aSource,
+                            nsIRDFResource *aProperty,
+                            nsIRDFNode *aTarget,
+                            PRBool aTruthValue,
+                            PRBool *aResult);
+    
+    NS_IMETHOD ArcLabelsOut(nsIRDFResource *aSource,
+                            nsISimpleEnumerator **aResult);
+    nsresult Init();
 
-  private:
-  nsCOMPtr<nsISupportsArray> mObservers;
-  nsCOMPtr<nsIRDFResource> mSearchRoot;
+private:
+    nsCOMPtr<nsIRDFResource> mSearchRoot;
+    nsCOMPtr<nsIMsgSearchSession> mSearchSession;
 
-  nsresult notifyObserversAssert(nsIRDFResource *aSource,
-                                 nsIRDFResource *aTarget,
-                                 nsIRDFResource *aProperty);
-
-  // nsISupportsArray callback
-  static PRBool notifyAssert(nsISupports* aElement, void *aData);
-
-
-  static nsrefcnt gInstanceCount;
-  static nsCOMPtr<nsIRDFResource> kNC_MessageChild;
+    static nsrefcnt gInstanceCount;
+    static nsCOMPtr<nsIRDFResource> kNC_MessageChild;
   
 };