Mercurial > hg > reproctool-df
annotate reproctool.cgi @ 28:61fb1a6de2c5
Fixing timestamp entry sometimes left
author | Dominic Cleal <dominic@computerkb.co.uk> |
---|---|
date | Sun, 25 Jan 2009 17:36:03 +0000 |
parents | 789877ff0e1a |
children | 420807d41e04 |
rev | line source |
---|---|
0 | 1 #!/usr/bin/perl -T |
2 | |
3 use warnings; | |
4 use strict; | |
5 | |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
6 use Switch; |
0 | 7 use CGI; |
8 use DBI; | |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
9 use LWP::UserAgent; |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
10 use Storable qw/store_fd fd_retrieve/; |
0 | 11 |
27
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
12 # Settings from params.cgi |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
13 our (@dbparams, $img_http_path, $eve_central_url, |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
14 $marks_cache, $marks_cache_expiry); |
0 | 15 |
27
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
16 $img_http_path = '/itemimgs'; |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
17 $eve_central_url = 'http://eve-central.com/api/evemon'; |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
18 $marks_cache = 'minerals.cache'; |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
19 $marks_cache_expiry = 4 * 60 * 60; # 4 hours |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
20 |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
21 require './params.cgi'; |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
22 |
789877ff0e1a
Changing dbparams to contain all settings
Dominic Cleal <dominic@computerkb.co.uk>
parents:
26
diff
changeset
|
23 # Begin script |
0 | 24 my $cgi = new CGI; |
25 print $cgi->header(-type => 'text/html', | |
26 -pragma => 'no-cache', | |
27 -expires => '-365d'); | |
28 | |
12
6d5296efb9ef
Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents:
11
diff
changeset
|
29 sub user_error |
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 my $text = shift; |
6d5296efb9ef
Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents:
11
diff
changeset
|
32 print<<END; |
6d5296efb9ef
Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents:
11
diff
changeset
|
33 <html><head><title>Error</title></head> |
13 | 34 <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
|
35 END |
6d5296efb9ef
Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents:
11
diff
changeset
|
36 exit; |
6d5296efb9ef
Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents:
11
diff
changeset
|
37 } |
6d5296efb9ef
Shows user-errors to output, not dying
Dominic Cleal <dominic@computerkb.co.uk>
parents:
11
diff
changeset
|
38 |
24
266c93756c1b
Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents:
21
diff
changeset
|
39 # Inputs |
266c93756c1b
Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents:
21
diff
changeset
|
40 my $cols = $cgi->param('cols') || 4; |
266c93756c1b
Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents:
21
diff
changeset
|
41 my $str_items = $cgi->param('items'); |
266c93756c1b
Putting inputs next to each other again
Dominic Cleal <dominic@computerkb.co.uk>
parents:
21
diff
changeset
|
42 |
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
|
43 # 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
|
44 # 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
|
45 |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
46 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
|
47 { |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
48 my $marks; |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
49 if (-e $marks_cache) |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
50 { |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
51 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
|
52 $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
|
53 close CACHE; |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
54 |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
55 if (time > ($marks->{timestamp} + $marks_cache_expiry)) |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
56 { |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
57 $marks = undef; |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
58 } |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
59 } |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
60 |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
61 unless ($marks) |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
62 { |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
63 my $ua = LWP::UserAgent->new; |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
64 $ua->agent('reproctool'); |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
65 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
|
66 |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
67 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
|
68 { |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
69 $marks = { timestamp => time }; |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
70 foreach (split(/[\n\r]/, $resp->content)) |
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 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
|
73 $marks->{$1} = $2; |
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 |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
76 if (-e $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 unlink $marks_cache |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
79 || die("Unable to unlink cache $marks_cache: $!"); |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
80 } |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
81 |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
82 open CACHE, "> $marks_cache" |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
83 || 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
|
84 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
|
85 close CACHE; |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
86 } |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
87 else |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
88 { |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
89 $marks->{$_} = 1 foreach ('Tritanium', 'Pyerite', 'Mexallon', |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
90 'Isogen', 'Nocxium', 'Zydrine', |
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
91 'Megacyte', 'Morphite'); |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
92 } |
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
93 } |
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
94 |
28
61fb1a6de2c5
Fixing timestamp entry sometimes left
Dominic Cleal <dominic@computerkb.co.uk>
parents:
27
diff
changeset
|
95 delete $marks->{timestamp} if exists $marks->{timestamp}; |
61fb1a6de2c5
Fixing timestamp entry sometimes left
Dominic Cleal <dominic@computerkb.co.uk>
parents:
27
diff
changeset
|
96 |
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
|
97 # 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
|
98 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
|
99 <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
|
100 <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
|
101 |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
102 <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
|
103 <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
|
104 <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
|
105 <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
|
106 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
|
107 # Lists the name of the minerals. |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
108 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
|
109 print "</tr><tr>"; |
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
110 |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
111 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
|
112 { |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
113 my $sname = lc substr($_, 0, 4); |
25
ccbd8fa63b9f
Adding a cache for mineral marks
Dominic Cleal <dominic@computerkb.co.uk>
parents:
24
diff
changeset
|
114 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
|
115 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
|
116 } |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
117 |
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
118 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
|
119 </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
|
120 </table> |
18
67f13a371c18
Adding columns input
Dominic Cleal <dominic@computerkb.co.uk>
parents:
17
diff
changeset
|
121 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
|
122 <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
|
123 </form> |
21
5ae40a1161e6
Added eve central credit (still need to cache some vals, got an idea on that dom?)
df
parents:
20
diff
changeset
|
124 <br /> |
5ae40a1161e6
Added eve central credit (still need to cache some vals, got an idea on that dom?)
df
parents:
20
diff
changeset
|
125 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
|
126 </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
|
127 </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
|
128 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
|
129 |
17
a79168f03fc4
Replacing XML::DOM with LWP and regex, tidying code
Dominic Cleal <dominic@computerkb.co.uk>
parents:
16
diff
changeset
|
130 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
|
131 } |
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
|
132 |
0 | 133 # Load mineral prices |
15
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
134 my $trit = $cgi->param('trit') || user_error('No tritanium price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
135 my $pyer = $cgi->param('pyer') || user_error('No pyerite price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
136 my $mexa = $cgi->param('mexa') || user_error('No mexallon price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
137 my $isog = $cgi->param('isog') || user_error('No isogen price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
138 my $nocx = $cgi->param('nocx') || user_error('No nocxium price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
139 my $zydr = $cgi->param('zydr') || user_error('No zydrine price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
140 my $mega = $cgi->param('mega') || user_error('No megacyte price'); |
50d8619bce32
Improving mineral errors
Dominic Cleal <dominic@computerkb.co.uk>
parents:
14
diff
changeset
|
141 my $morp = $cgi->param('morp') || user_error('No morphite price'); |
0 | 142 |
1
c39512d94605
Adding dbparams config
Dominic Cleal <dominic@computerkb.co.uk>
parents:
0
diff
changeset
|
143 my $db = DBI->connect(@dbparams) |
0 | 144 or die("Database connection failure: $DBI::errstr"); |
145 | |
146 # Strip out line endings | |
147 $str_items =~ s/[\n\r]+//g; | |
148 | |
149 # If the items string contains the contract info too, strip it out | |
150 $str_items = $1 if ($str_items =~ /The container .+ contains the following items:(.+)/); | |
151 $str_items = $1 if ($str_items =~ /(.+)Are you sure you want to continue?/); | |
152 | |
9
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 @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
|
154 |
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 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
|
156 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
|
157 $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
|
158 $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
|
159 |
0 | 160 # SQL lookup for reprocessing amounts |
161 my $sql_reprocess = <<END; | |
162 SELECT | |
163 types.typeID, | |
164 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
|
165 groups.groupName, |
3
e640eb6cefc3
Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents:
1
diff
changeset
|
166 attrs.valueInt, -- metaLevel |
0 | 167 types.basePrice, |
168 graphics.icon, | |
3
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 = 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
|
170 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
|
171 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
|
172 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
|
173 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
|
174 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
|
175 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
|
176 SUM(CASE WHEN m1.requiredTypeID = 11399 THEN m1.quantity ELSE 0 END) -- [Morphite] |
0 | 177 FROM invTypes types |
11
f749981ad862
Fixes items with no metalevel attribute, improves sorting
Dominic Cleal <dominic@computerkb.co.uk>
parents:
10
diff
changeset
|
178 LEFT JOIN dgmTypeAttributes attrs ON types.typeID = attrs.typeID AND attrs.attributeID = 633 |
0 | 179 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
|
180 INNER JOIN invGroups groups ON types.groupID = groups.groupID |
0 | 181 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
|
182 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
|
183 GROUP BY types.typeID |
11
f749981ad862
Fixes items with no metalevel attribute, improves sorting
Dominic Cleal <dominic@computerkb.co.uk>
parents:
10
diff
changeset
|
184 ORDER BY groups.categoryID DESC, groupName ASC, typeName ASC |
0 | 185 END |
186 my $pre_reprocess = $db->prepare($sql_reprocess); | |
187 | |
9
6b98a17fbe22
Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents:
7
diff
changeset
|
188 # 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
|
189 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
|
190 $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
|
191 |
6b98a17fbe22
Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents:
7
diff
changeset
|
192 $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
|
193 $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
|
194 \$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
|
195 \$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
|
196 |
0 | 197 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
|
198 while ($pre_reprocess->fetch()) |
0 | 199 { |
200 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
|
201 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
|
202 ($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
|
203 ($mega * $tmega) + ($morp * $tmorp); |
20
877806fb69a3
Fixed double use of var, and added reprocessing details in ALT
df
parents:
18
diff
changeset
|
204 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
|
205 $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
|
206 |
6b98a17fbe22
Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents:
7
diff
changeset
|
207 $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
|
208 $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
|
209 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
|
210 |
6b98a17fbe22
Changing to a single SQL query for type-based sorting and efficiency
Dominic Cleal <dominic@computerkb.co.uk>
parents:
7
diff
changeset
|
211 # 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
|
212 # 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
|
213 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
|
214 push @output, $item foreach (0..$#matching_in); |
0 | 215 } |
216 | |
217 my $col = 0; | |
218 print<<END; | |
219 <html> | |
220 <head> | |
221 <style type="text/css"> | |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
222 .reg |
3
e640eb6cefc3
Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents:
1
diff
changeset
|
223 { |
4
4351c0bf33d4
Improving IGB formatting
Dominic Cleal <dominic@computerkb.co.uk>
parents:
3
diff
changeset
|
224 text-align: center; |
3
e640eb6cefc3
Making DB stuff more generic, fixing missing mineral
Dominic Cleal <dominic@computerkb.co.uk>
parents:
1
diff
changeset
|
225 } |
0 | 226 </style> |
227 </head> | |
4
4351c0bf33d4
Improving IGB formatting
Dominic Cleal <dominic@computerkb.co.uk>
parents:
3
diff
changeset
|
228 |
0 | 229 <body> |
230 <table> | |
231 END | |
232 | |
10
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
233 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
|
234 |
0 | 235 for my $item (@output) |
236 { | |
237 if ($col == $cols) | |
238 { | |
239 print "</tr><tr>\n"; | |
240 $col = 0; | |
241 } | |
242 | |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
243 my ($img, $text, $link, $colour); |
0 | 244 |
245 if (defined $item->{id}) | |
246 { | |
10
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
247 if ($igb) |
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
248 { |
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
249 $img = "typeicon:$item->{id}"; |
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
250 $link = "showinfo:$item->{id}"; |
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
251 } |
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
252 else |
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 $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
|
255 } |
de10d02dc715
Using item images for non-IGB browsers
Dominic Cleal <dominic@computerkb.co.uk>
parents:
9
diff
changeset
|
256 |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
257 switch ($item->{meta}) |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
258 { |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
259 case 0 { $colour = "#666600"; } |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
260 case 1 { $colour = "#777777"; } |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
261 case 2 { $colour = "#BBBBBB"; } |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
262 case 3 { $colour = "#FFFFFF"; } |
23 | 263 case 4 { $colour = "#4444FF"; } |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
264 case 5 { $colour = "#FF0000"; } |
23 | 265 case [6..30]{ $colour = "#00FF00"; } |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
266 } |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
267 |
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
268 if ($item->{meta} >= 4) |
0 | 269 { |
270 $text = $item->{name}; | |
271 } | |
272 else | |
273 { | |
20
877806fb69a3
Fixed double use of var, and added reprocessing details in ALT
df
parents:
18
diff
changeset
|
274 $text = $item->{reprocessIsk}; |
0 | 275 } |
276 } | |
277 else | |
278 { | |
279 $text = 'Unknown item'; | |
5
42268fc087a9
Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents:
4
diff
changeset
|
280 $img = "typeicon:07_15"; |
0 | 281 } |
282 | |
22
66a63068fb23
Cleaned up the styles and added colour s on meta level .... the happy colour show.
df
parents:
21
diff
changeset
|
283 print "<td width='64' class='reg'>"; |
5
42268fc087a9
Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents:
4
diff
changeset
|
284 print "<a href='$link'>" if defined $link; |
14
9b8670ac1bcc
Adding title attr to images
Dominic Cleal <dominic@computerkb.co.uk>
parents:
13
diff
changeset
|
285 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
|
286 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
|
287 print "</a>" if defined $link; |
42268fc087a9
Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents:
4
diff
changeset
|
288 print "<br />"; |
42268fc087a9
Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents:
4
diff
changeset
|
289 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
|
290 print $text; |
42268fc087a9
Improving IGB integration with links and images
Dominic Cleal <dominic@computerkb.co.uk>
parents:
4
diff
changeset
|
291 print "</font>" if defined $colour; |
0 | 292 print "</td>\n"; |
293 | |
294 $col++; | |
295 } | |
296 | |
297 print<<END; | |
298 </tr> | |
299 </table> | |
300 </body> | |
301 </html> | |
302 END | |
303 |