annotate reproctool.cgi @ 25:ccbd8fa63b9f

Adding a cache for mineral marks
author Dominic Cleal <dominic@computerkb.co.uk>
date Sun, 25 Jan 2009 17:29:07 +0000
parents 266c93756c1b
children be92d2f1ab3f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
1 #!/usr/bin/perl -T
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
2
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
3 use warnings;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
4 use strict;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
5
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
6 use CGI;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
7 use DBI;
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
8 use LWP::UserAgent;
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
9 use Storable qw/store_fd fd_retrieve/;
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
10
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
11 # Settings
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
12 my $img_http_path = '/itemimgs';
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
13 my $eve_central_url = 'http://eve-central.com/api/evemon';
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
14 my $marks_cache = 'minerals.cache';
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
15 my $marks_cache_expiry = 4 * 60 * 60; # 4 hours
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
16
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
17 my $cgi = new CGI;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
18 print $cgi->header(-type => 'text/html',
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
19 -pragma => 'no-cache',
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
20 -expires => '-365d');
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
21
12
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
22 sub user_error
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
23 {
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
24 my $text = shift;
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
25 print<<END;
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
26 <html><head><title>Error</title></head>
13
135adaf0eed2 Colour!
Dominic Cleal <dominic@computerkb.co.uk>
parents: 12
diff changeset
27 <body><font color="#FF0000"><b>Error:</b></font> $text</body></html>
12
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
28 END
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
29 exit;
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
30 }
6d5296efb9ef Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents: 11
diff changeset
31
24
266c93756c1b Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents: 21
diff changeset
32 # Inputs
266c93756c1b Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents: 21
diff changeset
33 my $cols = $cgi->param('cols') || 4;
266c93756c1b Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents: 21
diff changeset
34 my $str_items = $cgi->param('items');
266c93756c1b Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents: 21
diff changeset
35
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
36 # Generate the first page, where eve-central mineral prices are prefilled.
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
37 # TODO: depending on the traffic, cache these eve-central prices.
24
266c93756c1b Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents: 21
diff changeset
38
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
39 unless ($str_items)
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
40 {
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
41 my $marks;
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
42 if (-e $marks_cache)
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
43 {
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
44 open CACHE, "< $marks_cache" || die("Can't open cache $marks_cache: $!");
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
45 $marks = fd_retrieve(*CACHE) || die("Can't read marks from cache: $!");
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
46 close CACHE;
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
47
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
48 if (time > ($marks->{timestamp} + $marks_cache_expiry))
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
49 {
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
50 $marks = undef;
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
51 }
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
52 else
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
53 {
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
54 delete $marks->{timestamp};
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
55 }
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
56 }
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
57
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
58 unless ($marks)
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
59 {
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
60 my $ua = LWP::UserAgent->new;
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
61 $ua->agent('reproctool');
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
62 my $resp = $ua->request(HTTP::Request->new(GET => $eve_central_url));
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
63
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
64 if ($resp->is_success)
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
65 {
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
66 $marks = { timestamp => time };
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
67 foreach (split(/[\n\r]/, $resp->content))
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
68 {
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
69 next unless (/<name>(.+)<\/name>.*<price>([0-9\.]+)<\/price>/i);
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
70 $marks->{$1} = $2;
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
71 }
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
72
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
73 if (-e $marks_cache)
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
74 {
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
75 unlink $marks_cache
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
76 || die("Unable to unlink cache $marks_cache: $!");
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
77 }
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
78
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
79 open CACHE, "> $marks_cache"
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
80 || die("Can't open cache $marks_cache to write: $!");
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
81 store_fd($marks, *CACHE) || die("Can't write to cache: $!");
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
82 close CACHE;
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
83 }
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
84 else
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
85 {
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
86 $marks->{$_} = 1 foreach ('Tritanium', 'Pyerite', 'Mexallon',
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
87 'Isogen', 'Nocxium', 'Zydrine',
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
88 'Megacyte', 'Morphite');
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
89 }
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
90 }
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
91
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
92 # What evenutally will be printed.
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
93 print<<END;
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
94 <html>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
95 <body>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
96
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
97 <form method="post">
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
98 <textarea rows="5" cols="80" name="items"></textarea>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
99 <table border="0" cellspacing="4">
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
100 <tr>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
101 END
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
102 # Lists the name of the minerals.
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
103 print "<td>$_</td>\n" foreach (keys %{$marks});
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
104 print "</tr><tr>";
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
105
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
106 foreach (keys %{$marks})
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
107 {
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
108 my $sname = lc substr($_, 0, 4);
25
ccbd8fa63b9f Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents: 24
diff changeset
109 my $fmt = sprintf('%.2f', $marks->{$_});
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
110 print "<td><input type='text' name='$sname' size='7' value='$fmt' /></td>\n";
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
111 }
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
112
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
113 print <<END;
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
114 </tr>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
115 </table>
18
67f13a371c18 Adding columns input
Dominic Cleal <dominic@computerkb.co.uk>
parents: 17
diff changeset
116 Columns: <input type='text' name='cols' size='2' value='4' /><br /><br />
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
117 <input type="submit" />
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
118 </form>
21
5ae40a1161e6 Added eve central credit (still need to cache some vals, got an idea on that dom?)
df
parents: 20
diff changeset
119 <br />
5ae40a1161e6 Added eve central credit (still need to cache some vals, got an idea on that dom?)
df
parents: 20
diff changeset
120 Mineral prices are empire averages from <a href="http://www.eve-central.com/">Eve-central</a>.
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
121 </body>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
122 </html>
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
123 END
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
124
17
a79168f03fc4 Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents: 16
diff changeset
125 exit;
8
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
126 }
ccd5e74fa58e Untested xml import of prices from evecentral. solution is a dead end, as the rammsrdi.com dont support dom xlm.
df
parents: 7
diff changeset
127
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
128 # Load mineral prices
15
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
129 my $trit = $cgi->param('trit') || user_error('No tritanium price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
130 my $pyer = $cgi->param('pyer') || user_error('No pyerite price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
131 my $mexa = $cgi->param('mexa') || user_error('No mexallon price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
132 my $isog = $cgi->param('isog') || user_error('No isogen price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
133 my $nocx = $cgi->param('nocx') || user_error('No nocxium price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
134 my $zydr = $cgi->param('zydr') || user_error('No zydrine price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
135 my $mega = $cgi->param('mega') || user_error('No megacyte price');
50d8619bce32 Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents: 14
diff changeset
136 my $morp = $cgi->param('morp') || user_error('No morphite price');
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
137
3
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
138 our @dbparams;
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
139 require './dbparams.cgi';
1
c39512d94605 Adding dbparams config
Dominic Cleal <dominic@computerkb.co.uk>
parents: 0
diff changeset
140 my $db = DBI->connect(@dbparams)
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
141 or die("Database connection failure: $DBI::errstr");
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
142
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
143 # Strip out line endings
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
144 $str_items =~ s/[\n\r]+//g;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
145
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
146 # If the items string contains the contract info too, strip it out
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
147 $str_items = $1 if ($str_items =~ /The container .+ contains the following items:(.+)/);
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
148 $str_items = $1 if ($str_items =~ /(.+)Are you sure you want to continue?/);
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
149
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
150 my @item_names = split(/\s*,\s*/, $str_items);
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
151
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
152 # SQL fragment to match all items
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
153 my $sql_typenames = '';
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
154 $sql_typenames = 'types.typeName = ?' if ($#item_names >= 0);
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
155 $sql_typenames .= " OR types.typeName = ?" foreach (1..$#item_names);
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
156
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
157 # SQL lookup for reprocessing amounts
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
158 my $sql_reprocess = <<END;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
159 SELECT
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
160 types.typeID,
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
161 types.typeName,
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
162 groups.groupName,
3
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
163 attrs.valueInt, -- metaLevel
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
164 types.basePrice,
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
165 graphics.icon,
3
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
166 SUM(CASE WHEN m1.requiredTypeID = 34 THEN m1.quantity ELSE 0 END), -- [Tritanium]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
167 SUM(CASE WHEN m1.requiredTypeID = 35 THEN m1.quantity ELSE 0 END), -- [Pyerite]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
168 SUM(CASE WHEN m1.requiredTypeID = 36 THEN m1.quantity ELSE 0 END), -- [Mexallon]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
169 SUM(CASE WHEN m1.requiredTypeID = 37 THEN m1.quantity ELSE 0 END), -- [Isogen]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
170 SUM(CASE WHEN m1.requiredTypeID = 38 THEN m1.quantity ELSE 0 END), -- [Nocxium]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
171 SUM(CASE WHEN m1.requiredTypeID = 39 THEN m1.quantity ELSE 0 END), -- [Zydrine]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
172 SUM(CASE WHEN m1.requiredTypeID = 40 THEN m1.quantity ELSE 0 END), -- [Megacyte]
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
173 SUM(CASE WHEN m1.requiredTypeID = 11399 THEN m1.quantity ELSE 0 END) -- [Morphite]
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
174 FROM invTypes types
11
f749981ad862 Fixes items with no metalevel attribute, improves sorting
Dominic Cleal <dominic@computerkb.co.uk>
parents: 10
diff changeset
175 LEFT JOIN dgmTypeAttributes attrs ON types.typeID = attrs.typeID AND attrs.attributeID = 633
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
176 INNER JOIN typeActivityMaterials m1 ON types.typeID = m1.typeID
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
177 INNER JOIN invGroups groups ON types.groupID = groups.groupID
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
178 INNER JOIN eveGraphics graphics ON types.graphicID = graphics.graphicID
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
179 WHERE $sql_typenames
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
180 GROUP BY types.typeID
11
f749981ad862 Fixes items with no metalevel attribute, improves sorting
Dominic Cleal <dominic@computerkb.co.uk>
parents: 10
diff changeset
181 ORDER BY groups.categoryID DESC, groupName ASC, typeName ASC
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
182 END
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
183 my $pre_reprocess = $db->prepare($sql_reprocess);
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
184
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
185 # Execute, bring back one row per item
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
186 my ($tid, $tname, $gname, $meta, $basePrice, $icon,
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
187 $ttrit, $tpyer, $tmexa, $tisog, $tnocx, $tzydr, $tmega, $tmorp);
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
188
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
189 $pre_reprocess->execute(@item_names) or die("Can't lookup items: $DBI::errstr");
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
190 $pre_reprocess->bind_columns(undef, \$tid, \$tname, \$gname, \$meta, \$basePrice,
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
191 \$icon, \$ttrit, \$tpyer, \$tmexa, \$tisog,
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
192 \$tnocx, \$tzydr, \$tmega, \$tmorp);
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
193
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
194 my @output = ();
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
195 while ($pre_reprocess->fetch())
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
196 {
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
197 my $item = {};
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
198 my $isk = ($trit * $ttrit) + ($pyer * $tpyer) + ($mexa * $tmexa) +
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
199 ($isog * $tisog) + ($nocx * $tnocx) + ($zydr * $tzydr) +
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
200 ($mega * $tmega) + ($morp * $tmorp);
20
877806fb69a3 Fixed double use of var, and added reprocessing details in ALT
df
parents: 18
diff changeset
201 my $repDetails = sprintf( "Trit=%d Py=%d Mex=%d Iso=%d Nocx=%d Zyd=%d Mega=%d Morp=%d",
877806fb69a3 Fixed double use of var, and added reprocessing details in ALT
df
parents: 18
diff changeset
202 $ttrit, $tpyer, $tmexa, $tisog, $tnocx, $tzydr, $tmega, $tmorp );
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
203
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
204 $meta = 0 unless defined $meta;
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
205 $item = { id => $tid, name => $tname, meta => $meta, icon => $icon,
20
877806fb69a3 Fixed double use of var, and added reprocessing details in ALT
df
parents: 18
diff changeset
206 price => $basePrice, reprocessIsk => $isk, reprocessDetails => $repDetails };
9
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
207
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
208 # If this item exists multiple times in the input, then they weren't stacked
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
209 # so output it multiple times
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
210 my @matching_in = grep({ $_ eq $tname } @item_names);
6b98a17fbe22 Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents: 7
diff changeset
211 push @output, $item foreach (0..$#matching_in);
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
212 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
213
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
214 my $col = 0;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
215 print<<END;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
216 <html>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
217 <head>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
218 <style type="text/css">
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
219 .meta4, .meta5, .meta6, .meta7, .meta8, .meta9
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
220 {
5
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
221 color: #FF0000;
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
222 }
3
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
223 .item
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
224 {
4
4351c0bf33d4 Improving IGB formatting
Dominic Cleal <dominic@computerkb.co.uk>
parents: 3
diff changeset
225 text-align: center;
3
e640eb6cefc3 Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents: 1
diff changeset
226 }
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
227 </style>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
228 </head>
4
4351c0bf33d4 Improving IGB formatting
Dominic Cleal <dominic@computerkb.co.uk>
parents: 3
diff changeset
229
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
230 <body>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
231 <table>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
232 END
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
233
10
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
234 my $igb = ($ENV{HTTP_USER_AGENT} =~ /EVE-minibrowser/i);
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
235
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
236 for my $item (@output)
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
237 {
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
238 if ($col == $cols)
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
239 {
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
240 print "</tr><tr>\n";
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
241 $col = 0;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
242 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
243
5
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
244 my ($style, $img, $text, $link, $colour);
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
245
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
246 if (defined $item->{id})
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
247 {
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
248 $style = "meta$item->{meta}";
10
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
249 if ($igb)
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
250 {
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
251 $img = "typeicon:$item->{id}";
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
252 $link = "showinfo:$item->{id}";
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
253 }
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
254 else
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
255 {
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
256 $img = "$img_http_path/icons/icons_items_png/64_64/icon$item->{icon}.png";
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
257 }
de10d02dc715 Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents: 9
diff changeset
258
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
259 if ($item->{meta} == 4)
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
260 {
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
261 $text = $item->{name};
5
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
262 $colour = "#FF0000";
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
263 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
264 else
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
265 {
20
877806fb69a3 Fixed double use of var, and added reprocessing details in ALT
df
parents: 18
diff changeset
266 $text = $item->{reprocessIsk};
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
267 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
268 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
269 else
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
270 {
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
271 $text = 'Unknown item';
5
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
272 $img = "typeicon:07_15";
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
273 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
274
5
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
275 print "<td width='64' class='item'>";
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
276 print "<a href='$link'>" if defined $link;
14
9b8670ac1bcc Adding title attr to images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 13
diff changeset
277 print "<img src='$img' width='64' height='64' border='1' ";
20
877806fb69a3 Fixed double use of var, and added reprocessing details in ALT
df
parents: 18
diff changeset
278 print "title=\"$item->{name}\" alt=\"$item->{name} ($item->{reprocessDetails})\" />";
5
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
279 print "</a>" if defined $link;
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
280 print "<br />";
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
281 print "<font color='$colour'>" if defined $colour;
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
282 print $text;
42268fc087a9 Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents: 4
diff changeset
283 print "</font>" if defined $colour;
0
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
284 print "</td>\n";
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
285
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
286 $col++;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
287 }
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
288
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
289 print<<END;
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
290 </tr>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
291 </table>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
292 </body>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
293 </html>
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
294 END
9c46727ce7ab Initial version
Dominic Cleal <dominic@computerkb.co.uk>
parents:
diff changeset
295