Code

gitweb: Clean up code in git_search_* subroutines
authorJakub Narebski <jnareb@gmail.com>
Wed, 22 Jun 2011 15:28:54 +0000 (17:28 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2011 18:52:28 +0000 (11:52 -0700)
Replace sequence of

       $foo .= "bar";
       $foo .= "baz";

with

       $foo .= "bar" .
       "baz";

Use href(-replay=>1, -page=>undef) for first page of a multipl-page view.

Wrap some lines to reduce their length. Some lines still have more than 80
characters, but lines are shorter now.

No functional changes intended.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb/gitweb.perl

index 9d9dc0149cea0ba4c99ef7a4d90c46be34427d84..80cbe66eab5d1c680a1f39c1608a34522730d609 100755 (executable)
@@ -5273,16 +5273,13 @@ sub git_search_message {
        my $paging_nav = '';
        if ($page > 0) {
                $paging_nav .=
-                       $cgi->a({-href => href(action=>"search", hash=>$hash,
-                                              searchtext=>$searchtext,
-                                              searchtype=>$searchtype)},
-                               "first");
-               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => href(-replay=>1, page=>undef)},
+                               "first") .
+                       " &sdot; " .
                        $cgi->a({-href => href(-replay=>1, page=>$page-1),
                                 -accesskey => "p", -title => "Alt-p"}, "prev");
        } else {
-               $paging_nav .= "first";
-               $paging_nav .= " &sdot; prev";
+               $paging_nav .= "first &sdot; prev";
        }
        my $next_link = '';
        if ($#commitlist >= 100) {
@@ -5327,10 +5324,13 @@ sub git_search_changes {
                        if (%co) {
                                print "</td>\n" .
                                      "<td class=\"link\">" .
-                                     $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
+                                     $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})},
+                                             "commit") .
                                      " | " .
-                                     $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
-                               print "</td>\n" .
+                                     $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'},
+                                                            hash_base=>$co{'id'})},
+                                             "tree") .
+                                     "</td>\n" .
                                      "</tr>\n";
                        }
 
@@ -5364,10 +5364,13 @@ sub git_search_changes {
        if (%co) {
                print "</td>\n" .
                      "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
+                     $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})},
+                             "commit") .
                      " | " .
-                     $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
-               print "</td>\n" .
+                     $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'},
+                                            hash_base=>$co{'id'})},
+                             "tree") .
+                     "</td>\n" .
                      "</tr>\n";
        }