From 14ffd0723f4a98f46f490610d6872eecdad11bcc Mon Sep 17 00:00:00 2001 From: Matthew Thiffault Date: Tue, 10 Mar 2009 23:19:56 -0400 Subject: [PATCH 01/16] This is the library database search script that is destined for csclub.uwaterloo.ca/library. Along with it goes a .htaccess file to make sure that index.cgi works. There may be some updates to the script in the near future. --- library/.htaccess | 3 + library/index.cgi | 374 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 377 insertions(+) create mode 100755 library/.htaccess create mode 100755 library/index.cgi diff --git a/library/.htaccess b/library/.htaccess new file mode 100755 index 0000000..d54535d --- /dev/null +++ b/library/.htaccess @@ -0,0 +1,3 @@ +AddHandler cgi-script .cgi +Options +Indexes +ExecCGI +DirectoryIndex index.cgi diff --git a/library/index.cgi b/library/index.cgi new file mode 100755 index 0000000..1609553 --- /dev/null +++ b/library/index.cgi @@ -0,0 +1,374 @@ +#!/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); +%fields = @pairs; +chomp(%fields); +$webroot = "../../.."; + +print < + + + +Computer Science Club of the University of Waterloo: Home + + +
+ + +
+HOME +Services +Office +Events +Media +Wiki +Webmail +Gallery +Stats +


+ +END + +#display the search form +if($fields{'do'} eq "home" || $fields{'do'} eq ""){ + +#isbn,title,authors,year,edition,publisher + + print < +
+

Computer Science Library Collection Search

+
+
+ + + + + + + + + + + + + + + + + + + + + +
Title:
Publisher:
Edition:
Year:
ISBN:

+
+ + +END + +} + +#query the database +if($fields{'do'} eq "query"){ + + print "

Search Results

"; + + #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 = $fields{'title'}; + $title =~ s/[';:"]/ /g; + $publisher = $fields{'publisher'}; + $publisher =~ s/[';:"]/ /g; + $edition = $fields{'edition'}; + $edition =~ s/[';:"]/ /g; + $year = $fields{'year'}; + $year =~ s/[';:"]/ /g; + $isbn = $fields{'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 "
No names matched

"; + }else{ + print "
"; + print ""; + + for my $book (@results){ + print ""; + for my $field (@{$book}){ + print "\n"; + } + print ""; + } + + for my $book (@oresults){ + foreach $andbook (@results){ + if(@{$book}[0] eq @{$andbook}[0]){ + $book = undef; + } + } + + if($book){ + print ""; + for my $field (@{$book}){ + print "\n"; + } + print ""; + } + } + + print "
Title ISBN Year Publisher Edition
$field
$field
"; + } + + }else{ + print "
You did not enter any search terms.

"; + } +} + +print <
+ +
+
+END + +open(MENU,"/users/www/www/menu.xml") or print "Couldn't open file\n"; +@items = ; +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 "
\n"; + + if($fields{'absolute'} =~ /true/){ + print "\n"; + }else{ + print "\n" + } + + print "$fields{'title'}/\n"; + + $fields{'title'} =~ s/"//g; + + print "
$fields{'title'}
\n\n"; + + } +} + +print < + +Go to top + +
+ +

+This site supports TLS/SSL using a certificate signed by the +"CSC Certificate Authority". Click +here (PEM format) or here (DER +format) to install the certificate authority into your browser\ +. +

+ +
+ + + + +END From 9b76842650f8427301050764defa246832aff1c1 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:41:16 -0400 Subject: [PATCH 02/16] Adding library to build system, updating menu, and updating IQC talk information. --- Makefile | 2 +- events.xml | 18 ++++++++++++++---- library/Makefile | 3 +++ menu.xml | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 library/Makefile diff --git a/Makefile b/Makefile index 270f8b3..7de421b 100644 --- a/Makefile +++ b/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 diff --git a/events.xml b/events.xml index 0e0ff2d..cafd3c5 100644 --- a/events.xml +++ b/events.xml @@ -59,16 +59,26 @@ and its guranteed to be dazzling. -

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.

-

- TBA

 + +

+ 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. +

+ diff --git a/library/Makefile b/library/Makefile new file mode 100644 index 0000000..1afb1c7 --- /dev/null +++ b/library/Makefile @@ -0,0 +1,3 @@ +FILES = index.cgi +RELDIR = buttons/ +include ../common.mk diff --git a/menu.xml b/menu.xml index c7f476f..f9d1600 100644 --- a/menu.xml +++ b/menu.xml @@ -10,5 +10,5 @@ - + From 798e317b2347ca64adb9352d4c1e8a95e91dea62 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:42:34 -0400 Subject: [PATCH 03/16] Fixing retarded bug in build system. --- library/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index 1afb1c7..ba17b96 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,3 +1,3 @@ FILES = index.cgi -RELDIR = buttons/ +RELDIR = library/ include ../common.mk From 8c592ec309b60f02526aaf12eb69e1ce92edfa36 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:47:28 -0400 Subject: [PATCH 04/16] I'm retarded. Fixing so we now copy .cgi --- common.mk.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.mk.in b/common.mk.in index ec3d455..4b2c33b 100644 --- a/common.mk.in +++ b/common.mk.in @@ -37,6 +37,8 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ +$(OUTDIR)%.cgi: %.cgi + cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From dcf7e0ed171f1551c0c6e3c79e3015f5074ed0b3 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:48:58 -0400 Subject: [PATCH 05/16] Now preserving permissions. --- common.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 4b2c33b..5f08162 100644 --- a/common.mk.in +++ b/common.mk.in @@ -38,7 +38,7 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi - cp -f $< $@ + cp -fp $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From baca7f75fb235d6d52e37710b485eba1195e841f Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:50:43 -0400 Subject: [PATCH 06/16] Now htaccess as well. --- common.mk.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 5f08162..d6d14f5 100644 --- a/common.mk.in +++ b/common.mk.in @@ -38,7 +38,9 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi - cp -fp $< $@ + cp -f $< $@ +$(OUTDIR)%.htaccess: %.htaccess + cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From 9ea50f9cb94798a1d2b4ff4ea9bd7f04aa0c2ca7 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:51:43 -0400 Subject: [PATCH 07/16] Now we actually include the proper .htaccess file. (Sorry, I'm a retard.) --- library/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index ba17b96..5cbb1cf 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,3 +1,3 @@ -FILES = index.cgi +FILES = index.cgi .htaccess RELDIR = library/ include ../common.mk From 7a2539318a05e7c93cf4b9dcea8129a35372c86b Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:52:24 -0400 Subject: [PATCH 08/16] Bloody hell. --- common.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index d6d14f5..545321f 100644 --- a/common.mk.in +++ b/common.mk.in @@ -39,7 +39,7 @@ $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi cp -f $< $@ -$(OUTDIR)%.htaccess: %.htaccess +$(OUTDIR)/.htaccess: .htaccess cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ From 43f53b4f00f0a888f7d9eef62c9f4857b72320bc Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:56:22 -0400 Subject: [PATCH 09/16] Should work now. --- common.mk.in | 2 +- library/Makefile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 545321f..2c6a299 100644 --- a/common.mk.in +++ b/common.mk.in @@ -39,7 +39,7 @@ $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi cp -f $< $@ -$(OUTDIR)/.htaccess: .htaccess +$(OUTDIR).htaccess: cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ diff --git a/library/Makefile b/library/Makefile index 5cbb1cf..18618b5 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,3 +1,6 @@ FILES = index.cgi .htaccess RELDIR = library/ include ../common.mk + +.htaccess: .htaccess + cp -f $< $@ \ No newline at end of file From 6c8f0554d112c906e0161531d3a03f4784dc65b1 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:56:59 -0400 Subject: [PATCH 10/16] I hate make --- common.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 2c6a299..2fb6e4b 100644 --- a/common.mk.in +++ b/common.mk.in @@ -40,7 +40,7 @@ $(OUTDIR)%.html: %.html $(OUTDIR)%.cgi: %.cgi cp -f $< $@ $(OUTDIR).htaccess: - cp -f $< $@ + cp -f .htaccess $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From 971870f86ce950707cff784050edb2be8f38fc45 Mon Sep 17 00:00:00 2001 From: Matthew Thiffault Date: Tue, 10 Mar 2009 23:58:20 -0400 Subject: [PATCH 11/16] The script now points to itself! --- library/index.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/index.cgi b/library/index.cgi index 1609553..1c04396 100755 --- a/library/index.cgi +++ b/library/index.cgi @@ -16,7 +16,7 @@ $in = $ENV{'QUERY_STRING'}; @pairs = split(/[&=]/,$in); %fields = @pairs; chomp(%fields); -$webroot = "../../.."; +$webroot = ".."; print < -
+ Title: From 10506701390557b39757991e1238d10426eac22a Mon Sep 17 00:00:00 2001 From: Matthew Thiffault Date: Wed, 11 Mar 2009 00:32:43 -0400 Subject: [PATCH 12/16] The header is now generated from the directory.xml file, and the library icon is no longer the gallery icon. --- buttons/library.png | Bin 0 -> 473 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 buttons/library.png diff --git a/buttons/library.png b/buttons/library.png new file mode 100644 index 0000000000000000000000000000000000000000..534b710b1e91a971b55860b95189db795ff4e92e GIT binary patch literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK#^NA%Cx&(BWL^R}Q2{<7uK)l4 z|Ni~^`}gmkJ$rWV-o0zruAMn^=IGI*d-v|$x^?T?wQH9yT{?5-%$}Z}mX?<4>gwX+ z;{XE)7O>#CNn1^qrqR_oyUPfKRjI=Lo80e4SCDg zWWb|i%&2&y;fzfOxYO|!~4z__kpzAf8kp5lDp z83Hv`+}VpA3Ozh(?AAUy^lAd@x-3Wb9#-qL^E+(z9!aa6)#G#Ny|QvzOW2Z@8#&XA z7N@xOxJ-V3hHr<}4q1t(_cYs$(kv&O6w6cO`PR(WsG}U9_A{#TUG`3TceI@xM(W{`{eHmS@5>-oZtPJYLqzVs%4xl54s-sdf=O={ca*uFdK znm^+?_fl+GyV33N Date: Wed, 11 Mar 2009 00:37:34 -0400 Subject: [PATCH 13/16] Actually commit the changes this time. --- buttons/Makefile | 3 ++- library/index.cgi | 48 ++++++++++++++++++++++++++++++++++++----------- menu.xml | 2 +- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/buttons/Makefile b/buttons/Makefile index 56201dd..f33fe0c 100644 --- a/buttons/Makefile +++ b/buttons/Makefile @@ -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 diff --git a/library/index.cgi b/library/index.cgi index 1c04396..94334d8 100755 --- a/library/index.cgi +++ b/library/index.cgi @@ -16,7 +16,7 @@ $in = $ENV{'QUERY_STRING'}; @pairs = split(/[&=]/,$in); %fields = @pairs; chomp(%fields); -$webroot = ".."; +$webroot = "../../.."; print <Computer Science Club
-HOME -Services -Office -Events -Media -Wiki -Webmail -Gallery -Stats -


