r66282 - in /trunk/libmojomojo-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/ lib/MojoMojo/Controller/ lib/MojoMojo/Model/ lib/MojoMojo/Schema/Result/ lib/MojoMojo/View/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Dec 25 00:40:20 UTC 2010
Author: jawnsy-guest
Date: Sat Dec 25 00:40:13 2010
New Revision: 66282
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66282
Log:
* New upstream release
+ Moved to KinoSearch1 (libkinosearch1-perl)
* Update watch mangle so version numbers are correct
* Update copyright clauses
Modified:
trunk/libmojomojo-perl/Changes
trunk/libmojomojo-perl/META.yml
trunk/libmojomojo-perl/Makefile.PL
trunk/libmojomojo-perl/debian/changelog
trunk/libmojomojo-perl/debian/control
trunk/libmojomojo-perl/debian/watch
trunk/libmojomojo-perl/inc/Module/Install.pm
trunk/libmojomojo-perl/inc/Module/Install/AutoInstall.pm
trunk/libmojomojo-perl/inc/Module/Install/Base.pm
trunk/libmojomojo-perl/inc/Module/Install/Can.pm
trunk/libmojomojo-perl/inc/Module/Install/Fetch.pm
trunk/libmojomojo-perl/inc/Module/Install/Include.pm
trunk/libmojomojo-perl/inc/Module/Install/Makefile.pm
trunk/libmojomojo-perl/inc/Module/Install/Metadata.pm
trunk/libmojomojo-perl/inc/Module/Install/Scripts.pm
trunk/libmojomojo-perl/inc/Module/Install/Win32.pm
trunk/libmojomojo-perl/inc/Module/Install/WriteAll.pm
trunk/libmojomojo-perl/lib/MojoMojo.pm
trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm
trunk/libmojomojo-perl/lib/MojoMojo/Model/Search.pm
trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm
trunk/libmojomojo-perl/lib/MojoMojo/View/TT.pm
Modified: trunk/libmojomojo-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/Changes?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/Changes (original)
+++ trunk/libmojomojo-perl/Changes Sat Dec 25 00:40:13 2010
@@ -1,3 +1,17 @@
+
+ Bug fixes:
+ - Fix tagged descendants by date for postgresql
+ - Fix root setting to actually be used.
+
+ Improvements:
+ - Use precompiled content when building search results
+ when precompiled is non-empty. This speeds up search results
+ a butt-load and then some. Thanks to <sauber> and <Khisanth>.
+
+ Migration:
+ - Moved to using KinoSearch1 instead of KinoSearch. The former has
+ replaced the latter.
+
1.01 2010-05-26 10:04:20
New features:
- Google search formatter (bayashi)
Modified: trunk/libmojomojo-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/META.yml?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/META.yml (original)
+++ trunk/libmojomojo-perl/META.yml Sat Dec 25 00:40:13 2010
@@ -14,7 +14,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.97'
+generated_by: 'Module::Install version 1.00'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -60,7 +60,6 @@
DateTime: 0.28
DateTime::Format::Mail: 0
Directory::Scratch: 0.14
- Email::Sender::Simple: 0.100110
Encode: 2.31
FCGI::ProcManager: 0
File::Copy::Recursive: 0
@@ -77,7 +76,7 @@
Image::ExifTool: 0
Image::Math::Constrain: 0
Imager: 0
- KinoSearch: 0.165
+ KinoSearch1: 1.00
LWP::Simple: 0
MRO::Compat: 0.10
Module::Pluggable::Ordered: 1.4
@@ -85,14 +84,10 @@
Net::Amazon: 0
Number::Format: 0
Pod::Simple::HTML: 3.01
- SQL::Translator: 0.09006
Syntax::Highlight::Engine::Kate: 0
Template: 2.20
Template::Plugin::JavaScript: 0
Term::Prompt: 0
- Test::Differences: 0
- Test::More: 0.88
- Test::WWW::Mechanize::Catalyst: 0.51
Text::Context: 3.5
Text::MultiMarkdown: 1.000032
Text::Password::Pronounceable: 0
@@ -100,8 +95,6 @@
URI: 1.37
URI::Fetch: 0
URI::Find: 0
- WWW::Mechanize: 1.54
- WWW::Mechanize::TreeBuilder: 1.10000
XML::Feed: 0
XML::LibXML: 1.66
XML::LibXSLT: 1.66
@@ -114,4 +107,4 @@
homepage: http://mojomojo.org
license: http://dev.perl.org/licenses/
repository: http://github.com/marcusramberg/mojomojo/
-version: 1.01
+version: 1.02
Modified: trunk/libmojomojo-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/Makefile.PL?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/Makefile.PL (original)
+++ trunk/libmojomojo-perl/Makefile.PL Sat Dec 25 00:40:13 2010
@@ -59,7 +59,7 @@
'Image::Math::Constrain' => 0,
'IO::Scalar' => 0,
'IO::File' => '1.14',
- 'KinoSearch' => '0.165',
+ 'KinoSearch1' => '1.00',
'Module::Pluggable::Ordered' => '1.4',
'Moose' => 0,
'Number::Format' => 0,
Modified: trunk/libmojomojo-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/changelog?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/changelog (original)
+++ trunk/libmojomojo-perl/debian/changelog Sat Dec 25 00:40:13 2010
@@ -1,3 +1,12 @@
+libmojomojo-perl (1.02+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + Moved to KinoSearch1 (libkinosearch1-perl)
+ * Update watch mangle so version numbers are correct
+ * Update copyright clauses
+
+ -- Jonathan Yu <jawnsy at cpan.org> Fri, 24 Dec 2010 19:48:38 -0500
+
libmojomojo-perl (1.01+dfsg-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libmojomojo-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/control?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/control (original)
+++ trunk/libmojomojo-perl/debian/control Sat Dec 25 00:40:13 2010
@@ -38,7 +38,7 @@
libimager-perl,
libio-stringy-perl,
libjs-jquery,
- libkinosearch-perl,
+ libkinosearch1-perl,
libmodule-pluggable-ordered-perl,
libmoose-perl,
libmro-compat-perl (>= 0.10),
@@ -106,7 +106,7 @@
libimager-perl,
libio-stringy-perl,
libjs-jquery,
- libkinosearch-perl,
+ libkinosearch1-perl,
libmodule-pluggable-ordered-perl,
libmoose-perl,
libmro-compat-perl,
Modified: trunk/libmojomojo-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/watch?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/watch (original)
+++ trunk/libmojomojo-perl/debian/watch Sat Dec 25 00:40:13 2010
@@ -1,6 +1,6 @@
version=3
-opts="uversionmangle=s/\.\d\d$/$&0/;s/\.\d$/$&00/,dversionmangle=s/\+dfsg//" \
+opts="uversionmangle=s/\.\d$/$&0/,dversionmangle=s/\+dfsg//" \
http://search.cpan.org/dist/MojoMojo/ \
.*/MojoMojo-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
debian sh debian/repack.stub
Modified: trunk/libmojomojo-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install.pm Sat Dec 25 00:40:13 2010
@@ -22,7 +22,6 @@
use Cwd ();
use File::Find ();
use File::Path ();
-use FindBin;
use vars qw{$VERSION $MAIN};
BEGIN {
@@ -32,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 = '0.97';
+ $VERSION = '1.00';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -231,7 +230,12 @@
sub new {
my ($class, %args) = @_;
- FindBin->again;
+ delete $INC{'FindBin.pm'};
+ {
+ # to suppress the redefine warning
+ local $SIG{__WARN__} = sub {};
+ require FindBin;
+ }
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
Modified: trunk/libmojomojo-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/AutoInstall.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/AutoInstall.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -48,6 +48,14 @@
while (my ($mod, $ver) = splice(@requires, 0, 2)) {
$seen{$mod}{$ver}++;
}
+ my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
+ while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
+ $seen{$mod}{$ver}++;
+ }
+ my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
+ while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
+ $seen{$mod}{$ver}++;
+ }
my @deduped;
while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
Modified: trunk/libmojomojo-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Base.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Base.pm Sat Dec 25 00:40:13 2010
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libmojomojo-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Can.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Can.pm Sat Dec 25 00:40:13 2010
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libmojomojo-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Fetch.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Fetch.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libmojomojo-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Include.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Include.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libmojomojo-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Makefile.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Makefile.pm Sat Dec 25 00:40:13 2010
@@ -4,10 +4,11 @@
use strict 'vars';
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
+use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -364,9 +365,9 @@
. ($self->postamble || '');
local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ eval { flock MAKEFILE, LOCK_EX };
my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
@@ -386,7 +387,8 @@
# XXX - This is currently unused; not sure if it breaks other MM-users
# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ seek MAKEFILE, 0, SEEK_SET;
+ truncate MAKEFILE, 0;
print MAKEFILE "$preamble$makefile$postamble" or die $!;
close MAKEFILE or die $!;
@@ -410,4 +412,4 @@
__END__
-#line 539
+#line 541
Modified: trunk/libmojomojo-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Metadata.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Metadata.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -616,8 +616,15 @@
return $v;
}
-
-
+sub add_metadata {
+ my $self = shift;
+ my %hash = @_;
+ for my $key (keys %hash) {
+ warn "add_metadata: $key is not prefixed with 'x_'.\n" .
+ "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
+ $self->{values}->{$key} = $hash{$key};
+ }
+}
######################################################################
Modified: trunk/libmojomojo-perl/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Scripts.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Scripts.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Scripts.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libmojomojo-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/Win32.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/Win32.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libmojomojo-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/inc/Module/Install/WriteAll.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libmojomojo-perl/inc/Module/Install/WriteAll.pm Sat Dec 25 00:40:13 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';;
+ $VERSION = '1.00';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libmojomojo-perl/lib/MojoMojo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo.pm Sat Dec 25 00:40:13 2010
@@ -30,7 +30,7 @@
except => qr/^MojoMojo::Plugin::/,
require => 1;
-our $VERSION = '1.01';
+our $VERSION = '1.02';
use 5.008004;
MojoMojo->config->{authentication}{dbic} = {
@@ -289,6 +289,12 @@
$w =~ s/[^\w\/\.]//g;
return $w;
}
+
+=head2 prepare_action
+
+Provide No DB message when one needs to spawn the db (script/mojomojo_spawn.pl)
+
+=cut
sub prepare_action {
my $c = shift;
@@ -727,6 +733,7 @@
MojoMojo->config->{index_dir} ||= MojoMojo->path_to('index');
MojoMojo->config->{attachment_dir} ||= MojoMojo->path_to('uploads');
+MojoMojo->config->{root} ||= MojoMojo->path_to('root');
unless (-e MojoMojo->config->{index_dir}) {
if (not mkdir MojoMojo->config->{index_dir}) {
warn 'Could not make index directory <'.MojoMojo->config->{index_dir}.'> - FIX IT OR SEARCH WILL NOT WORK!';
Modified: trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm Sat Dec 25 00:40:13 2010
@@ -166,7 +166,7 @@
}
# add a snippet of text containing the search query
- my $content = $strip->parse( $page->content->formatted($c) );
+ my $content = $strip->parse( $page->content->precompiled || $page->content->formatted($c) );
$strip->eof;
# FIXME: Bug? Some snippet text doesn't get displayed properly by Text::Context
Modified: trunk/libmojomojo-perl/lib/MojoMojo/Model/Search.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo/Model/Search.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/Model/Search.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/Model/Search.pm Sat Dec 25 00:40:13 2010
@@ -4,12 +4,12 @@
use parent 'Catalyst::Model';
-use KinoSearch::InvIndexer;
-use KinoSearch::Searcher;
-use KinoSearch::Analysis::PolyAnalyzer;
-use KinoSearch::Index::Term;
-use KinoSearch::Search::Query;
-use KinoSearch::QueryParser::QueryParser;
+use KinoSearch1::InvIndexer;
+use KinoSearch1::Searcher;
+use KinoSearch1::Analysis::PolyAnalyzer;
+use KinoSearch1::Index::Term;
+use KinoSearch1::Search::Query;
+use KinoSearch1::QueryParser::QueryParser;
__PACKAGE__->config->{index_dir} ||= MojoMojo->config->{index_dir};
# Fall back just in case MojoMojo->config->{index_dir} doesn't exist
@@ -26,7 +26,7 @@
=cut
my $invindexer;
-my $analyzer = KinoSearch::Analysis::PolyAnalyzer->new( language => _get_language() );
+my $analyzer = KinoSearch1::Analysis::PolyAnalyzer->new( language => _get_language() );
=head2 indexer
@@ -36,7 +36,7 @@
sub indexer {
my $self = shift;
- my $invindexer = KinoSearch::InvIndexer->new(
+ my $invindexer = KinoSearch1::InvIndexer->new(
invindex => __PACKAGE__->config->{index_dir},
create =>
( -f __PACKAGE__->config->{index_dir} . '/segments' ? 0 : 1 ),
@@ -60,7 +60,7 @@
my $self = shift;
$self->prepare_search_index
unless -f __PACKAGE__->config->{index_dir} . '/segments';
- return KinoSearch::Searcher->new(
+ return KinoSearch1::Searcher->new(
invindex => __PACKAGE__->config->{index_dir},
analyzer => $analyzer,
);
@@ -114,7 +114,7 @@
my $fixed_path = $key;
$fixed_path =~ s{/}{X}g;
- my $term = KinoSearch::Index::Term->new( path => $fixed_path );
+ my $term = KinoSearch1::Index::Term->new( path => $fixed_path );
$index->delete_docs_by_term($term);
my $doc = $index->new_doc();
$doc->set_value( author => $content->creator->login );
@@ -135,7 +135,7 @@
sub search {
my ( $self, $q ) = @_;
- my $qp = KinoSearch::QueryParser::QueryParser->new(
+ my $qp = KinoSearch1::QueryParser::QueryParser->new(
analyzer => $analyzer,
fields => [ 'text', 'tags' ],
default_boolop => 'AND'
@@ -161,7 +161,7 @@
my $path = $page->path;
$path =~ s{/}{X}g;
- my $term = KinoSearch::Index::Term->new( path => $path );
+ my $term = KinoSearch1::Index::Term->new( path => $path );
$index->delete_docs_by_term($term);
$index->finish( optimize => 1 );
}
Modified: trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm Sat Dec 25 00:40:13 2010
@@ -229,7 +229,7 @@
'content.version' => \'=me.content_version',
},
{
- group_by => [ ('me.id') ],
+ distinct => 1,
from => "page as me, page as ancestor, tag, content",
order_by => 'content.created DESC',
}
Modified: trunk/libmojomojo-perl/lib/MojoMojo/View/TT.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo/View/TT.pm?rev=66282&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/View/TT.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/View/TT.pm Sat Dec 25 00:40:13 2010
@@ -4,6 +4,7 @@
use parent 'Catalyst::View::TT';
use Template::Constants qw( :debug );
use Class::C3 ();
+use Path::Class qw/dir/;
=head1 NAME
@@ -41,8 +42,8 @@
my ( $c, $arg_ref ) = @_;
$class->config->{INCLUDE_PATH}=[
- $c->path_to('root'),
- $c->path_to('root','base'),
+ $c->config->{root},
+ dir($c->config->{root})->subdir('base'),
];
return $class->next::method(@_);
More information about the Pkg-perl-cvs-commits
mailing list