r76508 - in /trunk/libwebservice-solr-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/WebService/ lib/WebService/Solr/ t/
fabreg-guest at users.alioth.debian.org
fabreg-guest at users.alioth.debian.org
Fri Jun 24 20:06:06 UTC 2011
Author: fabreg-guest
Date: Fri Jun 24 20:05:56 2011
New Revision: 76508
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76508
Log:
* New upstream release
* Added myself to Uploaders and Copyright
Modified:
trunk/libwebservice-solr-perl/Changes
trunk/libwebservice-solr-perl/META.yml
trunk/libwebservice-solr-perl/Makefile.PL
trunk/libwebservice-solr-perl/debian/changelog
trunk/libwebservice-solr-perl/debian/control
trunk/libwebservice-solr-perl/debian/copyright
trunk/libwebservice-solr-perl/inc/Module/Install.pm
trunk/libwebservice-solr-perl/inc/Module/Install/Base.pm
trunk/libwebservice-solr-perl/inc/Module/Install/Can.pm
trunk/libwebservice-solr-perl/inc/Module/Install/Fetch.pm
trunk/libwebservice-solr-perl/inc/Module/Install/Makefile.pm
trunk/libwebservice-solr-perl/inc/Module/Install/Metadata.pm
trunk/libwebservice-solr-perl/inc/Module/Install/Win32.pm
trunk/libwebservice-solr-perl/inc/Module/Install/WriteAll.pm
trunk/libwebservice-solr-perl/lib/WebService/Solr.pm
trunk/libwebservice-solr-perl/lib/WebService/Solr/Document.pm
trunk/libwebservice-solr-perl/lib/WebService/Solr/Field.pm
trunk/libwebservice-solr-perl/lib/WebService/Solr/Response.pm
trunk/libwebservice-solr-perl/t/document.t
trunk/libwebservice-solr-perl/t/field.t
Modified: trunk/libwebservice-solr-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/Changes?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/Changes (original)
+++ trunk/libwebservice-solr-perl/Changes Fri Jun 24 20:05:56 2011
@@ -1,4 +1,15 @@
Revision history for Perl extension WebService::Solr.
+
+0.14 2011-06-13
+ - Fix broken logic for figuring out rows per page when not explicitly
+ specified. It was broken on the last page when the number of rows
+ returned was less than the default. We now just assume 10 rows which
+ is the default in Solr.
+
+0.13 2011-05-05
+ - Replace XML::Generator with XML::Easy and de-mooseify the Document and
+ Field classes to help speed up (about 3x) document creation and
+ serialization.
0.12 2011-04-12
- Clean up docs in relation to autocommit
Modified: trunk/libwebservice-solr-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/META.yml?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/META.yml (original)
+++ trunk/libwebservice-solr-perl/META.yml Fri Jun 24 20:05:56 2011
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 1.01'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -28,9 +28,9 @@
LWP::UserAgent: 0
Moose: 0
URI: 1.28
- XML::Generator: 0.94
+ XML::Easy: 0
perl: 5.8.0
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/bricas/webservice-solr
-version: 0.12
+version: 0.14
Modified: trunk/libwebservice-solr-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/Makefile.PL?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/Makefile.PL (original)
+++ trunk/libwebservice-solr-perl/Makefile.PL Fri Jun 24 20:05:56 2011
@@ -1,4 +1,4 @@
-use inc::Module::Install 0.91;
+use inc::Module::Install 1.00;
if ( -e 'MANIFEST.SKIP' ) {
system( 'pod2text lib/WebService/Solr.pm > README' );
@@ -13,7 +13,7 @@
requires 'URI' => '1.28';
requires 'Data::Page';
requires 'Data::Pageset';
-requires 'XML::Generator' => '0.94';
+requires 'XML::Easy';
requires 'JSON::XS';
requires 'Moose';
requires 'Encode';
Modified: trunk/libwebservice-solr-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/debian/changelog?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/debian/changelog (original)
+++ trunk/libwebservice-solr-perl/debian/changelog Fri Jun 24 20:05:56 2011
@@ -1,3 +1,10 @@
+libwebservice-solr-perl (0.14-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Added myself to Uploaders and Copyright
+
+ -- Fabrizio Regalli <fabreg at fabreg.it> Fri, 24 Jun 2011 21:58:08 +0200
+
libwebservice-solr-perl (0.12-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libwebservice-solr-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/debian/control?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/debian/control (original)
+++ trunk/libwebservice-solr-perl/debian/control Fri Jun 24 20:05:56 2011
@@ -17,7 +17,8 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Brian Cassidy <brian.cassidy at gmail.com>,
Jaldhar H. Vyas <jaldhar at debian.org>, Antonio Radici <antonio at dyne.org>,
- Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>
+ Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>,
+ Fabrizio Regalli <fabreg at fabreg.it>
Standards-Version: 3.9.2
Homepage: http://search.cpan.org/dist/WebService-Solr/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libwebservice-solr-perl/
Modified: trunk/libwebservice-solr-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/debian/copyright?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/debian/copyright (original)
+++ trunk/libwebservice-solr-perl/debian/copyright Fri Jun 24 20:05:56 2011
@@ -19,6 +19,7 @@
2009, Antonio Radici <antonio at dyne.org>
2009, Jaldhar H. Vyas <jaldhar at debian.org>
2011, gregor herrmann <gregoa at debian.org>
+ 2011, Fabrizio Regalli <fabreg at fabreg.it>
License: Artistic or GPL-1+
License: Artistic
Modified: trunk/libwebservice-solr-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install.pm Fri Jun 24 20:05:56 2011
@@ -31,7 +31,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.00';
+ $VERSION = '1.01';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/Base.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/Base.pm Fri Jun 24 20:05:56 2011
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/Can.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/Can.pm Fri Jun 24 20:05:56 2011
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/Fetch.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/Fetch.pm Fri Jun 24 20:05:56 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/Makefile.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/Makefile.pm Fri Jun 24 20:05:56 2011
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/Metadata.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/Metadata.pm Fri Jun 24 20:05:56 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -515,6 +515,7 @@
'GNU Free Documentation license' => 'unrestricted', 1,
'GNU Affero General Public License' => 'open_source', 1,
'(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license 2\.0' => 'artistic_2', 1,
'Artistic license' => 'artistic', 1,
'Apache (?:Software )?license' => 'apache', 1,
'GPL' => 'gpl', 1,
@@ -550,9 +551,9 @@
sub _extract_bugtracker {
my @links = $_[0] =~ m#L<(
- \Qhttp://rt.cpan.org/\E[^>]+|
- \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
- \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+ https?\Q://rt.cpan.org/\E[^>]+|
+ https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+ https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
)>#gx;
my %links;
@links{@links}=();
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/Win32.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/Win32.pm Fri Jun 24 20:05:56 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libwebservice-solr-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/inc/Module/Install/WriteAll.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libwebservice-solr-perl/inc/Module/Install/WriteAll.pm Fri Jun 24 20:05:56 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libwebservice-solr-perl/lib/WebService/Solr.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/lib/WebService/Solr.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/lib/WebService/Solr.pm (original)
+++ trunk/libwebservice-solr-perl/lib/WebService/Solr.pm Fri Jun 24 20:05:56 2011
@@ -8,7 +8,9 @@
use WebService::Solr::Response;
use HTTP::Request;
use HTTP::Headers;
-use XML::Generator;
+use XML::Easy::Element;
+use XML::Easy::Content;
+use XML::Easy::Text ();
has 'url' => (
is => 'ro',
@@ -28,15 +30,7 @@
default => sub { { wt => 'json' } }
);
-has '_xml_generator' => (
- is => 'ro',
- init_arg => undef,
- default => sub {
- XML::Generator->new( ':std', escape => 'always,even-entities' );
- },
-);
-
-our $VERSION = '0.12';
+our $VERSION = '0.14';
sub BUILDARGS {
my ( $self, $url, $options ) = @_;
@@ -58,17 +52,22 @@
my ( $self, $doc, $params ) = @_;
my @docs = ref $doc eq 'ARRAY' ? @$doc : ( $doc );
- $params ||= {};
- my $xml = $self->_xml_generator->add(
- $params,
- map {
- if ( blessed $_ ) { $_->to_xml }
- else {
- WebService::Solr::Document->new(
- ref $_ eq 'HASH' ? %$_ : @$_ )->to_xml;
- }
- } @docs
- );
+ my @elements = map {
+ ( '',
+ blessed $_
+ ? $_->to_element
+ : WebService::Solr::Document->new(
+ ref $_ eq 'HASH' ? %$_ : @$_
+ )->to_element
+ )
+ } @docs;
+
+ $params ||= {};
+ my $e
+ = XML::Easy::Element->new( 'add', $params,
+ XML::Easy::Content->new( [ @elements, '' ] ),
+ );
+ my $xml = XML::Easy::Text::xml10_write_element( $e );
my $response = $self->_send_update( $xml );
return $response->ok;
@@ -81,9 +80,9 @@
sub commit {
my ( $self, $params ) = @_;
$params ||= {};
- my $response
- = $self->_send_update( $self->_xml_generator->commit( $params ), {},
- 0 );
+ my $e = XML::Easy::Element->new( 'commit', $params, [ '' ] );
+ my $xml = XML::Easy::Text::xml10_write_element( $e );
+ my $response = $self->_send_update( $xml, {}, 0 );
return $response->ok;
}
@@ -96,19 +95,25 @@
sub optimize {
my ( $self, $params ) = @_;
$params ||= {};
- my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
- my $response = $self->_send_update( $gen->optimize( $params ), {}, 0 );
+ my $e = XML::Easy::Element->new( 'optimize', $params, [ '' ] );
+ my $xml = XML::Easy::Text::xml10_write_element( $e );
+ my $response = $self->_send_update( $xml, {}, 0 );
return $response->ok;
}
sub delete {
my ( $self, $options ) = @_;
- my $gen = $self->_xml_generator;
my $xml = '';
for my $k ( keys %$options ) {
my $v = $options->{ $k };
- $xml .= $gen->$k( $_ ) for ref $v ? @$v : $v;
+ $xml .= join(
+ '',
+ map {
+ XML::Easy::Text::xml10_write_element(
+ XML::Easy::Element->new( $k, {}, [ $_ ] ) )
+ } ref $v ? @$v : $v
+ );
}
my $response = $self->_send_update( "<delete>${xml}</delete>" );
@@ -117,16 +122,12 @@
sub delete_by_id {
my ( $self, $id ) = @_;
- my $response = $self->_send_update( "<delete><id>$id</id></delete>" );
- return $response->ok;
+ return $self->delete( { id => $id } );
}
sub delete_by_query {
my ( $self, $query ) = @_;
- my $gen = $self->_xml_generator;
- my $response
- = $self->_send_update( $gen->delete( $gen->query( $query ) ) );
- return $response->ok;
+ return $self->delete( { query => $query } );
}
sub ping {
Modified: trunk/libwebservice-solr-perl/lib/WebService/Solr/Document.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/lib/WebService/Solr/Document.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/lib/WebService/Solr/Document.pm (original)
+++ trunk/libwebservice-solr-perl/lib/WebService/Solr/Document.pm Fri Jun 24 20:05:56 2011
@@ -1,23 +1,31 @@
package WebService::Solr::Document;
-use Moose;
+use WebService::Solr::Field;
+use XML::Easy::Element;
+use XML::Easy::Content;
+use XML::Easy::Text ();
+use Scalar::Util 'blessed';
-use WebService::Solr::Field;
-require XML::Generator;
-
-has 'fields' => (
- is => 'rw',
- isa => 'ArrayRef[Object]',
- default => sub { [] },
- auto_deref => 1
-);
-
-has 'boost' => ( is => 'rw', isa => 'Maybe[Num]' );
-
-sub BUILDARGS {
+sub new {
my ( $class, @fields ) = @_;
- return { fields => [ _parse_fields( @fields ) ] };
+ my $self = {
+ fields => [ _parse_fields( @fields ) ]
+ };
+
+ return bless $self, $class;
+}
+
+sub boost {
+ my $self = shift;
+ $self->{ boost } = $_[ 0 ] if @_;
+ return $self->{ boost };
+}
+
+sub fields {
+ my $self = shift;
+ $self->{ fields } = $_[ 0 ] if @_;
+ return wantarray ? @{ $self->{ fields } } : $self->{ fields };
}
sub add_fields {
@@ -65,17 +73,22 @@
return map { $_->value } grep { $_->name eq $key } $self->fields;
}
+sub to_element {
+ my $self = shift;
+ my %attr = ( $self->boost ? ( boost => $self->boost ) : () );
+
+ my @elements = map { ( '' => $_->to_element ) } $self->fields;
+
+ return XML::Easy::Element->new( 'doc', \%attr,
+ XML::Easy::Content->new( [ @elements, '' ] ),
+ );
+}
+
sub to_xml {
my $self = shift;
- my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
- my %attr = ( $self->boost ? ( boost => $self->boost ) : () );
- return $gen->doc( \%attr, map { $_->to_xml } $self->fields );
+ return XML::Easy::Text::xml10_write_element( $self->to_element );
}
-
-no Moose;
-
-__PACKAGE__->meta->make_immutable;
1;
@@ -136,6 +149,10 @@
Returns all values for C<$name>.
+=head2 to_element( )
+
+Serializes the object to an XML::Easy::Element object.
+
=head2 to_xml( )
Serializes the object to xml.
Modified: trunk/libwebservice-solr-perl/lib/WebService/Solr/Field.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/lib/WebService/Solr/Field.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/lib/WebService/Solr/Field.pm (original)
+++ trunk/libwebservice-solr-perl/lib/WebService/Solr/Field.pm Fri Jun 24 20:05:56 2011
@@ -1,33 +1,59 @@
package WebService::Solr::Field;
-use Moose;
+use XML::Easy::Element;
+use XML::Easy::Content;
+use XML::Easy::Text ();
-has 'name' => ( is => 'rw', isa => 'Str' );
-
-has 'value' => ( is => 'rw', isa => 'Str' );
-
-has 'boost' => ( is => 'rw', isa => 'Maybe[Num]' );
-
-require XML::Generator;
-
-sub BUILDARGS {
- my ( $self, $name, $value, $opts ) = @_;
+sub new {
+ my ( $class, $name, $value, $opts ) = @_;
$opts ||= {};
- return { name => $name, value => $value, %$opts };
+ die "name required" unless defined $name;
+ die "value required" unless defined $value;
+
+ my $self = {
+ name => $name,
+ value => $value,
+ %{ $opts },
+ };
+
+ return bless $self, $class;
+}
+
+sub name {
+ my $self = shift;
+ $self->{ name } = $_[ 0 ] if @_;
+ return $self->{ name };
+}
+
+sub value {
+ my $self = shift;
+ $self->{ value } = $_[ 0 ] if @_;
+ return $self->{ value };
+}
+
+sub boost {
+ my $self = shift;
+ $self->{ boost } = $_[ 0 ] if @_;
+ return $self->{ boost };
+}
+
+sub to_element {
+ my $self = shift;
+ my %attr = ( $self->boost ? ( boost => $self->boost ) : () );
+
+ return XML::Easy::Element->new(
+ 'field',
+ { name => $self->name, %attr },
+ XML::Easy::Content->new( [ $self->value ] ),
+ );
}
sub to_xml {
my $self = shift;
- my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
- my %attr = ( $self->boost ? ( boost => $self->boost ) : () );
- return $gen->field( { name => $self->name, %attr }, $self->value );
+ return XML::Easy::Text::xml10_write_element( $self->to_element );
}
-
-no Moose;
-
-__PACKAGE__->meta->make_immutable;
1;
@@ -69,6 +95,10 @@
A Moose override to allow our custom constructor.
+=head2 to_element( )
+
+Serializes the object to an XML::Easy::Element object.
+
=head2 to_xml( )
Serializes the object to xml.
Modified: trunk/libwebservice-solr-perl/lib/WebService/Solr/Response.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/lib/WebService/Solr/Response.pm?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/lib/WebService/Solr/Response.pm (original)
+++ trunk/libwebservice-solr-perl/lib/WebService/Solr/Response.pm Fri Jun 24 20:05:56 2011
@@ -65,14 +65,10 @@
return unless exists $struct->{ response }->{ numFound };
my $rows = $struct->{ responseHeader }->{ params }->{ rows };
-
- # rows not explicitly set, find default from rows returned
- if ( !defined $rows ) {
- $rows = scalar @{ $struct->{ response }->{ docs } };
- }
+ $rows = 10 unless defined $rows;
# do not generate a pager for queries explicitly requesting no rows
- return if defined $rows && $rows == 0;
+ return if $rows == 0;
my $pager = Data::Page->new;
$pager->total_entries( $struct->{ response }->{ numFound } );
@@ -105,14 +101,10 @@
return unless exists $struct->{ response }->{ numFound };
my $rows = $struct->{ responseHeader }->{ params }->{ rows };
+ $rows = 10 unless defined $rows;
# do not generate a pager for queries explicitly requesting no rows
- return if defined $rows && $rows == 0;
-
- # rows not explicitly set, find default from rows returned
- if ( !defined $rows ) {
- $rows = scalar @{ $struct->{ response }->{ docs } };
- }
+ return if $rows == 0;
my $pager = Data::Pageset->new(
{ total_entries => $struct->{ response }->{ numFound },
Modified: trunk/libwebservice-solr-perl/t/document.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/t/document.t?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/t/document.t (original)
+++ trunk/libwebservice-solr-perl/t/document.t Fri Jun 24 20:05:56 2011
@@ -126,13 +126,20 @@
{
my $doc = WebService::Solr::Document->new( @fields[ 0 .. 4 ] );
- is_deeply([ sort($doc->field_names) ], [ qw(id manu name sku weight)], 'field_names');
+ is_deeply(
+ [ sort( $doc->field_names ) ],
+ [ qw(id manu name sku weight) ],
+ 'field_names'
+ );
}
{
my $doc = WebService::Solr::Document->new(
- bools => decode_json(q/{"arr": [true,false,true]}/)->{arr}
+ bools => decode_json( q/{"arr": [true,false,true]}/ )->{ arr } );
+ isa_ok( $doc, 'WebService::Solr::Document' );
+ is_deeply(
+ [ 1, 0, 1 ],
+ [ $doc->values_for( 'bools' ) ],
+ 'boolean arrays'
);
- isa_ok( $doc, 'WebService::Solr::Document' );
- is_deeply([1,0,1], [$doc->values_for('bools')], 'boolean arrays');
}
Modified: trunk/libwebservice-solr-perl/t/field.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwebservice-solr-perl/t/field.t?rev=76508&op=diff
==============================================================================
--- trunk/libwebservice-solr-perl/t/field.t (original)
+++ trunk/libwebservice-solr-perl/t/field.t Fri Jun 24 20:05:56 2011
@@ -39,13 +39,13 @@
{
my $f = WebService::Solr::Field->new( foo => 'This & That' );
- my $expected = '<field name="foo">This & That</field>';
+ my $expected = '<field name="foo">This & That</field>';
is( $f->to_xml, $expected, 'to_xml(), escaped (1)' );
}
{
my $f = WebService::Solr::Field->new( foo => 'This & That' );
- my $expected = '<field name="foo">This & That</field>';
+ my $expected = '<field name="foo">This &amp; That</field>';
is( $f->to_xml, $expected, 'to_xml(), escaped (2)' );
}
More information about the Pkg-perl-cvs-commits
mailing list