Changeset 52 in bookmarks for trunk/Bookmarks.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/Bookmarks.pm (modified) (6 diffs)

trunk/Bookmarks.pm

@@ -71 +71 @@
     my $self = shift;
     my $params = shift;
+    my $query = $params->{query};
     my $tags = $params->{tag} || [];
     my $limit = $params->{limit};
@@ -92 +93 @@
         push @sql, 'select * from resources join bookmarks on resources.uri = bookmarks.uri';
     }
+    if ($query) {
+        push @sql, (@$tags ? 'and' : 'where'), 'title like', \"%$query%";
+    }
     push @sql, 'order by ctime desc';
     push @sql, ('limit', \$limit) if $limit;
@@ -98 +102 @@
 
     my ($sql, @bind) = sql_interp(@sql);
+    #die $sql;
 
     my $sth_resource = $self->dbh->prepare($sql);
@@ -133 +138 @@
     my $self = shift;
     my $params = shift;
+    my $query = $params->{query};
     my $tags = $params->{tag} || [];
     if (!ref $tags) {
@@ -140 +146 @@
 
     push @sql, 'select tag, count(tag) as count from tags';
+    push @sql, 'join resources on tags.uri = resources.uri' if $query;
+
+    # build the where clause
     if (@$tags) {
-        push @sql, 'where uri in (';
+        push @sql, 'where tags.uri in (';
         my $intersect = 0;
         for my $tag (@{ $tags }) {
@@ -150 +159 @@
         push @sql, ') and tag not in ', $tags, '';
     }
+    if ($query) {
+        push @sql, (@$tags ? 'and' : 'where'), 'title like', \"%$query%";
+    }
+
     push @sql, 'group by tag order by tag';