Small search changes. Allow "alsoMatch" to contain multiple items. If search file has multiple <INTERPRET> sections, but can't find one of them, just go to the next instead of trying to search the entire document for URLs.

suite/common/search/search-panel.js

@@ -30,7 +30,7 @@ var	pref = null;
 function debug(msg)
 {
 	// uncomment for debugging information
-	// dump(msg+"\n");
+	dump(msg+"\n");
 }
 
 
@@ -955,6 +955,7 @@ function saveSearch()
 		if (target && target != "")
 		{
 			lastSearchURI = target;
+			debug("Bookmark search  URL: '" + lastSearchURI + "'\n");
 		}
 
 		// look for last search text
@@ -968,14 +969,28 @@ function saveSearch()
 			target = target.replace(/+/i, " ");
 
 			lastSearchText = unescape(target);
+			debug("Bookmark search Name: '" + lastSearchText + "'\n");
 		}
 	}
 
-	debug("Bookmark search Name: '" + lastSearchText + "'\n");
-	debug("Bookmark search  URL: '" + lastSearchURI + "'\n");
 
 	if ((lastSearchURI == null) || (lastSearchURI == ""))	return(false);
-	if ((lastSearchText == null) || (lastSearchText == ""))	return(false);
+
+// 	rjc says: if lastSearchText is empty/null, that's still OK, synthesize the text
+	if ((lastSearchText == null) || (lastSearchText == ""))
+	{
+		lastSearchText = lastSearchURI;
+		var siteOffset = lastSearchText.indexOf("://");
+		if (siteOffset > 0)
+		{
+			siteOffset += 3;
+			var endOffset = lastSearchText.indexOf("/", siteOffset);
+			if (endOffset > 0)
+			{
+				lastSearchText = lastSearchText.substr(0, endOffset+1);
+			}
+		}
+	}
 
 	var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService();
 	if (bmks)	bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);

suite/common/search/search-panel.xul

@@ -86,7 +86,7 @@
           rdf:resource2="http://home.netscape.com/NC-rdf#Name"
           sortDirection="ascending" sortActive="true"
           class="inset"
-          flex="100%"
+          flex="100%" style="width:100%; height=100%;"
           datasources="rdf:internetsearch"
           onclick="sidebarOpenURL(event, event.target.parentNode.parentNode, 'Tree')">
       
@@ -142,7 +142,7 @@
       <!-- advanced panel -->
       <box align="vertical" class="searchpanel-outerbox" flex="1">
       
-        <tree align="horizontal" id="searchengines" flex="1" datasources="rdf:internetsearch" class="inset">
+        <tree align="horizontal" id="searchengines" datasources="rdf:internetsearch" flex="100%" class="inset" style="width:100%; height=100%;">
           <treecol id="CheckboxColumn" class="checkboxColumn" />
           <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" />
           <template>