New search engines and categories. Part of bug # 26334, changes from Netcenter folks, review: me

xpfe/components/search/datasets/MANIFEST

@@ -1,8 +1,4 @@
 category.rdf
-AOLSearch.gif
-AOLSearch.src
-eBay.gif
-eBay.src
 Excite.gif
 Excite.src
 Google.gif
@@ -17,5 +13,35 @@ Lycos.gif
 Lycos.src
 Netscape_Open_Directory.gif
 Netscape_Open_Directory.src
+Netscape_Business.gif
+Netscape_Computing.gif
+Netscape_Computing.src
+Netscape_Entertainment.gif
+Netscape_Entertainment.src
+Netscape_Games.gif
+Netscape_Games.src
+Netscape_Health.gif
+Netscape_Health.src
+Netscape_Music.gif
+Netscape_Music.src
+Netscape_Recreation.gif
+Netscape_Reference.gif
+Netscape_Reference.src
+Netscape_Regional.gif
+Netscape_Regional.src
+Netscape_Relationships.gif
+Netscape_Relationships.src
+Netscape_Shopping.gif
+Netscape_Shopping.src
+Netscape_Society.gif
+Netscape_Society.src
+Netscape_Sports.gif
+Netscape_Travel.gif
+Netscape_Travel.src
+Netscape_World.gif
+Netscape_World.src
+Netscape_Business.src
+Netscape_Recreation.src
+Netscape_Sports.src
 Snap.com.gif
 Snap.com.src

xpfe/components/search/datasets/Makefile.in

@@ -28,10 +28,6 @@ include $(DEPTH)/config/autoconf.mk
 
 FILES		= \
 		category.rdf			\
-		AOLSearch.gif			\
-		AOLSearch.src			\
-		eBay.gif			\
-		eBay.src			\
 		Excite.gif			\
 		Excite.src			\
 		Google.gif			\
@@ -46,6 +42,38 @@ FILES		= \
 		Lycos.src			\
 		Netscape_Open_Directory.gif	\
 		Netscape_Open_Directory.src	\
+		Netscape_Open_Directory.gif	\
+		Netscape_Open_Directory.src	\
+		Netscape_Business.gif		\
+		Netscape_Computing.gif		\
+		Netscape_Computing.src		\
+		Netscape_Entertainment.gif	\
+		Netscape_Entertainment.src	\
+		Netscape_Games.gif		\
+		Netscape_Games.src		\
+		Netscape_Health.gif		\
+		Netscape_Health.src		\
+		Netscape_Music.gif		\
+		Netscape_Music.src		\
+		Netscape_Recreation.gif		\
+		Netscape_Reference.gif		\
+		Netscape_Reference.src		\
+		Netscape_Regional.gif		\
+		Netscape_Regional.src		\
+		Netscape_Relationships.gif	\
+		Netscape_Relationships.src	\
+		Netscape_Shopping.gif		\
+		Netscape_Shopping.src		\
+		Netscape_Society.gif		\
+		Netscape_Society.src		\
+		Netscape_Sports.gif		\
+		Netscape_Travel.gif		\
+		Netscape_Travel.src		\
+		Netscape_World.gif		\
+		Netscape_World.src		\
+		Netscape_Business.src		\
+		Netscape_Recreation.src		\
+		Netscape_Sports.src		\
 		Snap.com.gif			\
 		Snap.com.src			\
 		$(NULL)

xpfe/components/search/datasets/Netscape_Business.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Business"
+     description = "Netscape Search - Business"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Business&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Computing.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Computing"
+     description = "Netscape Search - Computing"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Computers&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Entertainment.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Entertainment"
+     description = "Netscape Search - Entertainment"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Arts&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Games.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Games"
+     description = "Netscape Search - Games"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Games&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Health.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Health"
+     description = "Netscape Search - Health"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Health&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Music.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Music"
+     description = "Netscape Search - Music"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Arts%2FMusic&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Recreation.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Recreation"
+     description = "Netscape Search - Recreation"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Recreation&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Reference.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Reference"
+     description = "Netscape Search - Reference"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Reference&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Regional.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Regional"
+     description = "Netscape Search - Regional"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Regional&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Relationships.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Relationships"
+     description = "Netscape Search - Relationships"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Society%2FRelationships&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Shopping.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Shopping"
+     description = "Netscape Search - Shopping"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Shopping&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Society.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Society"
+     description = "Netscape Search - Society"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Society&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Sports.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Sports"
+     description = "Netscape Search - Sports"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Sports&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_Travel.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - Travel"
+     description = "Netscape Search - Travel"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=Recreation%2FTravel&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/Netscape_World.src

@@ -0,0 +1,28 @@
+# Sherlock Plugin for Netscape Open Directory
+# Copyright ©1999 Netscape Communications Corp.
+# Author - Myron Rosmarin
+# 
+
+<search 
+     name        = "Netscape Search - World"
+     description = "Netscape Search - World"
+     method      = "GET"
+     action      = "http://search.netscape.com/cgi-bin/search"
+>
+
+<INPUT NAME="all=no&cat=World&search" user>
+
+<interpret
+     resultListStart = "<B>Reviewed Web Sites</B>"
+     resultListEnd   = "</TABLE>"
+     resultItemStart = "<li>"
+     bannerStart     = "<!--AD_TAG VENDOR=AOL WIDTH=468 HEIGHT=60-->"
+     bannerEnd       = "<!--/AD_TAG-->"
+>
+
+</search>
+
+
+<browser
+	alsomatch="http://search.netscape.com/search.tmpl"
+>

