Units 1 to 40 are now available at hrd/latin/new_wheelock; once approved, that set would be switched with the current hrd/latin/wheelock.
I've fixed the internal linking issues through a two-stage process:
- When our original XML documents are processed to create the "clean" XML for public consumption, links to HTML pages and so on are turned into private URI scheme targets with a site: prefix and a corresponding prefixDef in the header.
- The HTML rendering now handles these links.
I've fixed a lot of individual links throughout the collection too in the process of doing that. The main things remaining are the issue of links between the references files, the naming of those files, and the question of whether we still need to offer the corpus.xml and corpus.txt versions for download.
Updated computer schedule with additional user hours (L.of Inj. project; ISE hours)
Confirmation email sent to users.
After working on diagnostics fixes, I see that there are some major changes we need to consider for consistency's sake in the XML:
- The references.xml and botanical.xml files respectively are converted to noms_propres.html and terms_med.html in the output. This is a bit confusing, and it means that links to those specific web pages can't be encoded as normal links to the source XML documents, as they should be. I propose renaming the XML files to match the HTML output, and globally changing all the links throughout the corpus.
- DONE: There are many cases where we want to link to HTML files that are built for the site, but which don't have XML source files (such as toc_gravure.html). These links in the HTML are of course pointed at nothing. I propose that we adopt a prefixDef of site:toc_gravure.html for such links, and dereference it as mariage.uvic.ca/toc_gravure.html. This also applies to schema and ODD links.
- FIXED: There are a couple of cases where the references/noms_propres file links to the botanical, and vice versa. Because we don't expect these links, those elements are not imported into the back matter of the files when the XML is expanded, but the links are converted to local links. In the website context, this doesn't cause a problem; when the target is not there, the JS just gets it by AJAX. But the XML documents are not strictly valid. How to handle this? Ideally we should import that stuff.
- DONE: The normalized texts remove all the forme works, but in cases such as Le Bon Mariage, these contain page numbers with @id attributes which are the targets of links in TOCs etc. Make sure these targets are converted into the marginal page numbers we use instead.
Ran it on these files:
affix_aspectual, affix_glot-ix, affix_k-m, affix_n-t, affix_u-CAPs, lex-pref, lex-suf, particles,pron
and committed the results. SMK now checking.
There are TOCs both at the beginning and the end of Le Bon Mariage, and they're a display problem because they were done as special list elements rather than tables. I've re-encoded them all as table[@type='primarySourceToc'], which makes it far simpler to display them properly.
HM gave us a tour of the venue; all looking good. Notes taken.
I've slightly modified the triggers for the Maple Ridge dbs on AG's instructions, to add block info into the description used for dropdowns:
DROP TRIGGER IF EXISTS `landscapes_mapridgelive`.`prp_desc_insert`;
DELIMITER //
CREATE TRIGGER `landscapes_mapridgelive`.`prp_desc_insert` BEFORE INSERT ON `landscapes_mapridgelive`.`props`
FOR EACH ROW BEGIN
DECLARE next_id INT;
SET next_id = (SELECT `AUTO_INCREMENT` FROM `information_schema`.`TABLES` WHERE `TABLE_SCHEMA`=DATABASE() AND `TABLE_NAME`='props');
SET NEW.`prp_desc` =
concat(
IF (NEW.`prp_township` != '', concat('T:', LPAD(NEW.`prp_township`, 5, '0'), ' '), ''),
IF (NEW.`prp_district` != '', concat('DL:', LPAD(NEW.`prp_district`, 5, '0'), ' '), ''),
IF (NEW.`prp_section` != '', concat('S:', LPAD(NEW.`prp_section`, 5, '0'), ' '), ''),
IF (NEW.`prp_block` != '', concat('B:', LPAD(NEW.`prp_block`, 5, '0'), ' '), ''),
IF (NEW.`prp_quadrant` != '', concat('Q:', NEW.`prp_quadrant`, ' '), ''),
IF (NEW.`prp_plan` != '', concat('PL:', LPAD(NEW.`prp_plan`, 5, '0'), ' '), ''),
IF (NEW.`prp_sketch` != '', concat('SK:', LPAD(NEW.`prp_sketch`, 5, '0'), ' '), ''),
IF (NEW.`prp_lot` != '', concat('L:', LPAD(NEW.`prp_lot`, 5, '0'), ' '), ''),
IF (NEW.`prp_parcel` != '', concat('PC:', LPAD(NEW.`prp_parcel`, 5, '0'), ' '), ''),
IF (NEW.`prp_acreage` != '', concat('A:', NEW.`prp_acreage`, ' '), ''),
IF (NEW.`prp_exception` != '', 'EX', ''),
' (#', next_id, ')'
);
END
//
DELIMITER ;
DROP TRIGGER IF EXISTS `landscapes_mapridgelive`.`prp_desc_update`;
DELIMITER //
CREATE TRIGGER `landscapes_mapridgelive`.`prp_desc_update` BEFORE UPDATE ON `landscapes_mapridgelive`.`props`
FOR EACH ROW BEGIN
SET NEW.`prp_desc` =
concat(
IF (NEW.`prp_township` != '', concat('T:', LPAD(NEW.`prp_township`, 5, '0'), ' '), ''),
IF (NEW.`prp_district` != '', concat('DL:', LPAD(NEW.`prp_district`, 5, '0'), ' '), ''),
IF (NEW.`prp_section` != '', concat('S:', LPAD(NEW.`prp_section`, 5, '0'), ' '), ''),
IF (NEW.`prp_block` != '', concat('B:', LPAD(NEW.`prp_block`, 5, '0'), ' '), ''),
IF (NEW.`prp_quadrant` != '', concat('Q:', NEW.`prp_quadrant`, ' '), ''),
IF (NEW.`prp_plan` != '', concat('PL:', LPAD(NEW.`prp_plan`, 5, '0'), ' '), ''),
IF (NEW.`prp_sketch` != '', concat('SK:', LPAD(NEW.`prp_sketch`, 5, '0'), ' '), ''),
IF (NEW.`prp_lot` != '', concat('L:', LPAD(NEW.`prp_lot`, 5, '0'), ' '), ''),
IF (NEW.`prp_parcel` != '', concat('PC:', LPAD(NEW.`prp_parcel`, 5, '0'), ' '), ''),
IF (NEW.`prp_acreage` != '', concat('A:', NEW.`prp_acreage`, ' '), ''),
IF (NEW.`prp_exception` != '', 'EX', ''),
' (#', NEW.`prp_property_id`, ')'
);
END
//
DELIMITER ;
I haven't yet updated all the old descriptions, since most of them don't have block info, but I'll do that when I have enough time to be cautious about it.
Attended conference mtng. #3
Gathering more hotel, shuttle services, dinner location information.
Late duty.