END + +open(DIR,"/users/www/www/directory.xml") or print "Couldn't open file\n"; +@items = ; +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; + + print "$fields{'title'}\n"; + + } +} + +print "


\n"; + #display the search form if($fields{'do'} eq "home" || $fields{'do'} eq ""){ diff --git a/menu.xml b/menu.xml index f9d1600..031771d 100644 --- a/menu.xml +++ b/menu.xml @@ -10,5 +10,5 @@ - + From 9dbdedea0e9e0653db361e5da7b0d9e42941e812 Mon Sep 17 00:00:00 2001 From: Matthew Thiffault Date: Wed, 11 Mar 2009 00:54:50 -0400 Subject: [PATCH 14/16] Fixed a slight problem involving the script not searching for anything. --- library/index.cgi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/library/index.cgi b/library/index.cgi index 94334d8..7c0e8d8 100755 --- a/library/index.cgi +++ b/library/index.cgi @@ -14,9 +14,9 @@ print "Content-type: text/html\n\n"; $in = $ENV{'QUERY_STRING'}; @pairs = split(/[&=]/,$in); -%fields = @pairs; -chomp(%fields); -$webroot = "../../.."; +%field = @pairs; +chomp(%field); +$webroot = ".."; print <

\n"; #display the search form -if($fields{'do'} eq "home" || $fields{'do'} eq ""){ +if($field{'do'} eq "home" || $field{'do'} eq ""){ #isbn,title,authors,year,edition,publisher @@ -116,7 +116,7 @@ END } #query the database -if($fields{'do'} eq "query"){ +if($field{'do'} eq "query"){ print "

