r68864 - in /trunk/libmojomojo-perl: ./ debian/ lib/ lib/MojoMojo/Controller/ lib/MojoMojo/Formatter/ lib/MojoMojo/I18N/ lib/MojoMojo/Schema/Result/ script/util/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Feb 17 02:46:35 UTC 2011
Author: jawnsy-guest
Date: Thu Feb 17 02:46:29 2011
New Revision: 68864
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68864
Log:
integrate new version, show build failures
Added:
trunk/libmojomojo-perl/lib/MojoMojo/Formatter/GoogleCalendar.pm
- copied unchanged from r68863, branches/upstream/libmojomojo-perl/current/lib/MojoMojo/Formatter/GoogleCalendar.pm
trunk/libmojomojo-perl/lib/MojoMojo/Formatter/IDLink.pm
- copied unchanged from r68863, branches/upstream/libmojomojo-perl/current/lib/MojoMojo/Formatter/IDLink.pm
trunk/libmojomojo-perl/lib/MojoMojo/I18N/ko.po
- copied unchanged from r68863, branches/upstream/libmojomojo-perl/current/lib/MojoMojo/I18N/ko.po
trunk/libmojomojo-perl/script/util/bust_cache.pl
- copied unchanged from r68863, branches/upstream/libmojomojo-perl/current/script/util/bust_cache.pl
trunk/libmojomojo-perl/t/formatter_idlink.t
- copied unchanged from r68863, branches/upstream/libmojomojo-perl/current/t/formatter_idlink.t
Modified:
trunk/libmojomojo-perl/Changes
trunk/libmojomojo-perl/MANIFEST
trunk/libmojomojo-perl/META.yml
trunk/libmojomojo-perl/Makefile.PL
trunk/libmojomojo-perl/debian/changelog
trunk/libmojomojo-perl/debian/control
trunk/libmojomojo-perl/lib/MojoMojo.pm
trunk/libmojomojo-perl/lib/MojoMojo/Controller/Jsrpc.pm
trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm
trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm
trunk/libmojomojo-perl/script/util/dump_content.pl
trunk/libmojomojo-perl/script/util/import_content.pl
Modified: trunk/libmojomojo-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/Changes?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/Changes (original)
+++ trunk/libmojomojo-perl/Changes Thu Feb 17 02:46:29 2011
@@ -1,4 +1,18 @@
-
+1.03 2011-01-12 11:36
+ New features:
+ - Google Calendar formatter
+
+ Bug fixes:
+ - Really fix tagged descendants by date for postgres
+
+ Improvements:
+ - Korean Translation <JEEN>
+ - popular account link formatter via {{id:$service $account_name}} <bayashi>
+ e.g. {{id::cpan bayashi}} gets rendered as <a href="http://search.cpan.org/~bayashi/">bayashi</a>
+ - Show tags only once for 'Popular' and 'My' categories
+
+
+1.02 2010-08-30 04:20
Bug fixes:
- Fix tagged descendants by date for postgresql
- Fix root setting to actually be used.
Modified: trunk/libmojomojo-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/MANIFEST?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/MANIFEST (original)
+++ trunk/libmojomojo-perl/MANIFEST Thu Feb 17 02:46:29 2011
@@ -45,7 +45,9 @@
lib/MojoMojo/Formatter/File/Image.pm
lib/MojoMojo/Formatter/File/Pod.pm
lib/MojoMojo/Formatter/File/Text.pm
+lib/MojoMojo/Formatter/GoogleCalendar.pm
lib/MojoMojo/Formatter/GoogleSearch.pm
+lib/MojoMojo/Formatter/IDLink.pm
lib/MojoMojo/Formatter/Include.pm
lib/MojoMojo/Formatter/IRCLog.pm
lib/MojoMojo/Formatter/Main.pm
@@ -75,6 +77,7 @@
lib/MojoMojo/I18N/it.po
lib/MojoMojo/I18N/ja.js.po
lib/MojoMojo/I18N/ja.po
+lib/MojoMojo/I18N/ko.po
lib/MojoMojo/I18N/no.js.po
lib/MojoMojo/I18N/no.po
lib/MojoMojo/I18N/pl.js.po
@@ -433,6 +436,7 @@
script/mojomojo_test.pl
script/mojomojo_update_db.pl
script/update_po.sh
+script/util/bust_cache.pl
script/util/dbk2xhtml.pl
script/util/delete_page.pl
script/util/dir2mojomojo.pl
@@ -475,6 +479,7 @@
t/formatter_docbook.t
t/formatter_file.t
t/formatter_googlesearch.t
+t/formatter_idlink.t
t/formatter_include.t
t/formatter_irclog.t
t/formatter_markdown.t
Modified: trunk/libmojomojo-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/META.yml?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/META.yml (original)
+++ trunk/libmojomojo-perl/META.yml Thu Feb 17 02:46:29 2011
@@ -3,7 +3,7 @@
author:
- 'Marcus Ramberg C<marcus at nordaaker.com>'
build_requires:
- Email::Sender::Simple: 0.100110
+ Email::Sender::Simple: 0.102370
ExtUtils::MakeMaker: 6.42
SQL::Translator: 0.09006
Test::Differences: 0
@@ -107,4 +107,4 @@
homepage: http://mojomojo.org
license: http://dev.perl.org/licenses/
repository: http://github.com/marcusramberg/mojomojo/
-version: 1.02
+version: 1.03
Modified: trunk/libmojomojo-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/Makefile.PL?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/Makefile.PL (original)
+++ trunk/libmojomojo-perl/Makefile.PL Thu Feb 17 02:46:29 2011
@@ -12,7 +12,6 @@
'Algorithm::Diff' => '1.1901',
'Algorithm::Merge' => 0,
'Archive::Zip' => '1.14',
- 'MRO::Compat' => '0.10',
'Cache::FastMmap' => 1.31, # deleted /tmp/sharefile-* when MM is killed
'Catalyst' => '5.71001',
'Catalyst::Action::RenderView' => '0.07',
@@ -62,6 +61,7 @@
'KinoSearch1' => '1.00',
'Module::Pluggable::Ordered' => '1.4',
'Moose' => 0,
+ 'MRO::Compat' => '0.10',
'Number::Format' => 0,
'parent' => 0,
'Template' => '2.20',
@@ -99,7 +99,7 @@
# all tests require a database to be deployed, even though SQLT is not necessary for producton if a DB exists
test_requires 'SQL::Translator' => '0.09006';
-test_requires 'Email::Sender::Simple' => '0.100110';
+test_requires 'Email::Sender::Simple' => '0.102370';
test_requires 'WWW::Mechanize' => '1.54';
test_requires 'Test::WWW::Mechanize::Catalyst' => '0.51';
test_requires 'WWW::Mechanize::TreeBuilder' => '1.10000';
Modified: trunk/libmojomojo-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/changelog?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/changelog (original)
+++ trunk/libmojomojo-perl/debian/changelog Thu Feb 17 02:46:29 2011
@@ -1,6 +1,23 @@
-libmojomojo-perl (1.02+dfsg-1) UNRELEASED; urgency=low
+libmojomojo-perl (1.03+dfsg-1) UNRELEASED; urgency=low
- Lots of warnings during build, I need to look into this further
+ This is FTBFS, possibly due to CatalystX::Component::Traits
+
+ The alias and excludes options for role application have been renamed -alias and -excludes (CatalystX::Component::Traits is consuming MooseX::Traits::Pluggable - do you need to upgrade CatalystX::Component::Traits?) at /usr/share/perl5/CatalystX/Component/Traits.pm line 8
+ require CatalystX/Component/Traits.pm called at /usr/lib/perl5/Class/MOP.pm line 114
+ Class::MOP::__ANON__() called at /usr/share/perl5/Try/Tiny.pm line 71
+ eval {...} called at /usr/share/perl5/Try/Tiny.pm line 67
+ Try::Tiny::try('CODE(0xb9dc118)', 'Try::Tiny::Catch=REF(0xbac9c40)') called at /usr/lib/perl5/Class/MOP.pm line 125
+ Class::MOP::load_first_existing_class('CatalystX::Component::Traits') called at /usr/lib/perl5/Class/MOP.pm line 137
+ Class::MOP::load_class('CatalystX::Component::Traits', undef) called at /usr/lib/perl5/Moose/Util.pm line 113
+ Moose::Util::_apply_all_roles('Moose::Meta::Class=HASH(0xb7ec228)', undef, 'CatalystX::Component::Traits') called at /usr/lib/perl5/Moose/Util.pm line 91
+ Moose::Util::apply_all_roles('Moose::Meta::Class=HASH(0xb7ec228)', 'CatalystX::Component::Traits') called at /usr/lib/perl5/Moose.pm line 58
+ Moose::with('Moose::Meta::Class=HASH(0xb7ec228)', 'CatalystX::Component::Traits') called at /usr/lib/perl5/Moose/Exporter.pm line 359
+ Moose::with('CatalystX::Component::Traits') called at /usr/share/perl5/Catalyst/Model/DBIC/Schema.pm line 6
+ require Catalyst/Model/DBIC/Schema.pm called at inc/Module/AutoInstall.pm line 669
+ eval {...} called at inc/Module/AutoInstall.pm line 669
+ Module::AutoInstall::_load() called at inc/Module/AutoInstall.pm line 177
+ Module::AutoInstall::import('Module::AutoInstall', '-core', 'ARRAY(0xa27b2e0)', 'Create new database', 'ARRAY(0xa2f9e68)', 'FastCGI support', 'ARRAY(0x9e10110)', 'reCAPTCHA for anonymous edits', 'ARRAY(0xa2fc8c0)', ...) called at inc/Module/Install/AutoInstall.pm line 39
+ Module::Install::AutoInstall::auto_install(undef) called at Makefile.PL line 113
* New upstream release
+ Moved to KinoSearch1 (libkinosearch1-perl)
@@ -9,7 +26,7 @@
* Standards-Version 3.9.1 (no changes)
* Add notes for the +dfsg tarball to d/copyright
- -- Jonathan Yu <jawnsy at cpan.org> Mon, 27 Dec 2010 18:58:53 -0500
+ -- Jonathan Yu <jawnsy at cpan.org> Wed, 16 Feb 2011 21:37:06 -0500
libmojomojo-perl (1.01+dfsg-1) unstable; urgency=low
Modified: trunk/libmojomojo-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/debian/control?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/debian/control (original)
+++ trunk/libmojomojo-perl/debian/control Thu Feb 17 02:46:29 2011
@@ -23,7 +23,7 @@
libdbix-class-perl (>= 0.08000),
libdbix-class-timestamp-perl,
libdirectory-scratch-perl,
- libemail-send-perl,
+ libemail-sender-perl (>= 0.102370),
libfile-copy-recursive-perl,
libfile-mmagic-perl,
libfile-slurp-perl (>= 9999.13),
Modified: trunk/libmojomojo-perl/lib/MojoMojo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo.pm?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo.pm Thu Feb 17 02:46:29 2011
@@ -30,7 +30,7 @@
except => qr/^MojoMojo::Plugin::/,
require => 1;
-our $VERSION = '1.02';
+our $VERSION = '1.03';
use 5.008004;
MojoMojo->config->{authentication}{dbic} = {
Modified: trunk/libmojomojo-perl/lib/MojoMojo/Controller/Jsrpc.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/lib/MojoMojo/Controller/Jsrpc.pm?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/Controller/Jsrpc.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/Controller/Jsrpc.pm Thu Feb 17 02:46:29 2011
@@ -117,9 +117,11 @@
if (
$tag
&& !$c->model("DBIC::Tag")->search(
- page => $page->id,
- person => $c->req->{user_id},
- tag => $tagname
+ {
+ page => $page->id,
+ person => $c->req->{user_id},
+ tag => $tagname,
+ }
)->next()
)
{
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=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/Controller/Page.pm Thu Feb 17 02:46:29 2011
@@ -310,7 +310,7 @@
my @backlinks_viewable =
- $c->model("DBIC::Link")->search( to_page => $page->id );
+ $c->model("DBIC::Link")->search( {to_page => $page->id} );
if ( $c->pref('check_permission_on_view') ) {
my $user;
if ( $c->user_exists() ) { $user = $c->user->obj; }
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=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm (original)
+++ trunk/libmojomojo-perl/lib/MojoMojo/Schema/Result/Page.pm Thu Feb 17 02:46:29 2011
@@ -6,11 +6,16 @@
use parent qw/MojoMojo::Schema::Base::Result/;
-__PACKAGE__->load_components( "Core" );
+__PACKAGE__->load_components("Core");
__PACKAGE__->table("page");
__PACKAGE__->add_columns(
"id",
- { data_type => "INTEGER", is_nullable => 0, size => undef, is_auto_increment => 1 },
+ {
+ data_type => "INTEGER",
+ is_nullable => 0,
+ size => undef,
+ is_auto_increment => 1
+ },
"version",
{ data_type => "INTEGER", is_nullable => 1, size => undef },
"parent",
@@ -29,20 +34,75 @@
{ data_type => "INTEGER", is_nullable => 1, size => undef },
);
__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint( "page_unique_child_index", [ "parent", "name" ] );
-__PACKAGE__->has_many( "wantedpages", "MojoMojo::Schema::Result::WantedPage", { "foreign.from_page" => "self.id" } );
-__PACKAGE__->belongs_to( "parent", "MojoMojo::Schema::Result::Page", { id => "parent" } );
-__PACKAGE__->has_many( "children", "MojoMojo::Schema::Result::Page", { "foreign.parent" => "self.id" } );
-__PACKAGE__->belongs_to( "content", "MojoMojo::Schema::Result::Content", { page => "id", version => "content_version" } );
-__PACKAGE__->has_many( "versions", "MojoMojo::Schema::Result::Content", { "foreign.page" => "self.id" }, { order_by => 'version desc' } );
-__PACKAGE__->belongs_to( "page_version", "MojoMojo::Schema::Result::PageVersion", { page => "id", version => "version" } );
-__PACKAGE__->has_many( "tags", "MojoMojo::Schema::Result::Tag", { "foreign.page" => "self.id" } );
-__PACKAGE__->has_many( "links_from", "MojoMojo::Schema::Result::Link", { "foreign.from_page" => "self.id" } );
-__PACKAGE__->has_many( "links_to", "MojoMojo::Schema::Result::Link", { "foreign.to_page" => "self.id" } );
-__PACKAGE__->has_many( "roleprivileges", "MojoMojo::Schema::Result::RolePrivilege", { "foreign.page" => "self.id" } );
-__PACKAGE__->has_many( "attachments", "MojoMojo::Schema::Result::Attachment", { "foreign.page" => "self.id" }, {order_by=>'name asc' } );
-__PACKAGE__->has_many( "comments", "MojoMojo::Schema::Result::Comment", { "foreign.page" => "self.id" } );
-__PACKAGE__->has_many( "journals", "MojoMojo::Schema::Result::Journal", { "foreign.pageid" => "self.id" } );
+__PACKAGE__->add_unique_constraint( "page_unique_child_index",
+ [ "parent", "name" ] );
+__PACKAGE__->has_many(
+ "wantedpages",
+ "MojoMojo::Schema::Result::WantedPage",
+ { "foreign.from_page" => "self.id" }
+);
+__PACKAGE__->belongs_to(
+ "parent",
+ "MojoMojo::Schema::Result::Page",
+ { id => "parent" }
+);
+__PACKAGE__->has_many(
+ "children",
+ "MojoMojo::Schema::Result::Page",
+ { "foreign.parent" => "self.id" }
+);
+__PACKAGE__->belongs_to(
+ "content",
+ "MojoMojo::Schema::Result::Content",
+ { page => "id", version => "content_version" }
+);
+__PACKAGE__->has_many(
+ "versions",
+ "MojoMojo::Schema::Result::Content",
+ { "foreign.page" => "self.id" },
+ { order_by => 'version desc' }
+);
+__PACKAGE__->belongs_to(
+ "page_version",
+ "MojoMojo::Schema::Result::PageVersion",
+ { page => "id", version => "version" }
+);
+__PACKAGE__->has_many(
+ "tags",
+ "MojoMojo::Schema::Result::Tag",
+ { "foreign.page" => "self.id" }
+);
+__PACKAGE__->has_many(
+ "links_from",
+ "MojoMojo::Schema::Result::Link",
+ { "foreign.from_page" => "self.id" }
+);
+__PACKAGE__->has_many(
+ "links_to",
+ "MojoMojo::Schema::Result::Link",
+ { "foreign.to_page" => "self.id" }
+);
+__PACKAGE__->has_many(
+ "roleprivileges",
+ "MojoMojo::Schema::Result::RolePrivilege",
+ { "foreign.page" => "self.id" }
+);
+__PACKAGE__->has_many(
+ "attachments",
+ "MojoMojo::Schema::Result::Attachment",
+ { "foreign.page" => "self.id" },
+ { order_by => 'name asc' }
+);
+__PACKAGE__->has_many(
+ "comments",
+ "MojoMojo::Schema::Result::Comment",
+ { "foreign.page" => "self.id" }
+);
+__PACKAGE__->has_many(
+ "journals",
+ "MojoMojo::Schema::Result::Journal",
+ { "foreign.pageid" => "self.id" }
+);
=head1 NAME
@@ -73,17 +133,21 @@
: undef
);
my %content_data =
- map { $_ => $args{$_} } $self->result_source->related_source('content')->columns;
+ map { $_ => $args{$_} }
+ $self->result_source->related_source('content')->columns;
my $now = DateTime->now;
- @content_data{qw/page version status release_date/} =
- ( $self->id, ( $content_version ? $content_version + 1 : 1 ), 'released', $now, );
+ @content_data{qw/page version status release_date/} = (
+ $self->id, ( $content_version ? $content_version + 1 : 1 ),
+ 'released', $now,
+ );
my $content =
- $self->result_source->related_source('content')->resultset->create( \%content_data );
+ $self->result_source->related_source('content')
+ ->resultset->create( \%content_data );
$self->content_version( $content->version );
$self->update;
-
+
$self->page_version->content_version_first($content_version)
- unless defined $self->page_version->content_version_first;
+ unless defined $self->page_version->content_version_first;
$self->page_version->content_version_last($content_version);
$self->page_version->update;
@@ -96,15 +160,18 @@
else {
$self->result_source->resultset->set_paths($self);
}
- foreach my $want_me ($self->result_source->schema->resultset('WantedPage')
- ->search( { to_path => $self->path } ) ) {
+ foreach my $want_me ( $self->result_source->schema->resultset('WantedPage')
+ ->search( { to_path => $self->path } ) )
+ {
my $wantme_page = $want_me->from_page;
# convert the wanted into links
- $self->result_source->schema->resultset('Link')->create({
- from_page => $wantme_page,
- to_page => $self,
- });
+ $self->result_source->schema->resultset('Link')->create(
+ {
+ from_page => $wantme_page,
+ to_page => $self,
+ }
+ );
# clear the precompiled (will be recompiled on view)
if ( my $wantme_content = $wantme_page->content ) {
@@ -143,37 +210,46 @@
my $now = DateTime->now;
my $page_version_last = $self->page_version->latest_version();
-
+
# clone the last version and update fields passed in %args
my %page_version_data = map {
exists $args{$_}
- ? ( $_ => $args{$_} )
- : ( $_ => $page_version_last->$_ )
+ ? ( $_ => $args{$_} )
+ : ( $_ => $page_version_last->$_ )
} $self->result_source->related_source('page_version')->columns;
-
- delete $args{creator}; # creator is a field in page_version, not in page
+
+ delete $args{creator}; # creator is a field in page_version, not in page
# for the new version, set the version number, status, and release date
- @page_version_data{qw/
- version status release_date/} =
- ( $page_version_last->version + 1, 'released', $now );
+ @page_version_data{
+ qw/
+ version status release_date/
+ }
+ = ( $page_version_last->version + 1, 'released', $now );
my $page_version_new;
- # commit the new version to the database and update the previously last version to indicate its removal
- $self->result_source->schema->txn_do(sub {
-
- $page_version_new =
- $self->result_source->related_source('page_version')->resultset->create( \%page_version_data );
-
- $page_version_last->update({
- remove_date => $now,
- status => 'removed',
- comments => 'Replaced by version ' . $page_version_data{version}
- });
-
- $self->update(\%args);
- });
-
+
+# commit the new version to the database and update the previously last version to indicate its removal
+ $self->result_source->schema->txn_do(
+ sub {
+
+ $page_version_new =
+ $self->result_source->related_source('page_version')
+ ->resultset->create( \%page_version_data );
+
+ $page_version_last->update(
+ {
+ remove_date => $now,
+ status => 'removed',
+ comments => 'Replaced by version '
+ . $page_version_data{version}
+ }
+ );
+
+ $self->update( \%args );
+ }
+ );
+
return $page_version_new;
}
@@ -191,7 +267,8 @@
'tag' => $tag,
-or => [
'me.id' => \'=ancestor.id',
- -and => [ 'me.lft', \'> ancestor.lft', 'me.rgt', \'< ancestor.rgt', ],
+ -and =>
+ [ 'me.lft', \'> ancestor.lft', 'me.rgt', \'< ancestor.rgt', ],
],
'me.id' => \'=tag.page',
@@ -222,13 +299,21 @@
'tag' => $tag,
-or => [
'me.id' => \'=ancestor.id',
- -and => [ 'me.lft', \'> ancestor.lft', 'me.rgt', \'< ancestor.rgt', ],
+ -and =>
+ [ 'me.lft', \'> ancestor.lft', 'me.rgt', \'< ancestor.rgt', ],
],
'me.id' => \'=tag.page',
'content.page' => \'=me.id',
'content.version' => \'=me.content_version',
},
{
+ columns => [
+ 'me.id', 'me.version',
+ 'me.parent', 'me.name',
+ 'me.name_orig', 'me.depth',
+ 'me.lft', 'me.rgt',
+ 'me.content_version', 'content.created'
+ ],
distinct => 1,
from => "page as me, page as ancestor, tag, content",
order_by => 'content.created DESC',
@@ -237,8 +322,6 @@
return $self->result_source->resultset->set_paths(@pages);
}
-
-
=head2 descendants
@descendants = $page->descendants( [$resultset_page] );
@@ -252,8 +335,8 @@
=cut
sub descendants {
- my ($self, $resultset_page) = @_;
-
+ my ( $self, $resultset_page ) = @_;
+
my $rs = $self->result_source->resultset->search(
{
'ancestor.id' => $self->id,
@@ -266,17 +349,17 @@
],
},
{
- $resultset_page? (page => $resultset_page || 1, rows => 20) : (),
+ $resultset_page ? ( page => $resultset_page || 1, rows => 20 ) : (),
from => 'page me, page ancestor',
order_by => ['me.name']
}
- ); # an empty arrayref if there are no results because we'll dereference in the 'return'
-
- return wantarray?
- $self->result_source->resultset->set_paths($rs->all)
- : $rs
-}
-
+ )
+ ; # an empty arrayref if there are no results because we'll dereference in the 'return'
+
+ return wantarray
+ ? $self->result_source->resultset->set_paths( $rs->all )
+ : $rs;
+}
=head2 descendants_by_date
@@ -312,7 +395,6 @@
return $self->result_source->resultset->set_paths(@pages);
}
-
=head2 user_tags($user)
Return popular tags for this page used C<$user>.
@@ -321,18 +403,19 @@
sub user_tags {
my ( $self, $user ) = @_;
- my (@tags) = $self->result_source->related_source('tags')->resultset->search(
+ my (@tags) =
+ $self->result_source->related_source('tags')->resultset->search(
{
page => $self->id,
person => $user,
},
{
- select => [ 'me.id', 'me.tag', 'count(me.tag) as refcount' ],
- as => [ 'id', 'tag', 'refcount' ],
+ select => [ 'me.tag', 'count(me.tag) as refcount' ],
+ as => [ 'tag', 'refcount' ],
order_by => ['refcount'],
- group_by => [ 'me.id','me.tag'],
- }
- );
+ group_by => ['me.tag'],
+ }
+ );
return @tags;
}
@@ -344,18 +427,19 @@
sub others_tags {
my ( $self, $user ) = @_;
- my (@tags) = $self->result_source->related_source('tags')->resultset->search(
+ my (@tags) =
+ $self->result_source->related_source('tags')->resultset->search(
{
page => $self->id,
person => { '!=', $user }
},
{
- select => [ 'me.id', 'me.tag', 'count(me.tag) as refcount' ],
- as => [ 'id', 'tag', 'refcount' ],
+ select => [ 'me.tag', 'count(me.tag) as refcount' ],
+ as => [ 'tag', 'refcount' ],
order_by => ['refcount'],
- group_by => ['me.tag','me.id'],
- }
- );
+ group_by => ['me.tag'],
+ }
+ );
return @tags;
}
@@ -367,15 +451,16 @@
sub tags_with_counts {
my ( $self, $user ) = @_;
- my (@tags) = $self->result_source->related_source('tags')->resultset->search(
+ my (@tags) =
+ $self->result_source->related_source('tags')->resultset->search(
{ page => $self->id, },
{
- select => [ 'me.id', 'me.tag', 'count(me.tag) as refcount' ],
- as => [ 'id', 'tag', 'refcount' ],
+ select => [ 'me.tag', 'count(me.tag) as refcount' ],
+ as => [ 'tag', 'refcount' ],
order_by => ['refcount'],
- group_by => [ 'me.id', 'me.tag'],
- }
- );
+ group_by => ['me.tag'],
+ }
+ );
return @tags;
}
@@ -408,10 +493,9 @@
sub has_photos {
my $self = shift;
- return $self->result_source->schema->resultset('Photo')->search(
- { 'attachment.page' => $self->id },
- { join => [qw/attachment/] }
- )->count;
+ return $self->result_source->schema->resultset('Photo')
+ ->search( { 'attachment.page' => $self->id },
+ { join => [qw/attachment/] } )->count;
}
=head1 AUTHOR
Modified: trunk/libmojomojo-perl/script/util/dump_content.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/script/util/dump_content.pl?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/script/util/dump_content.pl (original)
+++ trunk/libmojomojo-perl/script/util/dump_content.pl Thu Feb 17 02:46:29 2011
@@ -30,7 +30,7 @@
my ($page_path, $filename_content, $dsn, $user, $pass) = @ARGV;
if (!$page_path) {
- die "USAGE: $0 /path/to/page
+ die "USAGE: $0 /path/to/page [dsn user pass]
Dump the raw (markup) contents of the last version of a page.
\n";
}
@@ -43,7 +43,7 @@
die "Couldn't read config file" if not keys %{$config};
eval {
- if (ref $config->{'Model::DBIC'}->{'connect_info'}) {
+ if (ref $config->{'Model::DBIC'}->{'connect_info'} eq 'HASH') {
$dsn = $config->{'Model::DBIC'}->{'connect_info'}->{dsn};
$user = $config->{'Model::DBIC'}->{'connect_info'}->{user};
$pass = $config->{'Model::DBIC'}->{'connect_info'}->{password};
@@ -51,7 +51,7 @@
($dsn, $user, $pass) = @{$config->{'Model::DBIC'}->{connect_info}};
}
};
- die "Your DSN settings in mojomojo.conf seem invalid\n" if $@;
+ die "Your DSN settings in mojomojo.conf seem invalid: $@\n" if $@;
}
die "Couldn't find a valid Data Source Name (DSN).\n" if !$dsn;
Modified: trunk/libmojomojo-perl/script/util/import_content.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmojomojo-perl/script/util/import_content.pl?rev=68864&op=diff
==============================================================================
--- trunk/libmojomojo-perl/script/util/import_content.pl (original)
+++ trunk/libmojomojo-perl/script/util/import_content.pl Thu Feb 17 02:46:29 2011
@@ -76,7 +76,7 @@
if (!$page_path) {
die "USAGE: $0 /path/to/page filename [dsn user pass]
-Replace the contents of the last version of a page with the content from a file
+Replace the contents of the last version of a page with the content from a file.
\n";
}
@@ -88,7 +88,7 @@
die "Couldn't read config file" if not keys %{$config};
eval {
- if (ref $config->{'Model::DBIC'}->{'connect_info'}) {
+ if (ref $config->{'Model::DBIC'}->{'connect_info'} eq 'HASH') {
$dsn = $config->{'Model::DBIC'}->{'connect_info'}->{dsn};
$user = $config->{'Model::DBIC'}->{'connect_info'}->{user};
$pass = $config->{'Model::DBIC'}->{'connect_info'}->{password};
@@ -96,7 +96,7 @@
($dsn, $user, $pass) = @{$config->{'Model::DBIC'}->{connect_info}};
}
};
- die "Your DSN settings in mojomojo.conf seem invalid\n" if $@;
+ die "Your DSN settings in mojomojo.conf seem invalid: $@\n" if $@;
}
die "Couldn't find a valid Data Source Name (DSN).\n" if !$dsn;
More information about the Pkg-perl-cvs-commits
mailing list