[gentoo-commits] proj/perl-overlay:master commit in: scripts/, scripts/lib/

[Kent Fredric]

commit:     35b9a8c3d05650d4023e7b61ded134314f1f498d
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Fri Jan  6 06:03:38 2012 +0000
Commit:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
CommitDate: Fri Jan  6 06:03:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=35b9a8c3

[scripts] optimise package query, fix end-point to _search, add debug options in the WWW layer

---
 scripts/lib/metacpan.pm |   19 ++++++++++++++---
 scripts/package_log.pl  |   48 +++++++++++++++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/scripts/lib/metacpan.pm b/scripts/lib/metacpan.pm
index 58ce0f2..702a2a9 100644
--- a/scripts/lib/metacpan.pm
+++ b/scripts/lib/metacpan.pm
@@ -20,11 +20,22 @@ sub mcpan {
       root_dir => File::Spec->catdir( File::Spec->tmpdir, 'gentoo-metacpan-cache' ),
     );
     require WWW::Mechanize::Cached;
-    my $mech = WWW::Mechanize::Cached->new(
-      cache     => $cache,
-      timeout   => 20000,
+    my $mech;
+
+    if ( defined $ENV{WWW_MECH_NOCACHE} ) {
+        $mech = LWP::UserAgent->new();
+    } else {
+      $mech = WWW::Mechanize::Cached->new(
+       cache     => $cache,
+       timeout   => 20000,
       autocheck => 1,
-    );
+     );
+    }
+    if ( defined $ENV{WWW_MECH_DEBUG} ) {
+        $mech->add_handler("request_send", sub { warn shift->dump ; return });
+        $mech->add_handler("response_done", sub { warn shift->dump ; return });
+
+    }
     require HTTP::Tiny::Mech;
     my $tinymech = HTTP::Tiny::Mech->new( mechua => $mech );
     require MetaCPAN::API;

diff --git a/scripts/package_log.pl b/scripts/package_log.pl
index 70547b3..a6bc9fb 100755
--- a/scripts/package_log.pl
+++ b/scripts/package_log.pl
@@ -49,34 +49,45 @@ my $singleflags;
 
 if ( $flags->{help} or $singleflags->{h} ) { print help(); exit 0; }
 
-my $oldest_date = '2011-09-01T00:00:00.000Z';
-my $newest_date = '2012-01-01T00:00:00.000Z';
+my $oldest_date = '2011-10-01T00:00:00.000Z';
+my $newest_date = '2012-02-01T00:00:00.000Z';
 
 my $search = {};
 
-$search->{query} = {
-  terms => {
-    distribution  => [ @ARGV, ],
-    minimum_match => 1,
-  },
-};
+my $and = [];
 
 if ( not $flags->{all} ) {
-  $search->{filter} = {
-    range => {
-      date => {
-        from => $oldest_date,
-        to   => $newest_date,
-      },
-    },
-  };
+    push @{$and}, {
+        range => {
+            date => {
+                from => $oldest_date,
+                to   => $newest_date,
+            }
+        }
+    };
 }
+
+push @{$and} , {
+    term => {
+    'distribution'  => @ARGV,
+#     minimum_match => 1,
+    }
+};
+
+$search->{query} = {
+     constant_score => {
+         filter => {
+              and => $and,
+         }
+     }
+};
+
 $search->{sort} = [
 
   #   { 'author' => 'asc', },
   { 'date' => 'desc', },
 ];
-$search->{size} = 1024;
+$search->{size} = 10;
 
 $search->{fields} = [qw( author name date distribution version )];
 
@@ -84,9 +95,10 @@ if ( $flags->{deps} ) {
   push @{ $search->{fields} }, '_source.dependency';
 }
 
+
 _log( ['initialized: fetching search results'] );
 
-my $results = mcpan->post( 'release', $search );
+my $results = mcpan->post( 'release/_search', $search );
 
 _log( [ 'fetched %s results', scalar @{ $results->{hits}->{hits} } ] );