projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r11022,
[freeside.git]
/
FS
/
FS
/
part_export
/
http.pm
diff --git
a/FS/FS/part_export/http.pm
b/FS/FS/part_export/http.pm
index
9a216c1
..
3749224
100644
(file)
--- a/
FS/FS/part_export/http.pm
+++ b/
FS/FS/part_export/http.pm
@@
-33,6
+33,10
@@
tie %options, 'Tie::IxHash',
default => join("\n",
),
},
default => join("\n",
),
},
+ 'success_regexp' => {
+ label => 'Success Regexp',
+ default => '',
+ },
;
%info = (
;
%info = (
@@
-71,6
+75,7
@@
sub _export_command {
$self->http_queue( $svc_x->svcnum,
$self->option('method'),
$self->option('url'),
$self->http_queue( $svc_x->svcnum,
$self->option('method'),
$self->option('url'),
+ $self->option('success_regexp'),
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
@@
-90,13
+95,16
@@
sub _export_replace {
my $new_cust_main = $new->table eq 'cust_main'
? $new
: $new->cust_svc->cust_pkg->cust_main;
my $new_cust_main = $new->table eq 'cust_main'
? $new
: $new->cust_svc->cust_pkg->cust_main;
+ my $cust_main = $new_cust_main; #so folks can use $new_cust_main or $cust_main
- $self->http_queue( $
svc_x
->svcnum,
+ $self->http_queue( $
new
->svcnum,
$self->option('method'),
$self->option('url'),
$self->option('method'),
$self->option('url'),
+ $self->option('success_regexp'),
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
+ my $value = eval $value_expression;
die $@ if $@;
( $field, $value );
} split(/\n/, $self->option('replace_data') )
die $@ if $@;
( $field, $value );
} split(/\n/, $self->option('replace_data') )
@@
-112,7
+120,7
@@
sub http_queue {
}
sub http {
}
sub http {
- my($method, $url, @data) = @_;
+ my($method, $url,
$success_regexp,
@data) = @_;
$method = lc($method);
$method = lc($method);
@@
-132,6
+140,11
@@
sub http {
die $response->error_as_HTML if $response->is_error;
die $response->error_as_HTML if $response->is_error;
+ if(length($success_regexp) > 1) {
+ my $response_content = $response->content;
+ die $response_content unless $response_content =~ /$success_regexp/;
+ }
+
}
1;
}
1;