--- trunk/html/js/search.js 2004/07/20 17:07:20 3 +++ trunk/html/js/search.js 2004/07/20 17:08:06 4 @@ -33,6 +33,7 @@ var query_left = ""; var search_err = ""; var results = null; +var index_path = ""; var watchdog_id = 0; var watchdog_callback = null; @@ -217,7 +218,7 @@ if(query_left.length > 0) { - doSearch(query_left, result_handler); + doSearch(index_path, query_left, result_handler); } else { @@ -296,10 +297,11 @@ return; } -function doSearch(query, result_func) +function doSearch(index_name,query, result_func) { - //alert("doSearch("+query+")"); + //alert("doSearch("+index_name+","+query+")"); var pos=query.search(/[\s\+]/); + if (index_name) index_path = index_name+'/'; if(pos < 0) { @@ -311,7 +313,7 @@ query = query.slice(0,pos); } - if(!loadXML("0.xml", traverseTree, query.toLowerCase(), result_func)) + if(!loadXML(index_path+"0.xml", traverseTree, query.toLowerCase(), result_func)) { debug("ERROR: Couldn't find main index 0.xml"); search_err = "INTERNAL ERROR: Unable to load main index 0.xml";