mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add ClearResultSearchSites() to internetSearchService's IDL, and use IDL macros more for defining public methods.

This commit is contained in:
rjc%netscape.com 1999-09-15 11:08:58 +00:00
Родитель f13d3d026d
Коммит 2502097df0
10 изменённых файлов: 144 добавлений и 100 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
suite/browser/public/nsISearchService.idl
Просмотреть файл

@ -30,8 +30,9 @@ interface nsILocalSearchService : nsISupports
};
[scriptable, uuid(6bd1d803-1c67-11d3-9820-ed1b357eb3c4)]
interface nsInternetSearchService : nsISupports
interface nsIInternetSearchService : nsISupports
{
void ClearResultSearchSites();
};
%{C++

90
suite/browser/src/nsInternetSearchService.cpp
Просмотреть файл

@ -169,6 +169,20 @@ protected:
friend NS_IMETHODIMP NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
// helper methods
PRBool isEngineURI(nsIRDFResource* aResource);
PRBool isSearchURI(nsIRDFResource* aResource);
nsresult BeginSearchRequest(nsIRDFResource *source, PRBool doNetworkRequest);
nsresult DoSearch(nsIRDFResource *source, nsIRDFResource *engine, nsString text);
nsresult GetSearchEngineList(nsFileSpec spec);
nsresult GetSearchFolder(nsFileSpec &spec);
nsresult ReadFileContents(nsFileSpec baseFilename, nsString & sourceContents);
static nsresult GetData(nsString data, char *sectionToFind, char *attribToFind, nsString &value);
nsresult GetInputs(nsString data, nsString text, nsString &input);
nsresult GetURL(nsIRDFResource *source, nsIRDFLiteral** aResult);
PRBool isVisible(const nsNativeFileSpec& file);
public:
friend class InternetSearchDataSourceCallback;
@ -179,6 +193,8 @@ friend class InternetSearchDataSourceCallback;
virtual ~InternetSearchDataSource(void);
nsresult Init();
NS_DECL_NSIINTERNETSEARCHSERVICE
// nsIRDFDataSource methods
NS_IMETHOD GetURI(char **uri);
@ -238,21 +254,6 @@ friend class InternetSearchDataSourceCallback;
NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
nsIRDFResource* aCommand,
nsISupportsArray/*<nsIRDFResource>*/* aArguments);
// helper methods
static PRBool isEngineURI(nsIRDFResource* aResource);
static PRBool isSearchURI(nsIRDFResource* aResource);
static nsresult BeginSearchRequest(nsIRDFResource *source, PRBool doNetworkRequest);
static nsresult DoSearch(nsIRDFResource *source, nsIRDFResource *engine, nsString text);
static nsresult GetSearchEngineList(nsFileSpec spec);
static nsresult GetSearchFolder(nsFileSpec &spec);
static nsresult ReadFileContents(nsFileSpec baseFilename, nsString & sourceContents);
static nsresult GetData(nsString data, char *sectionToFind, char *attribToFind, nsString &value);
static nsresult GetInputs(nsString data, nsString text, nsString &input);
static nsresult GetURL(nsIRDFResource *source, nsIRDFLiteral** aResult);
static PRBool isVisible(const nsNativeFileSpec& file);
};
@ -843,6 +844,38 @@ NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult)
NS_IMETHODIMP
InternetSearchDataSource::ClearResultSearchSites(void)
{
// forget about any previous search sites
if (mInner)
{
nsresult rv;
nsCOMPtr<nsISimpleEnumerator> arcs;
if (NS_SUCCEEDED(rv = mInner->GetTargets(kNC_SearchResultsSitesRoot, kNC_Child, PR_TRUE, getter_AddRefs(arcs))))
{
PRBool hasMore = PR_TRUE;
while (hasMore == PR_TRUE)
{
if (NS_FAILED(arcs->HasMoreElements(&hasMore)) || (hasMore == PR_FALSE))
break;
nsCOMPtr<nsISupports> arc;
if (NS_FAILED(arcs->GetNext(getter_AddRefs(arc))))
break;
nsCOMPtr<nsIRDFResource> child = do_QueryInterface(arc);
if (child)
{
mInner->Unassert(kNC_SearchResultsSitesRoot, kNC_Child, child);
}
}
}
}
return(NS_OK);
}
nsresult
InternetSearchDataSource::BeginSearchRequest(nsIRDFResource *source, PRBool doNetworkRequest)
{
@ -931,30 +964,9 @@ InternetSearchDataSource::BeginSearchRequest(nsIRDFResource *source, PRBool doNe
}
}
#if 0
nsCOMPtr<nsIRDFNode> lastTarget;
if (NS_SUCCEEDED(rv = mInner->GetTarget(kNC_LastSearchRoot, kNC_Ref,
PR_TRUE, getter_AddRefs(lastTarget))))
{
if (rv != NS_RDF_NO_VALUE)
{
rv = mInner->Unassert(kNC_LastSearchRoot, kNC_Ref, lastTarget);
}
}
if (uri.Length() > 0)
{
const PRUnichar *uriUni = uri.GetUnicode();
nsCOMPtr<nsIRDFLiteral> uriLiteral;
if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(uriUni, getter_AddRefs(uriLiteral))))
{
rv = mInner->Assert(kNC_LastSearchRoot, kNC_Ref, uriLiteral, PR_TRUE);
}
}
}
#endif
// forget about any previous search sites
ClearResultSearchSites();
#if 0
if (mInner)
{
nsCOMPtr<nsISimpleEnumerator> arcs;
@ -976,7 +988,7 @@ InternetSearchDataSource::BeginSearchRequest(nsIRDFResource *source, PRBool doNe
}
}
}
#endif
uri.Cut(0, strlen("internetsearch:"));
nsVoidArray *engineArray = new nsVoidArray;

