Model::Firehose: fix select() to filter by tagnameid

diff --git a/src/newslash_web/lib/Newslash/Model/Cowrapper.pm b/src/newslash_web/lib/Newslash/Model/Cowrapper.pm
index a9617af..89023db 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Cowrapper.pm
+++ b/src/newslash_web/lib/Newslash/Model/Cowrapper.pm
@@ -1711,7 +1711,12 @@ sub _build_keys {
         $rs->{$uk} = "$basename$uk";
         for my $k (keys %{$def->{aliases}}) {
             if ($uk eq $def->{aliases}->{$k}) {
-                $rs->{$k} = "$basename$uk";
+                if ($uk =~ m/\S+\.\S+/) {
+                    $rs->{$k} = "$uk";
+                }
+                else {
+                    $rs->{$k} = "$basename$uk";
+                }
             }
         }
     }

diff --git a/src/newslash_web/lib/Newslash/Model/Firehose.pm b/src/newslash_web/lib/Newslash/Model/Firehose.pm
index 2f543ba..c5c817f 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Firehose.pm
+++ b/src/newslash_web/lib/Newslash/Model/Firehose.pm
@@ -24,12 +24,16 @@ sub key_definition {
                          body_length word_count
                          srcname thumb mediatype
                          offmainpage sprite sprite_info
-                         preview)],
+                         preview tags.tagnameid
+                       )],
             aliases => { firehose_id => "id",
                          globj_id => "globjid",
                          src_id => "srcid",
                          create_time => "createtime",
                          update_time => "updatetime",
+                         tag_name_id => "tags.tagnameid",
+                         tagname_id => "tags.tagnameid",
+                         tagnameid => "tags.tagnameid",
                        }
            };
 }
@@ -99,8 +103,8 @@ SELECT firehose.id AS firehose_id, firehose.*, firehose_text.*, topics.tid, stor
     $limit_clause
 EOSQL
 
-    #warn $sql;
-    #warn Dumper @attrs;
+    warn $sql;
+    warn Dumper @attrs;
 
     my $sth = $dbh->prepare($sql);
     $sth->execute(@attrs);