From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jean-Baptiste Quenot <jbq@caraldi.com>
Subject: Re: [PATCH] gitweb: Better chopping in commit search results
Date: Fri, 22 Feb 2008 20:14:12 +0100 [thread overview]
Message-ID: <200802222014.13205.jnareb@gmail.com> (raw)
In-Reply-To: <200802221849.44054.jnareb@gmail.com>
Jakub Narebski wrote:
> On Fri, 22 Feb 2008, Junio C Hamano wrote:
>> For example, if you are looking for "very long ... and how"
>> in the first paragraph of message (if it were all on a single
>> line), wouldn't you want to see:
>>
>> ...st this with <<very long ... and how>> the actual out...
>>
>> rather than:
>>
>> Could som... <<very long search stri...>> the actual out...
>>
>> in the result?
>
> ...but I think it is better left for another patch.
End here is proposed improved chop_str which can do chopping at
beginning, in the middle, and (as it used to do) at the end.
Some questions about the code:
* should we divide slop in two also when chopping in the middle?
* what should extra option be named, and what should be names of
posible values of this option (the option deciding where to chop)
* $add_len has default value if not provided, or if 0 (!), or if '';
you have to use chop_str($str, 20, undef, -pos=>'center') trick
to use it with extra options.
* can the code be improved? I'm not Perl expert.
-- >8 --
sub chop_str {
my $str = shift;
my $len = shift;
my $add_len = shift || 10;
# supported opts:
# * -pos => 'left' | 'center' | 'right', defaults to 'right'
# denotes where (which part) to chop
my %opts = @_;
# allow only $len chars, but don't cut a word if it would fit in $add_len
# if it doesn't fit, cut it if it's still longer than the dots we would add
# remove chopped character entities entirely
# when chopping in the middle, distribute $len into left and right part
if (defined $opts{'-pos'} && $opts{'-pos'} eq 'center') {
$len = int($len/2);
}
# regexps: ending and beginning with word part up to $add_len
my $endre = qr/.{0,$len}[^ \/\-_:\.@]{0,$add_len}/;
my $begre = qr/[^ \/\-_:\.@]{0,$add_len}.{0,$len}/;
if (defined $opts{'-pos'} && $opts{'-pos'} eq 'left') {
$str =~ m/^(.*?)($begre)$/;
my ($lead, $body) = ($1, $2);
if (length($lead) > 4) {
if ($lead =~ m/&[^;]*$/) {
$body =~ s/^[^;]*;//;
}
$lead = "... ";
}
return "$lead$body";
} elsif (defined $opts{'-pos'} && $opts{'-pos'} eq 'center') {
$str =~ m/^($endre)(.*)$/;
my ($left, $str) = ($1, $2);
$str =~ m/^(.*?)($begre)$/;
my ($mid, $right) = ($1, $2);
if (length($mid) > 5) {
$left =~ s/&[^;]*$//;
if ($mid =~ m/&[^;]*$/) {
$right =~ s/^[^;]*;//;
}
$mid = " ... ";
}
return "$left$mid$right";
} else {
$str =~ m/^($endre)(.*)$/;
my $body = $1;
my $tail = $2;
if (length($tail) > 4) {
$body =~ s/&[^;]*$//;
$tail = " ...";
}
return "$body$tail";
}
}
-- >8 --
Example usage:
chop_str($str, 15, 5, -pos=>'center')
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2008-02-22 19:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-13 17:37 [PATCH] Do not chop HTML tags in commit search result Jean-Baptiste Quenot
2008-02-13 19:16 ` Jakub Narebski
2008-02-13 19:43 ` Junio C Hamano
2008-02-22 16:33 ` [PATCH] gitweb: Better chopping in commit search results Jakub Narebski
2008-02-22 17:14 ` Junio C Hamano
2008-02-22 17:49 ` Jakub Narebski
2008-02-22 19:14 ` Jakub Narebski [this message]
2008-02-23 21:44 ` [RFC/PATCH] gitweb: Option to chop at beginning and in the middle in chop_str Jakub Narebski
2008-02-23 22:04 ` [PATCH] gitweb: Better chopping in commit search results Junio C Hamano
2008-02-23 23:36 ` Jakub Narebski
2008-02-24 13:01 ` [RFC/PATCH v2] gitweb: Option to chop at beginning and in the middle in chop_str Jakub Narebski
2008-02-25 1:46 ` Junio C Hamano
2008-02-25 20:07 ` [RFC/PATCH v3] gitweb: Better cutting matched string and its context Jakub Narebski
2008-02-25 20:18 ` Junio C Hamano
2008-02-23 9:27 ` [PATCH] gitweb: Better chopping in commit search results Karl Hasselström
2008-02-23 10:20 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200802222014.13205.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jbq@caraldi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).