16
suite/browser/src/nsLocalSearchService.cpp
Просмотреть файл

@ -76,16 +76,13 @@ private:
friend NS_IMETHODIMP NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
protected:
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);
NS_METHOD parseResourceIntoFindTokens(nsIRDFResource *u, findTokenPtr tokens);
NS_METHOD doMatch(nsIRDFLiteral *literal, char *matchMethod, char *matchText);
NS_METHOD parseFindURL(nsIRDFResource *u, nsISupportsArray *array);
public:
@ -93,9 +90,10 @@ public:
LocalSearchDataSource(void);
virtual ~LocalSearchDataSource(void);
nsresult Init();
NS_DECL_NSILOCALSEARCHSERVICE
// nsIRDFDataSource methods
NS_IMETHOD GetURI(char **uri);

11
suite/common/search/internetresults.js
Просмотреть файл

@ -1,4 +1,15 @@
function onLoadInternetResults()
{
var isupports = Components.classes["component://netscape/browser/internetsearch-service"].getService();
if (!isupports) return(false);
var internetSearchService = isupports.QueryInterface(Components.interfaces.nsIInternetSearchService);
if (!internetSearchService) return(false);
internetSearchService.ClearResultSearchSites();
dump("Cleared result search sites.\n");
}
function doEngineClick(node)
{
dump("doEngineClick entered.\n");

2
suite/common/search/internetresults.xul
Просмотреть файл

@ -17,7 +17,7 @@
]>
<window style="width:100%; height:100%; background-color:white" align="vertical"
<window style="width:100%; height:100%; background-color:white" align="vertical" onload="onLoadInternetResults()"
xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

3
xpfe/components/search/public/nsISearchService.idl
Просмотреть файл

