Changeset 52 in bookmarks for trunk/BookmarkApp.pm

Timestamp:

08/15/13 15:58:10 (11 years ago)

Author:

peter

Message:

• Bookmarks::get_bookmarks() and Bookmarks::get_cotags() support a query argument that limits the results to the bookmarks whose titles contain the query (implemented using SQL LIKE)
• the bookmark application takes a q query parameter and uses it as the bookmark text query
• added a text input to enter a text query

File:

• trunk/BookmarkApp.pm (modified) (13 diffs)

trunk/BookmarkApp.pm

@@ -45 +45 @@
 sub _get_list_links {
     my $self = shift;
-    my ($self_type, $tags) = @_;
+    my ($self_type, $query) = @_;
     my @links = (
         {
@@ -51 +51 @@
             type => 'application/json',
             query => {
-                tag => $tags,
+                %$query,
                 format => 'json',
             },
@@ -59 +59 @@
             type => 'application/xml',
             query => {
-                tag => $tags,
+                %$query,
                 format => 'xbel',
             },
@@ -68 +68 @@
             path => 'feed',
             query => {
-                tag => $tags,
+                %$query,
             },
         },
@@ -75 +75 @@
             type => 'text/csv',
             query => {
-                tag => $tags,
+                %$query,
                 format => 'csv',
             },
@@ -83 +83 @@
             type => 'text/uri-list',
             query => {
-                tag => $tags,
+                %$query,
                 format => 'text',
             },
@@ -91 +91 @@
             type => 'text/html',
             query => {
-                tag => $tags,
+                %$query,
             },
         },
@@ -140 +140 @@
 
     my @tags = grep { $_ ne '' } $q->param('tag');
+    my $query = $q->param('q');
     my $limit = $q->param('limit');
     my $offset = $q->param('offset');
     my @resources = $self->_bookmarks->get_bookmarks({
+        query  => $query,
         tag    => \@tags,
         limit  => $limit,
@@ -148 +150 @@
     });
     my @all_tags = $self->_bookmarks->get_tags({ selected => $tags[0] });
-    my @cotags = $self->_bookmarks->get_cotags({ tag => \@tags });
+    my @cotags = $self->_bookmarks->get_cotags({
+        query  => $query,
+        tag    => \@tags,
+    });
     
-    my $title = 'Bookmarks' . (@tags ? " tagged as " . join(' & ', @tags) : '');
+    my $title = 'Bookmarks' . (@tags ? " tagged as " . join(' & ', @tags) : '') . ($query ? " matching '$query'" : '');
 
     if ($format eq 'json') {
@@ -247 +252 @@
                 base_url     => $base_url,
                 title        => $title,
+                query        => $query,
                 selected_tag => $tags[0],
                 search_tags  => \@tags,
-                links        => [ $self->_get_list_links('text/html', \@tags) ],
+                links        => [ $self->_get_list_links('text/html', { q => $query, tag => \@tags }) ],
                 all_tags     => \@all_tags,
                 cotags       => \@cotags,
@@ -262 +268 @@
     my $q = $self->query;
 
+    my $query = $q->param('q');
     my @tags = grep { $_ ne '' } $q->param('tag');
     my $title = 'Bookmarks' . (@tags ? " tagged as " . join(' & ', @tags) : '');
@@ -280 +287 @@
     $feed->id($feed_uri->canonical);
 
-    for my $link ($self->_get_list_links('application/atom+xml', \@tags)) {
+    for my $link ($self->_get_list_links('application/atom+xml', { q => $query, tag => \@tags })) {
         my $atom_link = XML::Atom::Link->new;
         $atom_link->type($link->{type});
@@ -289 +296 @@
 
     # construct a feed from the most recent 12 bookmarks
-    for my $bookmark ($self->_bookmarks->get_bookmarks({ tag => \@tags, limit => 12 })) {
+    for my $bookmark ($self->_bookmarks->get_bookmarks({ query => $query, tag => \@tags, limit => 12 })) {
         my $entry = XML::Atom::Entry->new;
         $entry->id($bookmark->bookmark_uri->canonical);