X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=pubmed_search;h=c0d15ce50afb745f3fb2a6f3b781a21e131dacaf;hb=3d5241a316e3ff729b19b878b0841558120f75e9;hp=435f75392c9f61aca496c7c7229744b4e45c5e65;hpb=9ff588d80d227ac1b4a977364b814696ff366e88;p=bin.git

diff --git a/pubmed_search b/pubmed_search
index 435f753..c0d15ce 100755
--- a/pubmed_search
+++ b/pubmed_search
@@ -12,7 +12,7 @@ use strict;
 use Getopt::Long;
 use Pod::Usage;
 
-use Bio::DB::SoapEUtilities;
+use Bio::DB::EUtilities;
 
 use Encode qw(encode_utf8);
 use Term::ANSIColor qw(:constants);
@@ -86,14 +86,23 @@ if (not @ARGV) {
 pod2usage(join("\n",@USAGE_ERRORS)) if @USAGE_ERRORS;
 
 
-my $fac = Bio::DB::SoapEUtilities->new();
-
-my $result = $fac->esearch(-email => 'don@donarmstrong.com',
-                           -db    => 'pubmed',
-                           -term => join(' ',@ARGV),
-                           -retmax => 1000,
-                          )->run();
-my @ids = $result->ids;
+my $result =
+    Bio::DB::EUtilities->new(-email => 'don@donarmstrong.com',
+                             -db    => 'pubmed',
+                             -term => join(' ',@ARGV),
+                             -retmax => 1000,
+                             -eutil  => 'esearch',
+                            );
+my @ids;
+eval {
+    # this warns for everything, so hide the warning.
+    local $SIG{__WARN__} = sub {};
+    @ids = $result->get_ids('pubmed')
+};
+if (not @ids) {
+    print "No results\n";
+    exit;
+}
 if (@ids > 0 and ref($ids[0])) {
     @ids = @{$ids[0]};
 }
@@ -106,12 +115,13 @@ if ($options{org_mode}) {
 }
 print scalar(@ids)." results:\n";
 exit 0 unless @ids;
-my $raw_xml = $fac->efetch(-email => 'don@donarmstrong.com',
-                           -db    => 'pubmed',
-                           -id  => \@ids
-                          )->run(-raw_xml => 1);
+my $raw_xml = Bio::DB::EUtilities->new(-email => 'don@donarmstrong.com',
+                                       -db    => 'pubmed',
+                                       -id  => \@ids,
+                                       -eutil => 'efetch',
+                                      );
 use XML::LibXML;
-my $xml = XML::LibXML->load_xml(string => $raw_xml);
+my $xml = XML::LibXML->load_xml(string => $raw_xml->get_Response->content);
 print STDERR $xml->toString if $DEBUG;
 for my $article ($xml->findnodes(q{//*[local-name()='MedlineCitation']})) {
     print STDERR $article->toString if $DEBUG;