xpfe/components/search/datasets/category.rdf

@@ -32,12 +32,68 @@
   <RDF:Seq about="NC:SearchCategoryRoot">
   	<RDF:li>
   		<RDF:Description about="urn:search:category:1">
-			<NC:title>Internet</NC:title>
+			<NC:title>Business</NC:title>
   		</RDF:Description>
 
   		<RDF:Description about="urn:search:category:2">
+			<NC:title>Computing</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:3">
+			<NC:title>Entertainment</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:4">
+			<NC:title>Games</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:5">
+			<NC:title>Health</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:6">
+			<NC:title>Internet</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:7">
+			<NC:title>Music</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:8">
+			<NC:title>Recreation</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:9">
+			<NC:title>Reference</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:10">
+			<NC:title>Regional</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:11">
+			<NC:title>Relationships</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:12">
 			<NC:title>Shopping</NC:title>
   		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:13">
+			<NC:title>Society</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:14">
+			<NC:title>Sports</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:15">
+			<NC:title>Travel</NC:title>
+  		</RDF:Description>
+
+  		<RDF:Description about="urn:search:category:16">
+			<NC:title>World</NC:title>
+  		</RDF:Description>
   	</RDF:li>
   </RDF:Seq>
 
@@ -46,7 +102,26 @@
 
 
   <RDF:Seq about="NC:SearchCategory?category=urn:search:category:1">
-  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:1" />
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:10" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:2">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:11" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:3">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:12" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:4">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:13" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:5">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:14" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:6">
   	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:2" />
   	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:3" />
   	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:4" />
@@ -57,8 +132,44 @@
   	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:9" />
   </RDF:Seq>
 
-  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:2">
-  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:10" />
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:7">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:15" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:8">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:16" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:9">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:17" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:10">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:18" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:11">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:19" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:12">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:20" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:13">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:21" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:14">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:22" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:15">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:23" />
+  </RDF:Seq>
+
+  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:16">
+  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:24" />
   </RDF:Seq>
 
 
@@ -66,10 +177,6 @@
      dataset file, therefore DO NOT localize these names) -->
 
 
-<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:1">
-	<NC:Name>AOLSearch</NC:Name>
-</RDF:Description>
-
 <RDF:Description about="NC:SearchCategory?engine=urn:search:engine:2">
 	<NC:Name>Excite</NC:Name>
 </RDF:Description>
@@ -103,8 +210,63 @@
 </RDF:Description>
 
 <RDF:Description about="NC:SearchCategory?engine=urn:search:engine:10">
-	<NC:Name>eBay</NC:Name>
+	<NC:Name>Netscape Search - Business</NC:Name>
 </RDF:Description>
 
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:11">
+	<NC:Name>Netscape Search - Computing</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:12">
+	<NC:Name>Netscape Search - Entertainment</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:13">
+	<NC:Name>Netscape Search - Games</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:14">
+	<NC:Name>Netscape Search - Health</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:15">
+	<NC:Name>Netscape Search - Music</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:16">
+	<NC:Name>Netscape Search - Recreation</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:17">
+	<NC:Name>Netscape Search - Reference</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:18">
+	<NC:Name>Netscape Search - Regional</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:19">
+	<NC:Name>Netscape Search - Relationships</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:20">
+	<NC:Name>Netscape Search - Shopping</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:21">
+	<NC:Name>Netscape Search - Society</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:22">
+	<NC:Name>Netscape Search - Sports</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:23">
+	<NC:Name>Netscape Search - Travel</NC:Name>
+</RDF:Description>
+
+<RDF:Description about="NC:SearchCategory?engine=urn:search:engine:24">
+	<NC:Name>Netscape Search - World</NC:Name>
+</RDF:Description>
 
 </RDF:RDF>

xpfe/components/search/datasets/makefile.win

@@ -25,10 +25,6 @@ include <$(DEPTH)\config\rules.mak>
 
 FILES=\
 	category.rdf			\
-	AOLSearch.gif			\
-	AOLSearch.src			\
-	eBay.gif			\
-	eBay.src			\
 	Excite.gif			\
 	Excite.src			\
 	Google.gif			\
@@ -43,6 +39,36 @@ FILES=\
 	Lycos.src			\
 	Netscape_Open_Directory.gif	\
 	Netscape_Open_Directory.src	\
+	Netscape_Business.gif		\
+	Netscape_Computing.gif		\
+	Netscape_Computing.src		\
+	Netscape_Entertainment.gif	\
+	Netscape_Entertainment.src	\
+	Netscape_Games.gif		\
+	Netscape_Games.src		\
+	Netscape_Health.gif		\
+	Netscape_Health.src		\
+	Netscape_Music.gif		\
+	Netscape_Music.src		\
+	Netscape_Recreation.gif		\
+	Netscape_Reference.gif		\
+	Netscape_Reference.src		\
+	Netscape_Regional.gif		\
+	Netscape_Regional.src		\
+	Netscape_Relationships.gif	\
+	Netscape_Relationships.src	\
+	Netscape_Shopping.gif		\
+	Netscape_Shopping.src		\
+	Netscape_Society.gif		\
+	Netscape_Society.src		\
+	Netscape_Sports.gif		\
+	Netscape_Travel.gif		\
+	Netscape_Travel.src		\
+	Netscape_World.gif		\
+	Netscape_World.src		\
+	Netscape_Business.src		\
+	Netscape_Recreation.src		\
+	Netscape_Sports.src		\
 	Snap.com.gif			\
 	Snap.com.src			\
         $(NULL)