Search Results

"; @@ -131,15 +131,15 @@ if($fields{'do'} eq "query"){ $orterm = undef; @results; @oresults; - $title = $fields{'title'}; + $title = $field{'title'}; $title =~ s/[';:"]/ /g; - $publisher = $fields{'publisher'}; + $publisher = $field{'publisher'}; $publisher =~ s/[';:"]/ /g; - $edition = $fields{'edition'}; + $edition = $field{'edition'}; $edition =~ s/[';:"]/ /g; - $year = $fields{'year'}; + $year = $field{'year'}; $year =~ s/[';:"]/ /g; - $isbn = $fields{'isbn'}; + $isbn = $field{'isbn'}; $isbn =~ s/[';:"]/ /g; if($title){ From e325bb8059ce64d22daee98c3a65e86989f882fa Mon Sep 17 00:00:00 2001 From: Matthew Thiffault Date: Wed, 11 Mar 2009 00:59:53 -0400 Subject: [PATCH 15/16] Fixed broken links. --- library/index.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/index.cgi b/library/index.cgi index 7c0e8d8..76bd6fc 100755 --- a/library/index.cgi +++ b/library/index.cgi @@ -68,7 +68,7 @@ foreach $item (@items){ $fields{'title'} =~ s/"//g; - print "$fields{'title'}\n"; + print "$fields{'title'}\n"; } } From dd1f2a234f637f900b39d82404258f62ce3ca15a Mon Sep 17 00:00:00 2001 From: Matthew Thiffault Date: Wed, 11 Mar 2009 01:13:55 -0400 Subject: [PATCH 16/16] Fixing more broken links. --- directory.xml | 9 +++++---- library/index.cgi | 11 +++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/directory.xml b/directory.xml index abf3bf2..f7e7a35 100644 --- a/directory.xml +++ b/directory.xml @@ -8,8 +8,9 @@ - - - - + + + + + diff --git a/library/index.cgi b/library/index.cgi index 76bd6fc..6195400 100755 --- a/library/index.cgi +++ b/library/index.cgi @@ -67,9 +67,12 @@ foreach $item (@items){ chomp($fields{'href'}); $fields{'title'} =~ s/"//g; - - print "$fields{'title'}\n"; - + + if($fields{'absolute'} =~ /true/){ + print "$fields{'title'}\n"; + }else{ + print "$fields{'title'}\n"; + } } } @@ -79,7 +82,7 @@ print "


\n"; if($field{'do'} eq "home" || $field{'do'} eq ""){ #isbn,title,authors,year,edition,publisher - + print <