import rt 2.0.14

[freeside.git] / FS / FS / part_export / infostreet.pm

diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index 8a68a20..f2d5199 100644 (file)
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -1,11 +1,13 @@
 package FS::part_export::infostreet;
 
-use vars qw(@ISA %infostreet2cust_main);
+use vars qw(@ISA %infostreet2cust_main $DEBUG);
 use FS::UID qw(dbh);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+$DEBUG = 0;
+
 %infostreet2cust_main = (
   'firstName'   => 'first',
   'lastName'    => 'last',
@@ -48,7 +50,7 @@ sub _export_insert {
   $contact_info{'email'} = $emails[0] if @emails;
 
   #this one is kinda noment-specific
-  $contact_info{'title'} = $cust_main->agent->agent;
+  $contact_info{'organization'} = $cust_main->agent->agent;
 
   $err_or_queue = $self->infostreet_queueContact( $svc_acct->svcnum,
     $svc_acct->username, %contact_info );
@@ -141,9 +143,9 @@ sub infostreet_setContact {
   my($url, $is_username, $is_password, $groupID, $username, %contact_info) = @_;
   my $accountID = infostreet_command($url, $is_username, $is_password, $groupID,
     'getAccountID', $username);
-  foreach my $field ( %contact_info ) {
+  foreach my $field ( keys %contact_info ) {
     infostreet_command($url, $is_username, $is_password, $groupID,
-      'setContactField', $field, $contact_info{$field} );
+      'setContactField', [ 'int'=>$accountID ], $field, $contact_info{$field} );
   }
 
 }
@@ -151,6 +153,8 @@ sub infostreet_setContact {
 sub infostreet_command { #subroutine, not method
   my($url, $username, $password, $groupID, $method, @args) = @_;
 
+  warn "[FS::part_export::infostreet] $method ".join(' ', @args)."\n" if $DEBUG;
+
   #quelle hack
   if ( $method =~ /,/ ) {
     foreach my $part ( split(/,\s*/, $method) ) {
@@ -160,6 +164,15 @@ sub infostreet_command { #subroutine, not method
   }
 
   eval "use Frontier::Client;";
+  die $@ if $@;
+
+  eval 'sub Frontier::RPC2::String::repr {
+    my $self = shift;
+    my $value = $$self;
+    $value =~ s/([&<>\"])/$Frontier::RPC2::char_entities{$1}/ge;
+    $value;
+  }';
+  die $@ if $@;
 
   my $conn = Frontier::Client->new( url => $url );
   my $key_result = $conn->call( 'authenticate', $username, $password, $groupID);
@@ -168,7 +181,15 @@ sub infostreet_command { #subroutine, not method
   my $key = $key_result{data};
 
   #my $result = $conn->call($method, $key, @args);
-  my $result = $conn->call($method, $key, map { $conn->string($_) } @args);
+  my $result = $conn->call( $method, $key,
+                            map {
+                                  if ( ref($_) ) {
+                                    my( $type, $value) = @{$_};
+                                    $conn->$type($value);
+                                  } else {
+                                    $conn->string($_);
+                                  }
+                                } @args );
   my %result = _infostreet_parse($result);
   die $result{error} unless $result{success};