ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/gde/GCE/Util.pm
(Generate patch)

Comparing deliantra/gde/GCE/Util.pm (file contents):
Revision 1.18 by elmex, Thu Jun 1 14:33:14 2006 UTC vs.
Revision 1.22 by elmex, Tue Nov 28 16:26:22 2006 UTC

… …
16use List::Util qw(min max); 16use List::Util qw(min max);
17 17
18use Crossfire; 18use Crossfire;
19use Crossfire::MapWidget; 19use Crossfire::MapWidget;
20use File::Spec::Functions; 20use File::Spec::Functions;
21use File::Basename;
22use File::Path;
23use HTTP::Request::Common;
21use Cwd 'abs_path'; 24use Cwd 'abs_path';
22 25
23our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb 26our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb
24 fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall 27 fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall
25 stack_find arch_is_wall arch_is_monster add_table_widget quick_msg 28 stack_find arch_is_wall arch_is_monster add_table_widget quick_msg
… …
71 my ($dest, $mape) = @_; 74 my ($dest, $mape) = @_;
72 75
73 $mappath = abs_path $mappath; 76 $mappath = abs_path $mappath;
74 my $dir; 77 my $dir;
75 if (File::Spec->file_name_is_absolute($dest)) { 78 if (File::Spec->file_name_is_absolute($dest)) {
76 $dir = catdir ($::CFG->{MAPDIR}, $dest); 79 $dir = catdir ($::MAPDIR, $dest);
77 } else { 80 } else {
78 my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); 81 my ($v, $p, $f) = File::Spec->splitpath ($mape->{path});
79 $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); 82 $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p));
80 } 83 }
81 return $dir; 84 return $dir;
… …
156} 159}
157 160
158sub arch_is_floor { 161sub arch_is_floor {
159 my ($a) = @_; 162 my ($a) = @_;
160 my $ar = Crossfire::arch_attr $a; 163 my $ar = Crossfire::arch_attr $a;
164 return (
161 return (substr $ar->{name}, 0, 5) eq 'Floor'; 165 (substr $ar->{name}, 0, 5) eq 'Floor'
166 or (substr $ar->{name}, 0, 10) eq 'Shop Floor'
167 )
162} 168}
163 169
164sub arch_is_connector { 170sub arch_is_connector {
165 my ($a) = @_; 171 my ($a) = @_;
166 my $ar = Crossfire::arch_attr $a; 172 my $ar = Crossfire::arch_attr $a;
… …
348 } 354 }
349 355
350 return \@outstack; 356 return \@outstack;
351} 357}
352 358
359sub upload {
360 my ($login, $password, $srcrep, $path, $rev, $mapdata) = @_;
361 require LWP::UserAgent;
362 my $ua = LWP::UserAgent->new (
363 agent => "gcrossedit",
364 keep_alive => 1,
365 env_proxy => 1,
366 timeout => 30,
367 );
368 require HTTP::Request::Common;
369
370 my $res = $ua->post (
371 $ENV{CFPLUS_UPLOAD},
372 Content_Type => 'multipart/form-data',
373 Content => [
374 path => $path,
375 mapdir => $srcrep,
376 map => $mapdata,
377 revision => $rev,
378 cf_login => $login, #ENV{CFPLUS_LOGIN},
379 cf_password => $password, #ENV{CFPLUS_PASSWORD},
380 comment => "",
381 ]
382 );
383
384 if ($res->is_error) {
385 # fatal condition
386 warn $res->status_line;
387 } else {
388 # script replies are marked as {{..}}
389 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
390 warn map "$_\n", @msgs;
391 }
392}
393
353=head1 AUTHOR 394=head1 AUTHOR
354 395
355 Marc Lehmann <schmorp@schmorp.de> 396 Marc Lehmann <schmorp@schmorp.de>
356 http://home.schmorp.de/ 397 http://home.schmorp.de/
357 398

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines