Got the framework of the XQuery done, with search filters such as volume, issue, author, keyword etc. working. Still have to get the search system working, with useful match returns -- should the XQuery do the KWIC construction, or the XSLT? -- and I also need to get ordering working.

The plan to merge TOC and Search is a good one, though. We could actually put the search form on every page, if we want. Right now, the TOC/search is handling only texts in the /texts/ subcollection, but if the rest of the site content is to be stored in the db too -- which I think it should -- then we ought to allow an option to sort that material as well. That should perhaps be a switch, but I'm not sure yet how best to implement it.