* Model::Cowrapper: rename build_orderby_clause() to build_order_by_clause() and...

diff --git a/src/newslash_web/lib/Newslash/Model/Comments.pm b/src/newslash_web/lib/Newslash/Model/Comments.pm
index 69453d4..27c5351 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Comments.pm
+++ b/src/newslash_web/lib/Newslash/Model/Comments.pm
@@ -75,7 +75,7 @@ sub select {
 
     my $where_clause = @clauses ? 'WHERE ' . join(' AND ', @clauses) : "";
 
-    my ($orderby, $orderby_values) = $self->build_orderby_clause(keys => {date => 'comments.date'}, params => $params);
+    my ($orderby, $orderby_values) = $self->build_order_by_clause(keys => {date => 'comments.date'}, params => $params);
     if (@$orderby_values) {
         push @values, @$orderby_values;
     }

diff --git a/src/newslash_web/lib/Newslash/Model/Cowrapper.pm b/src/newslash_web/lib/Newslash/Model/Cowrapper.pm
index 9dddab8..225f2e8 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Cowrapper.pm
+++ b/src/newslash_web/lib/Newslash/Model/Cowrapper.pm
@@ -246,7 +246,7 @@ sub _calculate_time_range {
 }
 
 
-=head2 build_where_clause(unique_keys => $unique_keys, keys => $keys, params => \%params)
+=head2 build_where_clause(unique_keys => $unique_keys, timestamps => $timestamps, keys => $keys, params => \%params)
 
 build SQL's WHERE clause.
 
@@ -424,7 +424,7 @@ sub build_limit_clause {
       : { clause => $clause, values => \@values };
 }
 
-=head2 build_orderby_clause(keys => $keys, params => \@params)
+=head2 build_order_by_clause(keys => $keys, params => \@params)
 
 build SQL's ORDER BY clause.
 
@@ -457,7 +457,7 @@ when scalar context, return hashref like:
 
 =cut
 
-sub build_orderby_clause {
+sub build_order_by_clause {
     my $self = shift;
     my $args = {@_};
 
@@ -492,8 +492,8 @@ sub build_orderby_clause {
             $order = "ASC"  if lc($order_by->{$k}) eq 'asc';
 
             my $target = "";
-            if ($use_alias && $args->{columns}->{$k}) {
-                $target = $args->{columns}->{$k};
+            if ($use_alias && $args->{keys}->{$k}) {
+                $target = $args->{keys}->{$k};
             }
             else {
                 $target = $k;
@@ -515,8 +515,8 @@ sub build_orderby_clause {
             next if !any {$_ eq $col} @$columns;
 
             my $target = "";
-            if ($use_alias && $args->{columns}->{$k}) {
-                $target = $args->{columns}->{$k};
+            if ($use_alias && $args->{keys}->{$k}) {
+                $target = $args->{keys}->{$k};
             }
             else {
                 $target = $k;
@@ -603,7 +603,7 @@ sub generic_select {
 
     my @all_keys;
     push @all_keys, @$uniques, @$keys;
-    ($orderby, $values) = $self->build_orderby_clause(keys => \@all_keys, params => $params);
+    ($orderby, $values) = $self->build_order_by_clause(keys => \@all_keys, params => $params);
     push @arguments, @$values if @$values;
 
     ($limit, $values) = $self->build_limit_clause(params => $params);

diff --git a/src/newslash_web/lib/Newslash/Model/Stories.pm b/src/newslash_web/lib/Newslash/Model/Stories.pm
index ab75abb..d4b5447 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Stories.pm
+++ b/src/newslash_web/lib/Newslash/Model/Stories.pm
@@ -287,7 +287,7 @@ sub select {
     #         $order_clause = "ORDER BY $k $order";
     #     }
     # }
-    my ($order_clause, $order_values) = $self->build_orderby_clause(keys => [qw(commentcount hits time)], params => $params);
+    my ($order_clause, $order_values) = $self->build_order_by_clause(keys => [qw(commentcount hits time)], params => $params);
 
     # build LIMIT clause
     my $limit_clause = "";

diff --git a/src/newslash_web/lib/Newslash/Model/Submissions.pm b/src/newslash_web/lib/Newslash/Model/Submissions.pm
index 00c4050..d7d555d 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Submissions.pm
+++ b/src/newslash_web/lib/Newslash/Model/Submissions.pm
@@ -213,7 +213,7 @@ sub _select_all {
     my ($self, $params) = @_;
     my @values;
 
-    my ($orderby, $orderby_values) = $self->build_orderby_clause(keys => {timestamp => 'submissions.time'}, params => $params);
+    my ($orderby, $orderby_values) = $self->build_order_by_clause(keys => {timestamp => 'submissions.time'}, params => $params);
     if (@$orderby_values) {
         push @values, @$orderby_values;
     }