* cambiato ordinamento dei tag (ora è sempre alfabetico)

 * riordinata e migliorata la form di add
 * stile per la form di add
 * corretto il caricamento delle favicon
 * corretta la pulitura tags

3 files changed, 32 insertions, 12 deletions

diff --git a/lib/Bookmarks/C/Main.pm b/lib/Bookmarks/C/Main.pm
index 1e2bf54..d957c5d 100644
--- a/lib/Bookmarks/C/Main.pm
+++ b/lib/Bookmarks/C/Main.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'Catalyst::Base';
 use Bookmarks::Utils;
 use File::Slurp;
+use List::MoreUtils qw(uniq);
 
 =head1 NAME
 
@@ -34,7 +35,7 @@ sub auto : Private {
 sub tags : Global {
     my ( $self, $c ) = @_;
     $c->stash->{template}='tags';
-    $c->stash->{tags}=[Bookmarks::M::DB::Tags->get_all_tags_by_popularity()];
+    $c->stash->{tags}=[Bookmarks::M::DB::Tags->get_all_tags_by_name()];
 }
 
 sub tag : Regex('^tag/(.*)$') {
@@ -87,21 +88,28 @@ sub add : Global {
     my ( $self, $c ) = @_;
 
     my %pre_link=();
-    for my $i (qw(url title descr)) {
-        $pre_link{$i}=$c->req->param($i);
+    for my $field (qw(url title descr)) {
+        $pre_link{$field}=$c->req->param($field);
     }
     my @tags=split /[ +]/,($c->req->param('tag')||'');
+    my ($dblink)=Bookmarks::M::DB::Links->search({url=>$pre_link{url}});
 
     # GET: prepare the form from the URL params
     if ($c->req->method eq 'GET') {
         $c->stash->{link}=\%pre_link;
         $c->stash->{tags}=\@tags;
+        if (defined $dblink) {
+            for my $field (qw(url title descr)) {
+                $c->stash->{link}{$field}||=$dblink->$field();
+            }
+            my @dbtags=map { $_->name() } $dblink->tags();
+            $c->stash->{tags}=[ uniq(@tags,@dbtags) ];
+        }
         $c->stash->{template}='add_form';
+        $c->stash->{close}=$c->req->param('close');
     }
     # POST: accept data and create link+tags
     elsif ($c->req->method eq 'POST') {
-        my ($dblink)=Bookmarks::M::DB::Links->search({url=>$pre_link{url}});
-
         if (defined $dblink) {
             Bookmarks::M::DB::LinksTags->search({
                 link => $dblink->pk()
diff --git a/lib/Bookmarks/M/DB/Tags.pm b/lib/Bookmarks/M/DB/Tags.pm
index 4ca832a..56ec4fa 100644
--- a/lib/Bookmarks/M/DB/Tags.pm
+++ b/lib/Bookmarks/M/DB/Tags.pm
@@ -4,20 +4,28 @@ use strict;
 
 __PACKAGE__->has_many( links => ['Bookmarks::M::DB::LinksTags' => 'link'] );
 
-# magari ordiniamoli per popolrità
 __PACKAGE__->set_sql('related_tags', <<'END_SQL');
-SELECT DISTINCT tags.pk
+SELECT DISTINCT tags.pk, tags.name
   FROM tags, links_tags lt1, links_tags lt2
  WHERE tags.pk  = lt1.tag
    AND lt1.link = lt2.link
    AND lt2.tag  = ?
    AND lt1.tag != lt2.tag
+ORDER BY tags.name
+END_SQL
+
+__PACKAGE__->set_sql('name', <<'END_SQL');
+SELECT tags.pk, tags.name, COUNT(links_tags.link) AS how_many
+  FROM tags LEFT JOIN links_tags
+    ON tags.pk = links_tags.tag
+GROUP BY tags.pk
+ORDER BY tags.name
 END_SQL
 
 __PACKAGE__->set_sql('popularity', <<'END_SQL');
 SELECT tags.pk, COUNT(links_tags.link) AS how_many
-  FROM tags, links_tags
- WHERE tags.pk = links_tags.tag
+  FROM tags LEFT JOIN links_tags
+    ON tags.pk = links_tags.tag
 GROUP BY tags.pk
 ORDER BY how_many DESC
 END_SQL
@@ -39,6 +47,10 @@ sub get_all_tags_by_popularity {
     return $_[0]->search_popularity();
 }
 
+sub get_all_tags_by_name {
+    return $_[0]->search_name();
+}
+
 sub links_sorter($$) {
     return
         ($_[1]->access_count || 0)
diff --git a/lib/Bookmarks/Utils.pm b/lib/Bookmarks/Utils.pm
index b9fec9c..b65b707 100644
--- a/lib/Bookmarks/Utils.pm
+++ b/lib/Bookmarks/Utils.pm
@@ -28,14 +28,14 @@ sub get_site_icon {
              m{<link
                \s+
                (?:
-               rel="shortcut\ icon"
+               rel="(?:shortcut\ +)?icon"
                \s+
                href="(.*?)"
            )|(?:
                href="(.*?)"
                \s+
-               rel="shortcut\ icon"
-           )}smx);
+               rel="(?:shortcut\ +)?icon"
+           )}ismx);
     if (!$favicon) {
         $favicon='/favicon.ico';
     }