Merge branch 'devel' of h1dev:/srv/APKPM/

diff --git a/lib/APKPM/CRM.pm b/lib/APKPM/CRM.pm
index 1b9c7e2..6f75a37 100644 (file)
--- a/lib/APKPM/CRM.pm
+++ b/lib/APKPM/CRM.pm
@@ -26,13 +26,17 @@ sub begin {
        warn "# begin ", dump( $workload );
 }
 
-sub username : Job : MinProcesses(1) : MaxProcesses(5) : Encode(e_json) {
+sub search : Job : MinProcesses(1) : MaxProcesses(5) : Encode(e_json) {
        my ( $self, $job, $workload ) = @_;
-       warn "# username ",dump($workload);
+       warn "# search ",dump($workload);
+
+       my $field = 'USERNAME';
+       my $value = '%' . $workload . '%';
+       ($field,$value) = split(/[:=]/,$workload,2) if $workload =~ m/[:=]/;
+
        my $cli = RPC::XML::Client->new($self->config('crmxml'));
-       my $resp = $cli->send_request('search',RPC::XML::array->new(
-               USERNAME => '%' . $workload . '%'
-       ));
+       warn "RPC::XML $field $value";
+       my $resp = $cli->send_request('search',RPC::XML::array->new( $field => $value ));
        return ref $resp ? $resp->value->[0] : { error => $resp };
 }