Mailing List Archive

Author: creamyg
Date: 2008-08-04 19:15:41 -0700 (Mon, 04 Aug 2008)
New Revision: 3721

Modified:
trunk/perl/lib/KSx/Remote/SearchClient.pm
trunk/perl/lib/KSx/Remote/SearchServer.pm
trunk/perl/lib/KSx/Search/Filter.pm
trunk/perl/lib/KSx/Search/MockScorer.pm
trunk/perl/lib/KSx/Simple.pm
trunk/perl/lib/KinoSearch.pm
Log:
Kill off some obsolete helper functions and imports.


Modified: trunk/perl/lib/KSx/Remote/SearchClient.pm
===================================================================
--- trunk/perl/lib/KSx/Remote/SearchClient.pm 2008-08-05 01:47:12 UTC (rev 3720)
+++ trunk/perl/lib/KSx/Remote/SearchClient.pm 2008-08-05 02:15:41 UTC (rev 3721)
@@ -2,8 +2,9 @@
use warnings;

package KSx::Remote::SearchClient;
-use KinoSearch::Util::ToolSet qw( confess nfreeze thaw );
BEGIN { our @ISA = qw( KinoSearch::Search::Searchable ) }
+use Carp;
+use Storable qw( nfreeze thaw );
use bytes;
no bytes;


Modified: trunk/perl/lib/KSx/Remote/SearchServer.pm
===================================================================
--- trunk/perl/lib/KSx/Remote/SearchServer.pm 2008-08-05 01:47:12 UTC (rev 3720)
+++ trunk/perl/lib/KSx/Remote/SearchServer.pm 2008-08-05 02:15:41 UTC (rev 3721)
@@ -2,8 +2,9 @@
use warnings;

package KSx::Remote::SearchServer;
-use KinoSearch::Util::ToolSet qw( confess nfreeze thaw );
BEGIN { our @ISA = qw( KinoSearch::Obj ) }
+use Carp;
+use Storable qw( nfreeze thaw );
use bytes;
no bytes;


Modified: trunk/perl/lib/KSx/Search/Filter.pm
===================================================================
--- trunk/perl/lib/KSx/Search/Filter.pm 2008-08-05 01:47:12 UTC (rev 3720)
+++ trunk/perl/lib/KSx/Search/Filter.pm 2008-08-05 02:15:41 UTC (rev 3721)
@@ -2,8 +2,10 @@
use warnings;

package KSx::Search::Filter;
-use KinoSearch::Util::ToolSet qw( confess a_isa_b nfreeze thaw weaken );
BEGIN { our @ISA = qw( KinoSearch::Search::Query ) }
+use Carp;
+use Storable qw( nfreeze thaw );
+use Scalar::Util qw( blessed weaken );

# Inside-out member vars.
our %query;
@@ -13,7 +15,8 @@
my ( $either, %args ) = @_;
my $query = delete $args{query};
confess("required parameter query is not a KinoSearch::Search::Query")
- unless a_isa_b( $query, 'KinoSearch::Search::Query' );
+ unless ( blessed($query)
+ && $query->isa('KinoSearch::Search::Query') );
my $self = $either->SUPER::new(%args);
$self->_init_cache;
$query{$$self} = $query;

Modified: trunk/perl/lib/KSx/Search/MockScorer.pm
===================================================================
--- trunk/perl/lib/KSx/Search/MockScorer.pm 2008-08-05 01:47:12 UTC (rev 3720)
+++ trunk/perl/lib/KSx/Search/MockScorer.pm 2008-08-05 02:15:41 UTC (rev 3721)
@@ -2,8 +2,9 @@
use warnings;

package KSx::Search::MockScorer;
-use KinoSearch::Util::ToolSet qw( confess reftype );
BEGIN { our @ISA = qw( KinoSearch::Search::Scorer ) }
+use Carp;
+use Scalar::Util qw( reftype );

# Inside-out member vars.
our %doc_nums;

Modified: trunk/perl/lib/KSx/Simple.pm
===================================================================
--- trunk/perl/lib/KSx/Simple.pm 2008-08-05 01:47:12 UTC (rev 3720)
+++ trunk/perl/lib/KSx/Simple.pm 2008-08-05 02:15:41 UTC (rev 3721)
@@ -2,12 +2,8 @@
use warnings;

package KSx::Simple;
-use KinoSearch::Util::ToolSet qw(
- confess
- weaken
- reftype
- refaddr
-);
+use Carp;
+use Scalar::Util qw( weaken reftype refaddr );

# Create one Schema subclass for each language.
my $schema_code = '';

Modified: trunk/perl/lib/KinoSearch.pm
===================================================================
--- trunk/perl/lib/KinoSearch.pm 2008-08-05 01:47:12 UTC (rev 3720)
+++ trunk/perl/lib/KinoSearch.pm 2008-08-05 02:15:41 UTC (rev 3721)
@@ -45,12 +45,7 @@
{
package KinoSearch::Util::ToolSet;
use Carp qw( carp croak cluck confess );
- use Scalar::Util qw(
- refaddr
- blessed
- reftype
- weaken
- );
+ use Scalar::Util qw( blessed );
use Storable qw( nfreeze thaw );

BEGIN {
@@ -60,28 +55,13 @@
croak
cluck
confess
-
- refaddr
blessed
- reftype
- weaken
-
nfreeze
thaw
-
to_kino
to_perl
- a_isa_b
);
}
-
- # a_isa_b serves the same purpose as the isa method from UNIVERSAL, only
- # it is called as a function rather than a method.
- sub a_isa_b {
- my ( $item, $class_name ) = @_;
- return 0 unless blessed($item);
- return $item->isa($class_name);
- }
}

{
@@ -96,7 +76,7 @@

{
package KinoSearch::Analysis::Stopalizer;
- use KinoSearch::Util::ToolSet qw( confess reftype to_kino );
+ use KinoSearch::Util::ToolSet qw( to_kino );

sub gen_stoplist {
my ( undef, $language ) = @_;
@@ -214,16 +194,9 @@

{
package KinoSearch::Obj;
- use KinoSearch::Util::ToolSet qw( confess reftype to_perl );
+ use KinoSearch::Util::ToolSet qw( to_perl );

sub _to_string {"$_[0]"}
-
- sub abstract_death {
- my ( undef, $filename, $line, $methodname ) = caller(1);
- die "ERROR: $methodname', called at $filename line $line, is an "
- . "abstract method and must be defined in a subclass";
- }
-
}

{
@@ -379,13 +352,14 @@

{
package KinoSearch::Search::Compiler;
- use KinoSearch::Util::ToolSet qw( a_isa_b confess );
+ use KinoSearch::Util::ToolSet qw( confess );

sub new {
my ( $either, %args ) = @_;
if ( !defined $args{boost} ) {
confess("'parent' is not a Query")
- unless a_isa_b( $args{parent}, "KinoSearch::Search::Query" );
+ unless ( blessed( $args{parent} )
+ and $args{parent}->isa("KinoSearch::Search::Query") );
$args{boost} = $args{parent}->get_boost;
}
return $either->do_new(%args);
@@ -557,20 +531,10 @@
package KinoSearch::Util::Json;
use KinoSearch::Util::ToolSet qw( to_perl to_kino );

- BEGIN {
- our @EXPORT_OK = qw(
- to_json
- from_json
- );
- }
-
use JSON::XS qw();

my $json_encoder = JSON::XS->new->pretty(1)->canonical(1);

- sub to_json { return $json_encoder->encode(shift) }
- sub from_json { return $json_encoder->decode(shift) }
-
sub slurp_json {
shift; # useless callback obj
my %args = @_;


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits