Changeset 1618

Timestamp:

11/16/07 14:28:10 (6 years ago)

Author:

charsbar

Message:

lang/perl/Jipotter: now searchable; aggregator stopped using load_or_create, which seems somewhat unreliable

Location:

lang/perl/Jipotter/trunk

Files:

• lib/Jipotter/Plugin/Timelines.pm (modified) (1 diff)
• lib/Jipotter/Plugin/Timelines/Action/Post.pm (modified) (2 diffs)
• lib/Jipotter/Plugin/Timelines/Action/Search.pm (added)
• lib/Jipotter/Plugin/Timelines/Dispatcher.pm (modified) (1 diff)
• lib/Jipotter/Plugin/Timelines/View.pm (modified) (5 diffs)
• lib/Jipotter/Script/Aggregate.pm (modified) (1 diff)
• lib/Jipotter/View.pm (modified) (1 diff)
• share/web/static/css/jipotter.css (modified) (1 diff)

lang/perl/Jipotter/trunk/lib/Jipotter/Plugin/Timelines.pm

@@ -58 +58 @@
 sub items_per_page { shift->{items_per_page} || 20 }
 
+sub search_phrase {
+  my $self = shift;
+  if ( @_ ) {
+    $self->{search_phrase} = shift;
+  }
+  $self->{search_phrase};
+}
 
 1;

lang/perl/Jipotter/trunk/lib/Jipotter/Plugin/Timelines/Action/Post.pm

@@ -40 +40 @@
 };
 
-sub moniker { 'update' }
+sub moniker { 'timelines_post' }
 
 sub sticky_on_failure { 0 }
@@ -57 +57 @@
     if ( $self->argument_value( $service->name ) ) {
 
-      Jifty->log->info( $service->name .' is updated at '. localtime );
+      Jifty->log->info( 'Posted to '. $service->name .' at '. localtime );
       $service->update( $message );
     }

lang/perl/Jipotter/trunk/lib/Jipotter/Plugin/Timelines/Dispatcher.pm

@@ -5 +5 @@
 use Jifty::Dispatcher -base;
 
-before qr{^/update} => run {
+before qr{^/timelines/post} => run {
   Jifty->web->new_action(
     class => 'Jipotter::Plugin::Timelines::Action::Post',
-    moniker => 'update'
+    moniker => 'timelines_post'
+  )->run;
+
+  redirect '/';
+};
+
+before qr{^/timelines/search} => run {
+  Jifty->web->new_action(
+    class => 'Jipotter::Plugin::Timelines::Action::Search',
+    moniker => 'timelines_search'
   )->run;
 

lang/perl/Jipotter/trunk/lib/Jipotter/Plugin/Timelines/View.pm

@@ -5 +5 @@
 use Jifty::View::Declare -base;
 use Jipotter::Model::StatusCollection;
+use Time::Piece;
+
+template 'timelines' => sub {
+  set region => Jifty::Web::PageRegion->new(
+    name     => 'timelines_table',
+    path     => '/timelines/region',
+    defaults => { page => get('page') || 1 },
+  );
+
+  show '/timelines/form';
+  show '/timelines/search';
+  show '/timelines/table';
+};
 
 private template 'timelines/form' => sub {
   my $action = Jifty->web->new_action(
-    class   => 'Jipotter::Plugin::Timelines::Action::Post',
-    moniker => 'update',
+    class    => 'Jipotter::Plugin::Timelines::Action::Post',
+    moniker  => 'timelines_post',
   );
 
+  my $plugin = Jifty->find_plugin('Jipotter::Plugin::Timelines');
+
   div { attr { class => 'PostBox' };
-    Jifty->web->form->start( submit_to => '/update' );
+    Jifty->web->form->start( submit_to => '/timelines/post' );
 
     render_param( $action => 'message' );
@@ -20 +35 @@
 
     form_submit( label => 'Update', name => 'submit' );
-
-    my $plugin = Jifty->find_plugin('Jipotter::Plugin::Timelines');
 
     foreach my $service ( $plugin->available_services ) {
@@ -34 +47 @@
 };
 
+private template 'timelines/search' => sub {
+  my $action = Jifty->web->new_action(
+    class   => 'Jipotter::Plugin::Timelines::Action::Search',
+    moniker => 'timelines_search',
+  );
+
+  my $region = get('region');
+  my $plugin = Jifty->find_plugin('Jipotter::Plugin::Timelines');
+
+  div { attr { class => 'timelines_search' };
+    Jifty->web->form->start( submit_to => 'timelines/search' );
+
+    render_param(
+      $action => 'phrase', sticky_value => $plugin->search_phrase
+    );
+
+    form_submit(
+      label => 'Search',
+      name  => 'submit_search',
+      onclick => {
+        submit  => $action,
+        refresh => $region->name,
+        args    => { phrase => $plugin->search_phrase },
+      }
+    );
+
+    Jifty->web->form->end;
+  };
+};
+
 private template 'timelines/table' => sub {
-  render_region(
-    name     => 'timelines_table',
-    path     => '/timelines/region',
-    defaults => { page => get('page') || 1 },
-  );
+  my $region = get('region');
+
+  $region->render;
 };
 
 template 'timelines/region' => sub {
-  my $page = get('page') || 1;
+  my $page       = get('page') || 1;
   my $message_id = get('message_id') || '';
 
   my $plugin = Jifty->find_plugin('Jipotter::Plugin::Timelines');
+  my $phrase = $plugin->search_phrase;
 
   my $entries = Jipotter::Model::StatusCollection->new;
-     $entries->unlimit;
-     $entries->order_by( column => 'epoch', order => 'DESC' );
-     $entries->set_page_info(
-       current_page => $page,
-       per_page     => $plugin->items_per_page,
-     );
+  if ( defined $phrase ) {
+
+    # XXX: We need ESCAPE '\\' with them for SQLite actually...
+    $phrase =~ s/%/\\%/g;
+    $phrase =~ s/_/\\_/g;
+
+    $entries->limit(
+      column   => 'text',
+      value    => $phrase,
+      operator => 'MATCHES',
+    );
+  }
+  else {
+    $entries->unlimit;
+  }
+  $entries->order_by( column => 'epoch', order => 'DESC' );
+  $entries->set_page_info(
+    current_page => $page,
+    per_page     => $plugin->items_per_page,
+  );
   set entries => $entries;
 
@@ -60 +116 @@
 
   table { attr { class => 'Statuses' };
+    my $now = localtime;
+    caption { attr { class => 'timeline_caption' };
+      'Last updated: '.$now->ymd.' '.$now->hms;
+    };
+
     while ( my $entry = $entries->next ) {
 
@@ -125 +186 @@
       }
       else {
-        span { attr { class => 'current' }; strong { "$num " } };
+        span { attr { class => 'current' }; "$num " };
       }
     }

lang/perl/Jipotter/trunk/lib/Jipotter/Script/Aggregate.pm

@@ -19 +19 @@
     Jifty->log->debug( 'registering '.$service->name );
 
+    my $ct = 0;
     foreach my $status ( $service->timelines ) {
       my $entry = Jipotter::Model::Status->new;
-         $entry->load_or_create( %{ $status } );
+      $entry->load_by_cols( link => $status->link );
+      unless ( $entry->id ) {
+        $entry->create( %{ $status } );
+        $ct++;
+      }
     }
+    Jifty->log->debug( "registered $ct entries" ) if $ct;
   }
 }

lang/perl/Jipotter/trunk/lib/Jipotter/View.pm

@@ -13 +13 @@
     body {
       div { attr { class => 'BodyContainer' };
-        # see Timelines plugin
-        show 'timelines/form';
-        show 'timelines/table';
+        show 'timelines'; # see Timelines plugin
       }
     }

lang/perl/Jipotter/trunk/share/web/static/css/jipotter.css

@@ -74 +74 @@
 }
 
+.timeline_caption {
+    font-size: 90%;
+    margin-bottom: 20px;
+}
+
+.timelines_search {
+    background-color: #eeeeee;
+    width: 100%;
+    margin-bottom: 3px;
+    margin-top: 3px;
+    padding-top: 4px;
+    padding-bottom: 4px;
+}
+
+.timelines_search form {
+    margin-left: 10px;
+}
+
+.timelines_search div {
+    display: inline;
+    margin: auto;
+}
+