Merge branch 'master' of caffeine:/users/www/www
This commit is contained in:
commit
9f020ee5ef
2
Makefile
2
Makefile
|
|
@ -2,7 +2,7 @@ SHELL = umask 002; exec /bin/sh
|
|||
|
||||
FILES = events.ics events.atom news.atom index.html stats.html \
|
||||
favicon.ico default.css csclub.der csclub.pem
|
||||
SUBDIRS = about events office news services media buttons logos flash
|
||||
SUBDIRS = about events office news services media buttons logos flash library
|
||||
|
||||
include common.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
FILES = about.png events.png gitweb.png home.png mailman.png media.png \
|
||||
office.png services.png stats.png webmail.png wiki.png gallery.png
|
||||
office.png services.png stats.png webmail.png wiki.png gallery.png \
|
||||
library.png
|
||||
RELDIR = buttons/
|
||||
include ../common.mk
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 473 B |
|
|
@ -37,6 +37,10 @@ $(OUTDIR)%.ics: %.xml
|
|||
|
||||
$(OUTDIR)%.html: %.html
|
||||
cp -f $< $@
|
||||
$(OUTDIR)%.cgi: %.cgi
|
||||
cp -f $< $@
|
||||
$(OUTDIR).htaccess:
|
||||
cp -f .htaccess $@
|
||||
$(OUTDIR)%.ico: %.ico
|
||||
cp -f $< $@
|
||||
$(OUTDIR)%.css: %.css
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@
|
|||
<diritem title="Office" href="office/" />
|
||||
<diritem title="Events" href="events/" />
|
||||
<diritem title="Media" href="media/" />
|
||||
<diritem title="Wiki" href="http://wiki.csclub.uwaterloo.ca/" />
|
||||
<diritem title="Webmail" href="https://mail.csclub.uwaterloo.ca/" />
|
||||
<diritem title="Gallery" href="/gallery2/" />
|
||||
<diritem title="Stats" href="stats" />
|
||||
<diritem title="Wiki" absolute="true" href="http://wiki.csclub.uwaterloo.ca/" />
|
||||
<diritem title="Webmail" absolute="true" href="https://mail.csclub.uwaterloo.ca/" />
|
||||
<diritem title="Gallery" absolute="true" href="/gallery2/" />
|
||||
<diritem title="Stats" absolute="true" href="stats" />
|
||||
<diritem title="Library" href="library/" />
|
||||
</directory>
|
||||
|
|
|
|||
18
events.xml
18
events.xml
|
|
@ -59,16 +59,26 @@ and its guranteed to be dazzling.
|
|||
</abstract>
|
||||
</eventitem>
|
||||
|
||||
<eventitem date="2009-03-12" time="5:00 PM" etime="7:00 PM" room="TBA"
|
||||
<eventitem date="2009-03-12" time="5:00 PM" etime="7:00 PM" room="RAC2009"
|
||||
title="IQC - Programming Quantum Computers">
|
||||
<short>
|
||||
<p>
|
||||
A brief intro to Quantum Computing and why it matters,
|
||||
followed by a talk on programming quantum computers.
|
||||
followed by a talk on programming quantum computers. Meet at
|
||||
the CSC at 4:00PM for a guided walk to the RAC.
|
||||
</p>
|
||||
</short>
|
||||
<abstract><p>
|
||||
TBA</p></abstract>
|
||||
<abstract>
|
||||
<p>
|
||||
Raymond Laflamme is the director of the Institute for Quantum
|
||||
Computing at the University of Waterloo and holds the Canada
|
||||
Research Chair in Quantum Information. He will give a brief
|
||||
introduction to quantum computing and why it matters, followed
|
||||
by a talk on programming quantum computers. There will be
|
||||
tours of the IQC labs at the end, and pizza will be provided
|
||||
back at the CSC for all attendees.
|
||||
</p>
|
||||
</abstract>
|
||||
</eventitem>
|
||||
|
||||
<eventitem date="2009-02-27" time="5:00 PM" etime="7:00 PM" room="CSC Office: MC3036" title="Dooly's Night">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
AddHandler cgi-script .cgi
|
||||
Options +Indexes +ExecCGI
|
||||
DirectoryIndex index.cgi
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
FILES = index.cgi .htaccess
|
||||
RELDIR = library/
|
||||
include ../common.mk
|
||||
|
||||
.htaccess: .htaccess
|
||||
cp -f $< $@
|
||||
|
|
@ -0,0 +1,403 @@
|
|||
#!/usr/bin/perl
|
||||
|
||||
###############################################
|
||||
# Postgres SQL Library Database Web Interface #
|
||||
# Matt Thiffault (January 22,2009) #
|
||||
# matt.thiffault@gmail.com #
|
||||
###############################################
|
||||
|
||||
|
||||
use DBI;
|
||||
|
||||
print "Content-type: text/html\n\n";
|
||||
|
||||
$in = $ENV{'QUERY_STRING'};
|
||||
|
||||
@pairs = split(/[&=]/,$in);
|
||||
%field = @pairs;
|
||||
chomp(%field);
|
||||
$webroot = "..";
|
||||
|
||||
print <<END;
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head><link rel="shortcut icon" href="/favicon.ico"/>
|
||||
<link rel="alternate" title="CSC Events Feed" href="$webroot/events.atom" type="application/rss+xml"/>
|
||||
<link rel="alternate" title="CSC News Feed" href="$webroot/news.atom" type="application/rss+xml"/>
|
||||
<title>Computer Science Club of the University of Waterloo: Home</title>
|
||||
<link rel="stylesheet" href="$webroot/default.css" type="text/css"/></head>
|
||||
<body>
|
||||
<div class="content">
|
||||
<a id="pagetop"/>
|
||||
<div class="biglogo">
|
||||
<div class="uwlogo">
|
||||
<a href="http://www.uwaterloo.ca/"><img src="$webroot/logos/uw_logo.png" alt="University of Waterloo" width="105" height="70"/></a>
|
||||
</div><div class="csclogo">
|
||||
<a href="./"><img src="$webroot/logos/csc_logo.png" alt="Computer Science Club" width="420" height="79"/></a>
|
||||
</div></div>
|
||||
<div class="dirheader">
|
||||
|
||||
END
|
||||
|
||||
|
||||
open(DIR,"/users/www/www/directory.xml") or print "Couldn't open file\n";
|
||||
@items = <DIR>;
|
||||
close(MENU);
|
||||
|
||||
shift @items;
|
||||
shift @items;
|
||||
shift @items;
|
||||
shift @items;
|
||||
shift @items;
|
||||
$items[-1] = undef;
|
||||
|
||||
foreach $item (@items){
|
||||
if($item){
|
||||
|
||||
$item =~ s/[<>]//g;
|
||||
$item =~ s/\/$//g;
|
||||
$item =~ s/menuitem//g;
|
||||
$item =~ s/ //;
|
||||
@pairs = split(/[ =]/,$item);
|
||||
shift @pairs;
|
||||
%fields = @pairs;
|
||||
|
||||
$fields{'href'} =~ s/"//g;
|
||||
|
||||
chomp($fields{'href'});
|
||||
|
||||
$fields{'title'} =~ s/"//g;
|
||||
|
||||
if($fields{'absolute'} =~ /true/){
|
||||
print "<a class=\"diritem\" href=\"$fields{'href'}\">$fields{'title'}</a>\n";
|
||||
}else{
|
||||
print "<a class=\"diritem\" href=\"$webroot/$fields{'href'}\">$fields{'title'}</a>\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
print "<br><br><br>\n";
|
||||
|
||||
#display the search form
|
||||
if($field{'do'} eq "home" || $field{'do'} eq ""){
|
||||
|
||||
#isbn,title,authors,year,edition,publisher
|
||||
|
||||
print <<END;
|
||||
<center>
|
||||
<br>
|
||||
<h3>Computer Science Library Collection Search</h3>
|
||||
<br>
|
||||
<br>
|
||||
|
||||
<table>
|
||||
|
||||
<form name="search" action="index.cgi" method="get">
|
||||
<input type="hidden" name="do" value="query" />
|
||||
|
||||
<tr><td>Title:</td> <td><input type="text" name="title" /></td></tr>
|
||||
|
||||
<tr><td>Publisher:</td> <td><input type="text" name="publisher" /><td></tr>
|
||||
|
||||
<tr><td>Edition:</td> <td><input type="text" name="edition" /></td></tr>
|
||||
|
||||
<tr><td>Year:</td> <td><input type="text" name="year" /></td></tr>
|
||||
|
||||
<tr><td>ISBN:</td> <td><input type="text" name="isbn" /></td></tr>
|
||||
|
||||
<tr>
|
||||
<td></td>
|
||||
<td><input type="submit" value="Search" /><br>
|
||||
</td>
|
||||
</tr>
|
||||
</form>
|
||||
</table>
|
||||
</center>
|
||||
|
||||
END
|
||||
|
||||
}
|
||||
|
||||
#query the database
|
||||
if($field{'do'} eq "query"){
|
||||
|
||||
print "<h3>Search Results</h3>";
|
||||
|
||||
#build query string here, query and display.
|
||||
my $dbh = DBI->connect("dbi:Pg:dbname=library;host=localhost",
|
||||
'librarian',
|
||||
'KJI3RVgszrxrxe6W4gX3',
|
||||
{AutoCommit => 1})
|
||||
or print "Couldn't connect to database: " . DBI->errstr;
|
||||
|
||||
$searchterm = undef;
|
||||
$orterm = undef;
|
||||
@results;
|
||||
@oresults;
|
||||
$title = $field{'title'};
|
||||
$title =~ s/[';:"]/ /g;
|
||||
$publisher = $field{'publisher'};
|
||||
$publisher =~ s/[';:"]/ /g;
|
||||
$edition = $field{'edition'};
|
||||
$edition =~ s/[';:"]/ /g;
|
||||
$year = $field{'year'};
|
||||
$year =~ s/[';:"]/ /g;
|
||||
$isbn = $field{'isbn'};
|
||||
$isbn =~ s/[';:"]/ /g;
|
||||
|
||||
if($title){
|
||||
|
||||
@tmp = split(/\+/,$title);
|
||||
my @keywords;
|
||||
my @orwords;
|
||||
push @keywords,"'%$tmp[0]%'";
|
||||
push @orwords,"'%tmp[0]%'";
|
||||
shift @tmp;
|
||||
|
||||
foreach $keyword (@tmp){
|
||||
push @keywords,"AND (title ILIKE '%$keyword%')";
|
||||
push @orwords,"OR (title ILIKE '%$keyword%')";
|
||||
}
|
||||
|
||||
$searchterm = "(title ILIKE @keywords)";
|
||||
$orterm = "(title ILIKE @orwords)";
|
||||
|
||||
}
|
||||
|
||||
if($publisher){
|
||||
|
||||
@tmp = split(/\+/,$publisher);
|
||||
my @keywords;
|
||||
my @orwords;
|
||||
push @keywords,"'%$tmp[0]%'";
|
||||
shift @tmp;
|
||||
|
||||
foreach $keyword (@tmp){
|
||||
push @keywords,"AND (publisher ILIKE '%$keyword%')";
|
||||
push @orwords,"OR (publisher ILIKE '%$keyword%')";
|
||||
}
|
||||
|
||||
if($searchterm eq undef){
|
||||
$searchterm = "(publisher ILIKE @keywords)";
|
||||
$orterm = "(publisher ILIKE @orwords)";
|
||||
}else{
|
||||
$temp = $searchterm;
|
||||
$searchterm = $temp." AND (publisher ILIKE @keywords)";
|
||||
$temp = $orterm;
|
||||
$orterm = $temp." OR (publisher ILIKE @keywords)";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($edition){
|
||||
|
||||
@tmp = split(/\+/,$edition);
|
||||
my @keywords;
|
||||
my @orwords;
|
||||
push @keywords,"'%$tmp[0]%'";
|
||||
push @orwords,"'%$tmp[0]%'";
|
||||
shift @tmp;
|
||||
|
||||
foreach $keyword (@tmp){
|
||||
push @keywords,"AND (edition ILIKE '%$keyword%')";
|
||||
push @keywords,"OR (edition ILIKE '%$keyword%')";
|
||||
}
|
||||
|
||||
if($searchterm eq undef){
|
||||
$searchterm = "(edition ILIKE @keywords)";
|
||||
$orterm = "(edition ILIKE @keywords)"
|
||||
}else{
|
||||
$temp = $searchterm;
|
||||
$searchterm = $temp." AND (edition ILIKE @keywords)";
|
||||
$temp = $orterm;
|
||||
$orterm = $temp." OR (edition ILIKE @keywords)";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($year){
|
||||
|
||||
@tmp = split(/\+/,$year);
|
||||
my @keywords;
|
||||
my @orwords;
|
||||
push @keywords,"'%$tmp[0]%'";
|
||||
push @orwords,"'%$tmp[0]%'";
|
||||
shift @tmp;
|
||||
|
||||
foreach $keyword (@tmp){
|
||||
push @keywords,"AND (year ILIKE '%$keyword%')";
|
||||
push @orwords,"OR (year ILIKE '%$keyword%')";
|
||||
}
|
||||
|
||||
if($searchterm eq undef){
|
||||
$searchterm = "(year ILIKE @keywords)";
|
||||
$orterm = "(year ILIKE $orwords)";
|
||||
}else{
|
||||
$temp = $searchterm;
|
||||
$searchterm = $temp." AND (year ILIKE @keywords)";
|
||||
$temp = $orterm;
|
||||
$orterm = $temp." OR (year ILIKE @orwords)";
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($isbn){
|
||||
|
||||
@tmp = split(/\+/,$isbn);
|
||||
my @keywords;
|
||||
my @orwords;
|
||||
push @keywords,"'%$tmp[0]%'";
|
||||
push @orwords,"'%$tmp[0]%'";
|
||||
shift @tmp;
|
||||
|
||||
foreach $keyword (@tmp){
|
||||
push @keywords,"AND (isbn ILIKE '%$keyword%')";
|
||||
push @orwords,"OR (isbn ILIKE '%keyword%')";
|
||||
}
|
||||
|
||||
if($searchterm eq undef){
|
||||
$searchterm = "(isbn ILIKE @keywords)";
|
||||
$orterm = "(isbn ILIKE @keywords)";
|
||||
}else{
|
||||
$temp = $searchterm;
|
||||
$searchterm = $temp." AND (isbn ILIKE @keywords)";
|
||||
$temp = $orterm;
|
||||
$orterm = $temp." OR (year ILIKE @orwords)";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($searchterm){
|
||||
|
||||
my $sth = $dbh->prepare("SELECT title,isbn,year,publisher,edition FROM book WHERE $searchterm;")
|
||||
or print "Couldn't prepare statement: " . $dbh->errstr;
|
||||
|
||||
my $oth = $dbh->prepare("SELECT title,isbn,year,publisher,edition FROM book WHERE $orterm;")
|
||||
or print "Couldn't prepare statement: " . $dbh->errstr;
|
||||
|
||||
$sth->execute() # Execute the query
|
||||
or print "Couldn't execute statement: " . $sth->errstr;
|
||||
|
||||
while($data = $sth->fetchrow_arrayref()){
|
||||
push @results, [@{$data}];
|
||||
}
|
||||
|
||||
$oth->execute()
|
||||
or print "Couldn't execute statement: " . $oth->errstr;
|
||||
|
||||
while($ordata = $oth->fetchrow_arrayref()){
|
||||
push @oresults, [@{$ordata}];
|
||||
}
|
||||
|
||||
$sth->finish;
|
||||
$oth->finish;
|
||||
|
||||
|
||||
if ($sth->rows == 0 && $oth->rows == 0) {
|
||||
print "<center>No names matched</center></br>";
|
||||
}else{
|
||||
print "<center><table border>";
|
||||
print "<tr> <td>Title</td> <td>ISBN</td> <td>Year</td> <td>Publisher</td> <td>Edition</td> </tr>";
|
||||
|
||||
for my $book (@results){
|
||||
print "<tr>";
|
||||
for my $field (@{$book}){
|
||||
print "<td> $field </td>\n";
|
||||
}
|
||||
print "</tr>";
|
||||
}
|
||||
|
||||
for my $book (@oresults){
|
||||
foreach $andbook (@results){
|
||||
if(@{$book}[0] eq @{$andbook}[0]){
|
||||
$book = undef;
|
||||
}
|
||||
}
|
||||
|
||||
if($book){
|
||||
print "<tr>";
|
||||
for my $field (@{$book}){
|
||||
print "<td> $field </td>\n";
|
||||
}
|
||||
print "</tr>";
|
||||
}
|
||||
}
|
||||
|
||||
print "</table></center>";
|
||||
}
|
||||
|
||||
}else{
|
||||
print "<br><center>You did not enter any search terms.</center></br>";
|
||||
}
|
||||
}
|
||||
|
||||
print <<END;
|
||||
|
||||
<br><br>
|
||||
|
||||
<div class="footer">
|
||||
<div class="menubar">
|
||||
END
|
||||
|
||||
open(MENU,"/users/www/www/menu.xml") or print "Couldn't open file\n";
|
||||
@items = <MENU>;
|
||||
close(MENU);
|
||||
|
||||
$items[0] = undef;
|
||||
$items[-1] = undef;
|
||||
|
||||
foreach $item (@items){
|
||||
if($item){
|
||||
$item =~ s/[<>]//g;
|
||||
$item =~ s/\/$//g;
|
||||
$item =~ s/menuitem//g;
|
||||
$item =~ s/ //;
|
||||
@pairs = split(/[ =]/,$item);
|
||||
shift @pairs;
|
||||
%fields = @pairs;
|
||||
$fields{'href'} =~ s/"//g;
|
||||
chomp($fields{'href'});
|
||||
$fields{'icon'} =~ s/"//g;
|
||||
|
||||
print "<div class=\"menuitem\">\n";
|
||||
|
||||
if($fields{'absolute'} =~ /true/){
|
||||
print "<a href=\"$fields{'href'}\">\n";
|
||||
}else{
|
||||
print "<a href=\"$webroot/$fields{'href'}\">\n"
|
||||
}
|
||||
|
||||
print "<img src=\"$webroot/buttons/$fields{'icon'}.png\" width=\"40\" height=\"40\" alt=$fields{'title'}/>\n";
|
||||
|
||||
$fields{'title'} =~ s/"//g;
|
||||
|
||||
print "<br/>$fields{'title'}</a></div>\n\n";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
print <<END;
|
||||
|
||||
</div>
|
||||
|
||||
<a href="#pagetop" class="pagetop">Go to top</a>
|
||||
|
||||
<div class="infobox">
|
||||
|
||||
<p>
|
||||
This site supports TLS/SSL using a certificate signed by the
|
||||
"CSC Certificate Authority". Click <a href="$webroot/csclub.pe\
|
||||
m">
|
||||
here</a> (PEM format) or <a href="$webroot/csclub.der">here</a\
|
||||
> (DER
|
||||
format) to install the certificate authority into your browser\
|
||||
.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
END
|
||||
2
menu.xml
2
menu.xml
|
|
@ -10,5 +10,5 @@
|
|||
<menuitem title="Mailman" icon="mailman" absolute="true" href="/mailman/"/>
|
||||
<menuitem title="gitweb" icon="gitweb" absolute="true" href="http://gitweb.csclub.uwaterloo.ca/"/>
|
||||
<menuitem title="Gallery" icon="gallery" absolute="true" href="/gallery2/"/>
|
||||
<menuitem title="Library" icon="gallery" absolute="true" href="http://csclub.uwaterloo.ca/~mthiffau/cgi-bin/library.cgi" />
|
||||
<menuitem title="Library" icon="library" absolute="true" href="http://csclub.uwaterloo.ca/library" />
|
||||
</menudefs>
|
||||
|
|
|
|||
Loading…
Reference in New Issue