Changeset 9518

Timestamp:

05/07/08 11:10:41 (1 week ago)

Author:

erickson

Message:

repairing the evergree-native-catalog z source and from-db-config-reading that was lost during handpatching in the trunk merge

Files:

• branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm (modified) (7 diffs)

branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm

@@ -16 +16 @@
 use OpenILS::Application::AppUtils;
 use OpenSRF::Utils::Logger qw/$logger/;
-use OpenILS::Utils::Editor q/:funcs/;
+use OpenILS::Utils::CStoreEditor q/:funcs/;
 
 my $output      = "USMARC"; 
+my $U = 'OpenILS::Application::AppUtils'; 
 
 my $sclient;
@@ -85 +86 @@
         return $e->event unless $e->checkauth;
         return $e->event unless $e->allowed('REMOTE_Z3950_QUERY');
-        return $sclient->config_value('z3950', 'services');
+
+    my $sources = $e->search_config_z3950_source( 
+        [ { name => { '!=' => undef } }, 
+        { flesh => 1, flesh_fields => { czs => ['attrs'] } }]  
+    ); 
+
+    my %hash = (); 
+    for my $s ( @$sources ) { 
+        $hash{ $s->name } = { 
+            name => $s->name, 
+            label => $s->label, 
+            host => $s->host, 
+            port => $s->port, 
+            db => $s->db, 
+            auth => $s->auth, 
+        }; 
+
+        for my $a ( @{ $s->attrs } ) { 
+            $hash{ $a->source }{attrs}{ $a->name } = { 
+                name => $a->name, 
+                label => $a->label, 
+                code => $a->code, 
+                format => $a->format, 
+                source => $a->source, 
+            }; 
+        } 
+    } 
+
+    return \%hash; 
 }
 
@@ -121 +150 @@
         my @connections;
         my @results;
+    my @services; 
         for (my $i = 0; $i < @{$$args{service}}; $i++) {
                 my %tmp_args = %$args;
@@ -129 +159 @@
                 $logger->debug("z3950: service: $tmp_args{service}, async: $tmp_args{async}");
 
-                $tmp_args{query} = compile_query('and', $tmp_args{service}, $tmp_args{search});
-
-                my $res = do_service_search( $self, $conn, $auth, \%tmp_args );
-
-                push @results, $res->{result};
-                push @connections, $res->{connection};
+        if ($tmp_args{service} eq 'native-evergreen-catalog') { 
+            my $method = $self->method_lookup('open-ils.search.biblio.zstyle'); 
+            $conn->respond( 
+                $self->method_lookup('open-ils.search.biblio.zstyle')->run($auth, \%tmp_args) 
+            ); 
+
+        } else { 
+
+            $tmp_args{query} = compile_query('and', $tmp_args{service}, $tmp_args{search}); 
+    
+            my $res = do_service_search( $self, $conn, $auth, \%tmp_args ); 
+    
+            if ($U->event_code($res)) { 
+                $conn->respond($res) if $U->event_code($res); 
+
+            } else { 
+                push @services, $tmp_args{service}; 
+                push @results, $res->{result}; 
+                push @connections, $res->{connection}; 
+            } 
+        }
 
                 $logger->debug("z3950: Result object: $results[$i], Connection object: $connections[$i]");
@@ -141 +186 @@
         $logger->debug("z3950: Connections created");
 
+    return undef unless (@connections);
         my @records;
+
         while ((my $index = OpenILS::Utils::ZClient::event( \@connections )) != 0) {
                 my $ev = $connections[$index - 1]->last_event();
@@ -171 +218 @@
         $$args{port}    = $$info{port};
         $$args{db}              = $$info{db};
+    $logger->debug("z3950: do_search...");
 
         return do_search( $self, $conn, $auth, $args );
@@ -203 +251 @@
         return $editor->event unless $editor->checkauth;
         return $editor->event unless $editor->allowed('REMOTE_Z3950_QUERY');
+
+    $logger->info("z3950: connecting to server $host:$port:$db as $username");
 
         my $connection = OpenILS::Utils::ZClient->new(