Mariage

Claire has added <bibl> tags to nine more files, and those are now up in the database.

A little more was added into the markup.xml page. Only a couple of paragraphs are left now.

Uploaded all the files that Claire edited on Thursday, and also made a tweak to the CSS so that the popup box in the document list page is always fully on-screen; it was irritating me a bit.

Claire pointed out the poor appearance of some of the 800px images used for the interactive image pages. This was caused by two factors: some where generated by the Image Markup Tool through its Web View output, which uses a default scaling algorithm that clearly isn't optimal for these images, and some images are in colour, even though they're essentially a greyscale format. I used the GIMP to re-generate all those images, converting the low-res ones to greyscale where required, but leaving the originals alone.

Two components to this task:

• For content owned by us (markup, editorial content, code etc.): use the Attribution-NonCommercial-NoDerivs 2.5 Canada licence.
• For the images, clarify that we are using them under licence (a copy will be posted when it is received), and anyone wishing to use or reproduce them will have to contact the BN.

The old site on Mustard is now obsolete, so I've implemented redirects in the sitemap so that anyone accessing it is automatically taken to the relevant page of the new site. This is the code:

<!-- First, catch one page whose name has changed. -->
			<map:match pattern="index.xq">
				<map:redirect-to uri="http://mariage.uvic.ca/biblio.xq" />
			</map:match>
			<!-- Now catch all the other stuff on the site. -->
			<map:match pattern="*">
				<map:redirect-to uri="http://mariage.uvic.ca/{1}" />
			</map:match>

Re-jigged the CSS for the text and image display pages so that it is built on top of Greg's CSS, and CSS lower in the hierarchy also maintains the same look and feel. For the text pages, it was fairly straightforward, but for the image pages we had to do a full redesign of the layout, and override the default menu placement and behaviour to keep it out of the way of the image. I think the results are pretty good. There's more to do with the menu, and with the search page and search results display, but we should get that finished tomorrow. Tested on FF, Opera, IE7 and Safari. I would like to make the annotation menu a little clearer too; the difference between the annotation category headers and their child annotation titles is not distinctive enough.

While working on the site CSS, I discovered another set of line elements (<l>) not enclosed by line-group elements (<lg>), in "Chat" and "Coquette". Fixed these.

Also while working on the search, I found annotation categories with no title, and misspelled annotation categories, which I also fixed. Fixes have been uploaded into the db and also into the working folder in the Mariage account.

... "phrase exact" searches weren't working. Turned out to be a missing comma.

Added the final bit of functionality to the search: limiting searches to particular image annotation categories:

• Added a JavaScript function to ensure that when an annotation category is selected, then "Gravure" is selected as the document type, since it's the only type of document that does contain annotations.
• Added another function to ensure that when a document type other than "Gravure" is selected, the annotation category selector is set to blank. Thus it should be impossible to search for annotation categories without limiting the document type to Gravure.
• Added annotation category handling to the find.xq file which does the XQuery search. This entailed changes to the BuildSearchStringBit function, since that's the best place to handle it. There are two new scenarios to handle: when there's both a search string and a category constraint, in which case it has to search only within annotations in that category, and when there's no search string but there is a category constraint, in which case it just needs to retrieve a list of documents which contain annotations in that category.

Minimal testing so far, but it seems to be doing the job OK.