@ -30,8 +30,9 @@ interface nsILocalSearchService : nsISupports
};
[scriptable, uuid(6bd1d803-1c67-11d3-9820-ed1b357eb3c4)]
interface nsInternetSearchService : nsISupports
interface nsIInternetSearchService : nsISupports
{
void ClearResultSearchSites();
};
%{C++

11
xpfe/components/search/resources/internetresults.js
Просмотреть файл

@ -1,4 +1,15 @@
function onLoadInternetResults()
{
var isupports = Components.classes["component://netscape/browser/internetsearch-service"].getService();
if (!isupports) return(false);
var internetSearchService = isupports.QueryInterface(Components.interfaces.nsIInternetSearchService);
if (!internetSearchService) return(false);
internetSearchService.ClearResultSearchSites();
dump("Cleared result search sites.\n");
}
function doEngineClick(node)
{
dump("doEngineClick entered.\n");

2
xpfe/components/search/resources/internetresults.xul
Просмотреть файл

@ -17,7 +17,7 @@
]>
<window style="width:100%; height:100%; background-color:white" align="vertical"
<window style="width:100%; height:100%; background-color:white" align="vertical" onload="onLoadInternetResults()"
xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

90
xpfe/components/search/src/nsInternetSearchService.cpp
Просмотреть файл

@ -169,6 +169,20 @@ protected:
friend NS_IMETHODIMP NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
// helper methods
PRBool isEngineURI(nsIRDFResource* aResource);
PRBool isSearchURI(nsIRDFResource* aResource);
nsresult BeginSearchRequest(nsIRDFResource *source, PRBool doNetworkRequest);
nsresult DoSearch(nsIRDFResource *source, nsIRDFResource *engine, nsString text);
nsresult GetSearchEngineList(nsFileSpec spec);
nsresult GetSearchFolder(nsFileSpec &spec);
nsresult ReadFileContents(nsFileSpec baseFilename, nsString & sourceContents);
static nsresult GetData(nsString data, char *sectionToFind, char *attribToFind, nsString &value);
nsresult GetInputs(nsString data, nsString text, nsString &input);
nsresult GetURL(nsIRDFResource *source, nsIRDFLiteral** aResult);
PRBool isVisible(const nsNativeFileSpec& file);
public:
friend class InternetSearchDataSourceCallback;
@ -179,6 +193,8 @@ friend class InternetSearchDataSourceCallback;
virtual ~InternetSearchDataSource(void);
nsresult Init();
NS_DECL_NSIINTERNETSEARCHSERVICE
// nsIRDFDataSource methods
NS_IMETHOD GetURI(char **uri);
@ -238,21 +254,6 @@ friend class InternetSearchDataSourceCallback;
NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
nsIRDFResource* aCommand,
nsISupportsArray/*<nsIRDFResource>*/* aArguments);
// helper methods
static PRBool isEngineURI(nsIRDFResource* aResource);
static PRBool isSearchURI(nsIRDFResource* aResource);
static nsresult BeginSearchRequest(nsIRDFResource *source, PRBool doNetworkRequest);
static nsresult DoSearch(nsIRDFResource *source, nsIRDFResource *engine, nsString text);
static nsresult GetSearchEngineList(nsFileSpec spec);
static nsresult GetSearchFolder(nsFileSpec &spec);
static nsresult ReadFileContents(nsFileSpec baseFilename, nsString & sourceContents);
static nsresult GetData(nsString data, char *sectionToFind, char *attribToFind, nsString &value);
static nsresult GetInputs(nsString data, nsString text, nsString &input);
static nsresult GetURL(nsIRDFResource *source, nsIRDFLiteral** aResult);
static PRBool isVisible(const nsNativeFileSpec& file);
};
@ -843,6 +844,38 @@ NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult)
NS_IMETHODIMP
InternetSearchDataSource::ClearResultSearchSites(void)
{
// forget about any previous search sites
if (mInner)
{
nsresult rv;
nsCOMPtr<nsISimpleEnumerator> arcs;
if (NS_SUCCEEDED(rv = mInner->GetTargets(kNC_SearchResultsSitesRoot, kNC_Child, PR_TRUE, getter_AddRefs(arcs))))
{
PRBool hasMore = PR_TRUE;
while (hasMore == PR_TRUE)
{
if (NS_FAILED(arcs->HasMoreElements(&hasMore)) || (hasMore == PR_FALSE))
break;
nsCOMPtr<nsISupports> arc;
if (NS_FAILED(arcs->GetNext(getter_AddRefs(arc))))
break;
nsCOMPtr<nsIRDFResource> child = do_QueryInterface(arc);
if (child)
{
mInner->Unassert(kNC_SearchResultsSitesRoot, kNC_Child, child);
}
}
}
}
return(NS_OK);
}
nsresult
InternetSearchDataSource::BeginSearchRequest(nsIRDFResource *source, PRBool doNetworkRequest)
{
@ -931,30 +964,9 @@ InternetSearchDataSource::BeginSearchRequest(nsIRDFResource *source, PRBool doNe
}
}
#if 0
nsCOMPtr<nsIRDFNode> lastTarget;
if (NS_SUCCEEDED(rv = mInner->GetTarget(kNC_LastSearchRoot, kNC_Ref,
PR_TRUE, getter_AddRefs(lastTarget))))
{
if (rv != NS_RDF_NO_VALUE)
{
rv = mInner->Unassert(kNC_LastSearchRoot, kNC_Ref, lastTarget);
}
}
if (uri.Length() > 0)
{
const PRUnichar *uriUni = uri.GetUnicode();
nsCOMPtr<nsIRDFLiteral> uriLiteral;
if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(uriUni, getter_AddRefs(uriLiteral))))
{
rv = mInner->Assert(kNC_LastSearchRoot, kNC_Ref, uriLiteral, PR_TRUE);
}
}
}
#endif
// forget about any previous search sites
ClearResultSearchSites();
#if 0
if (mInner)
{
nsCOMPtr<nsISimpleEnumerator> arcs;
@ -976,7 +988,7 @@ InternetSearchDataSource::BeginSearchRequest(nsIRDFResource *source, PRBool doNe
}
}
}
#endif
uri.Cut(0, strlen("internetsearch:"));
nsVoidArray *engineArray = new nsVoidArray;

16
xpfe/components/search/src/nsLocalSearchService.cpp
Просмотреть файл

@ -76,16 +76,13 @@ private:
friend NS_IMETHODIMP NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
protected:
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);
NS_METHOD parseResourceIntoFindTokens(nsIRDFResource *u, findTokenPtr tokens);
NS_METHOD doMatch(nsIRDFLiteral *literal, char *matchMethod, char *matchText);
NS_METHOD parseFindURL(nsIRDFResource *u, nsISupportsArray *array);
public:
@ -93,9 +90,10 @@ public:
LocalSearchDataSource(void);
virtual ~LocalSearchDataSource(void);
nsresult Init();
NS_DECL_NSILOCALSEARCHSERVICE
// nsIRDFDataSource methods
NS_IMETHOD GetURI(char **uri);