Build cow automatically. Some more cleanup (no more terms). Remove

debugging output.
This commit is contained in:
Stefanus Du Toit 2002-04-15 21:20:33 +00:00
parent b7ae0f6b9c
commit d68573b245
5 changed files with 14 additions and 14 deletions

View File

@ -1,6 +1,12 @@
INPUTS = index.xml INPUTS = index.xml
SUBDIRS = about events docs office SUBDIRS = about events docs office
# the following two rules are there so cow gets built first.
cow-first: recurse-cow all
recurse-cow:
cd cow && $(MAKE) && cd ..
include default.mk include default.mk
default.mk: default.mk.in default.mk: default.mk.in

View File

@ -14,13 +14,11 @@ void extension_cow_term(xmlXPathParserContextPtr ctxt,
xmlChar *str, *ret; xmlChar *str, *ret;
int str_l, month; int str_l, month;
DEBUG_PRINT("term");
if (nargs != 1) { if (nargs != 1) {
xmlXPathSetArityError(ctxt); xmlXPathSetArityError(ctxt);
} }
str = xmlXPathPopString(ctxt); str = xmlXPathPopString(ctxt);
str_l = xmlUTF8Strlen(str); str_l = xmlUTF8Strlen(str);
DEBUG_PRINT(str);
month = (str[5] - '0')*10 + (str[6] - '0'); month = (str[5] - '0')*10 + (str[6] - '0');
@ -34,7 +32,6 @@ void extension_cow_term(xmlXPathParserContextPtr ctxt,
void *extension_init_func(xsltTransformContextPtr ctxt, void *extension_init_func(xsltTransformContextPtr ctxt,
const xmlChar *URI) const xmlChar *URI)
{ {
DEBUG_PRINT("Extension init");
return 0; return 0;
} }
@ -42,12 +39,10 @@ void extension_shutdown_func(xsltTransformContextPtr ctxt,
const xmlChar *URI, const xmlChar *URI,
void *data) void *data)
{ {
DEBUG_PRINT("Extension shut down");
} }
void init_extensions() void init_extensions()
{ {
DEBUG_PRINT("Registering extension module.");
xsltRegisterExtModule(COW_URI, xsltRegisterExtModule(COW_URI,
extension_init_func, extension_shutdown_func); extension_init_func, extension_shutdown_func);
xsltRegisterExtModuleFunction((const xmlChar*)"term", COW_URI, xsltRegisterExtModuleFunction((const xmlChar*)"term", COW_URI,

View File

@ -27,7 +27,6 @@
date CDATA #REQUIRED date CDATA #REQUIRED
time CDATA #REQUIRED time CDATA #REQUIRED
room CDATA #REQUIRED room CDATA #REQUIRED
term CDATA #REQUIRED
title CDATA #REQUIRED> title CDATA #REQUIRED>
<!ELEMENT short (#PCDATA)> <!ELEMENT short (#PCDATA)>

View File

@ -215,7 +215,7 @@
order="ascending" order="ascending"
data-type="number"/> data-type="number"/>
<xsl:if test="csc:term(@date) = csc:term($date)"> <xsl:if test="csc:term(@date) = csc:term($date)">
<h3><xsl:value-of select="@title"/></h3> <h3><a href="{translate(concat('/events/', @room, '-', @date, '-', @time, '.html'), ' ', '_')}"><xsl:value-of select="@title"/></a></h3>
<p> <p>
<b><xsl:value-of select="@room"/>, <b><xsl:value-of select="@room"/>,
<xsl:value-of select="@date"/>, <xsl:value-of <xsl:value-of select="@date"/>, <xsl:value-of

View File

@ -1,6 +1,6 @@
<eventdefs> <eventdefs>
<eventitem date="2002-01-26" time="2:00 PM" <eventitem date="2002-01-26" time="2:00 PM"
room="Comfy Lounge MC3001" term="Winter 2002" room="Comfy Lounge MC3001"
title="An Introduction to GNU Hurd"> title="An Introduction to GNU Hurd">
<short>Bored of GNU/Linux? Try this experimental operating <short>Bored of GNU/Linux? Try this experimental operating
system!</short> system!</short>
@ -22,7 +22,7 @@ href="ja2morri@uwaterloo.ca">James Morrison</a>.</p>
</abstract> </abstract>
</eventitem> </eventitem>
<eventitem date="2002-01-26" time="2:30 PM" <eventitem date="2002-01-26" time="2:30 PM"
room="Comfy Lounge MC3001" term="Winter 2002" room="Comfy Lounge MC3001"
title="GnuPG/PGP Keysigning Party"> title="GnuPG/PGP Keysigning Party">
<short>Get more signatures on your key!</short> <short>Get more signatures on your key!</short>
<abstract> <abstract>
@ -56,7 +56,7 @@ href="ja2morri@uwaterloo.ca">James Morrison</a>.</p>
</abstract> </abstract>
</eventitem> </eventitem>
<eventitem date="2002-01-31" time="6:00 PM" room="MC2037" <eventitem date="2002-01-31" time="6:00 PM" room="MC2037"
term="Winter 2002" title="UNIX 101: First Steps With UNIX"> title="UNIX 101: First Steps With UNIX">
<abstract> <abstract>
This is the first in a series of seminars that cover the use of This is the first in a series of seminars that cover the use of
the UNIX Operating System. UNIX is used in a variety of the UNIX Operating System. UNIX is used in a variety of
@ -66,7 +66,7 @@ href="ja2morri@uwaterloo.ca">James Morrison</a>.</p>
</abstract> </abstract>
</eventitem> </eventitem>
<eventitem date="2002-02-13" time="4:00 PM" room="MC4060" <eventitem date="2002-02-13" time="4:00 PM" room="MC4060"
term="Winter 2002" title="DVD-Video Under Linux"> title="DVD-Video Under Linux">
<short>Billy Biggs will be holding a talk on DVD technology <short>Billy Biggs will be holding a talk on DVD technology
(in particular, CSS and playback issues) under Linux, giving some (in particular, CSS and playback issues) under Linux, giving some
technical details as well as an overview of the current status of technical details as well as an overview of the current status of
@ -90,7 +90,7 @@ href="ja2morri@uwaterloo.ca">James Morrison</a>.</p>
</abstract> </abstract>
</eventitem> </eventitem>
<eventitem date="2002-02-07" time="6:00 PM" room="MC2037" <eventitem date="2002-02-07" time="6:00 PM" room="MC2037"
term="Winter 2002" title="Unix 102: Fun With UNIX"> title="Unix 102: Fun With UNIX">
<short>This the second in a series of UNIX tutorials. Simon Law and <short>This the second in a series of UNIX tutorials. Simon Law and
James Perry will be presenting some more advanced UNIX James Perry will be presenting some more advanced UNIX
techniques. All are welcome. Accounts will be provided for those techniques. All are welcome. Accounts will be provided for those
@ -117,7 +117,7 @@ href="ja2morri@uwaterloo.ca">James Morrison</a>.</p>
</abstract> </abstract>
</eventitem> </eventitem>
<eventitem date="2002-02-28" time="6:00 PM" room="MC2037" <eventitem date="2002-02-28" time="6:00 PM" room="MC2037"
term="Winter 2002" title="Unix 103: More Advanced UNIX"> title="Unix 103: More Advanced UNIX">
<short>This is the third in a series of UNIX tutorials. Simon Law <short>This is the third in a series of UNIX tutorials. Simon Law
and James Perry will be teaching material following up on UNIX and James Perry will be teaching material following up on UNIX
102. All are welcome. Accounts will be provided for those needing 102. All are welcome. Accounts will be provided for those needing
@ -129,7 +129,7 @@ href="ja2morri@uwaterloo.ca">James Morrison</a>.</p>
</abstract> </abstract>
</eventitem> </eventitem>
<eventitem date="2002-03-01" time="5:00 PM" room="MC4060" <eventitem date="2002-03-01" time="5:00 PM" room="MC4060"
term="Winter 2002" title="Computer Go, The Ultimate"> title="Computer Go, The Ultimate">
<short>Thomas Wolf from Brock University will be holding a talk on <short>Thomas Wolf from Brock University will be holding a talk on
the asian game of Go. All are welcome.</short> the asian game of Go. All are welcome.</short>
<abstract> <abstract>