[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-315-g494da84
Alex Vandiver
alexmv at bestpractical.com
Fri Aug 13 14:08:47 EDT 2010
The branch, 3.9-trunk has been updated
via 494da84235d89254e89da60d94a51d4dcc9ff38a (commit)
via 012c16d0f25610293f251793e8f79c85fb276f95 (commit)
via d0c0ca931233dfb524ed33061ffa40c2b1b71747 (commit)
via 5e14573595a603b200e455dd5b4b9e1c2d5f1794 (commit)
via ce1fb4931ddb33e9e6ad471f3112845b97d46069 (commit)
via 209c9a8bb929d2ffefc8cbec5a03a2bb2ae2b49f (commit)
from 85610635e75920407250d8c9b307e944b5f3f562 (commit)
Summary of changes:
share/html/Search/Results.tsv | 150 ++++++++++++++++------------------------
1 files changed, 60 insertions(+), 90 deletions(-)
- Log -----------------------------------------------------------------
commit 209c9a8bb929d2ffefc8cbec5a03a2bb2ae2b49f
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Tue Jul 27 15:18:23 2010 +0800
Use format for generating csv search results.
diff --git a/share/html/Search/Results.tsv b/share/html/Search/Results.tsv
index ce9d5dc..412e811 100644
--- a/share/html/Search/Results.tsv
+++ b/share/html/Search/Results.tsv
@@ -46,12 +46,57 @@
%#
%# END BPS TAGGED BLOCK }}}
<%ARGS>
+$Format => undef
$Query => ''
$OrderBy => 'id'
$Order => 'ASC'
+$PreserveNewLines => 0
</%ARGS>
<%INIT>
+$r->content_type('application/vnd.ms-excel');
+
+my $DisplayFormat = $m->comp('/Elements/ScrubHTML', Content => $Format);
+
+my @Format = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $DisplayFormat);
+
+my @columns;
+
+sub col_entry {
+ my $col = shift;
+ return {
+ header => loc($col->{title} || $col->{attribute}),
+ map => $m->comp(
+ "/Elements/ColumnMap",
+ Name => $col->{attribute},
+ Attr => 'value'
+ ),
+ }
+}
+
+if ($PreserveNewLines) {
+ my $col = [];
+ push @columns, $col;
+ for (@Format) {
+ if ($_->{title} eq 'NEWLINE') {
+ $col = [];
+ push @columns, $col;
+ }
+ else {
+ push @$col, col_entry($_);
+ }
+ }
+}
+else {
+ push @columns, [map { $_->{attribute}
+ ? col_entry($_)
+ : () } @Format];
+}
+
+for (@columns) {
+ $m->out(join("\t", map { $_->{header} } @$_)."\n");
+}
+
my $Tickets = RT::Tickets->new( $session{'CurrentUser'} );
$Tickets->FromSQL( $Query );
if ( $OrderBy =~ /\|/ ) {
@@ -67,97 +112,12 @@ else {
$Tickets->OrderBy( FIELD => $OrderBy, ORDER => $Order );
}
-my %cf_id_to_name;
-my %cf_name_to_pos;
-{
- my $cfs = RT::SQL::PossibleCustomFields(
- Query => $Query, CurrentUser => $session{'CurrentUser'},
- );
- while ( my $cf = $cfs->Next ) {
- my $name = $cf->Name;
- $cf_id_to_name{ $cf->id } = $name;
- next if $cf_name_to_pos{ $name };
-
- $cf_name_to_pos{ $name } =
- (sort { $b <=> $a } values %cf_name_to_pos)[0] + 1;
+my $ii = 0;
+while (my $row = $Tickets->Next) {
+ for (@columns) {
+ $m->out(join("\t", map { ProcessColumnMapValue($_->{map}, Arguments => [$row, $ii++]) } @$_)."\n");
}
}
-
-my @attrs = qw(
- id QueueObj->Name Subject Status
- TimeEstimated TimeWorked TimeLeft
- Priority FinalPriority
- OwnerObj->Name
- Requestors->MemberEmailAddressesAsString
- Cc->MemberEmailAddressesAsString
- AdminCc->MemberEmailAddressesAsString
- CreatedObj->ISO
- StartsObj->ISO StartedObj->ISO ResolvedObj->ISO DueObj->ISO
- ToldObj->ISO LastUpdatedObj->ISO
-);
-
-$r->content_type('application/vnd.ms-excel');
-{
- my @header;
- foreach my $attr (@attrs) {
- my $label = $attr;
- $label =~ s'Obj-.(?:AsString|Name|ISO)''g;
- $label =~ s'-\>MemberEmailAddressesAsString''g;
- push @header, $label;
- }
-
- $_ += @header - 1 foreach values %cf_name_to_pos;
-
- foreach my $name ( sort { $cf_name_to_pos{$a} <=> $cf_name_to_pos{$b} } keys %cf_name_to_pos ) {
- push @header, "CF-". $name;
- }
- $m->out(join("\t", @header));
- $m->out("\n");
- $m->flush_buffer;
-}
-
-my $i = 0;
-while ( my $Ticket = $Tickets->Next()) {
- my @row;
- foreach my $attr (@attrs) {
- my $value;
- if ($attr =~ /(.*)->ISO$/ and $Ticket->$1->Unix <= 0) {
- $value = '';
- } else {
- my $method = '$Ticket->'.$attr.'()';
- $method =~ s/->ISO\(\)$/->ISO( Timezone => 'user' )/;
- $value = eval $method;
- if ($@) {die "Failed to find $attr - ". $@};
- }
- push @row, $value;
- }
-
- my $values = $Ticket->CustomFieldValues;
- $values->OrderByCols; # don't sort them
- while (my $value = $values->Next) {
- my $pos = $cf_name_to_pos{ $cf_id_to_name{ $value->CustomField } };
- next unless $pos;
-
- $row[$pos] = '' unless defined $row[$pos];
- $row[$pos] .= ', ' if $row[$pos];
- $row[$pos] .= $value->Content;
- }
-
- # remove tabs from all field values, they screw up the tsv
- for (@row) {
- $_ = '' unless defined;
- $_ =~ s/(?:\n|\r)//g;
- $_ =~ s{\t}{ }g;
- }
-
- $m->out(join("\t", at row));
- $m->out("\n");
-
- unless (++$i%10) {
- $i = 0;
- $m->flush_buffer;
- }
-}
-
$m->abort();
+
</%INIT>
commit ce1fb4931ddb33e9e6ad471f3112845b97d46069
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Tue Aug 10 17:17:56 2010 +0800
remove newlines and tabs.
diff --git a/share/html/Search/Results.tsv b/share/html/Search/Results.tsv
index 412e811..a4e877f 100644
--- a/share/html/Search/Results.tsv
+++ b/share/html/Search/Results.tsv
@@ -114,8 +114,15 @@ else {
my $ii = 0;
while (my $row = $Tickets->Next) {
- for (@columns) {
- $m->out(join("\t", map { ProcessColumnMapValue($_->{map}, Arguments => [$row, $ii++]) } @$_)."\n");
+ for my $col (@columns) {
+ my @x = @$col;
+ $m->out(join("\t", map {
+ my $val = ProcessColumnMapValue($_->{map}, Arguments => [$row, $ii++], Escape => 0);
+ # remove tabs from all field values, they screw up the tsv
+ $val = '' unless defined $val;
+ $val =~ s/(?:\n|\r)//g; $val =~ s{\t}{ }g;
+ $val;
+ } @$col)."\n");
}
}
$m->abort();
commit 5e14573595a603b200e455dd5b4b9e1c2d5f1794
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Tue Aug 10 17:45:05 2010 +0800
use closure to avoid namespace pollution.
diff --git a/share/html/Search/Results.tsv b/share/html/Search/Results.tsv
index a4e877f..29197ce 100644
--- a/share/html/Search/Results.tsv
+++ b/share/html/Search/Results.tsv
@@ -62,7 +62,7 @@ my @Format = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $Disp
my @columns;
-sub col_entry {
+my $col_entry = sub {
my $col = shift;
return {
header => loc($col->{title} || $col->{attribute}),
@@ -72,7 +72,7 @@ sub col_entry {
Attr => 'value'
),
}
-}
+};
if ($PreserveNewLines) {
my $col = [];
@@ -83,13 +83,13 @@ if ($PreserveNewLines) {
push @columns, $col;
}
else {
- push @$col, col_entry($_);
+ push @$col, $col_entry->($_);
}
}
}
else {
push @columns, [map { $_->{attribute}
- ? col_entry($_)
+ ? $col_entry->($_)
: () } @Format];
}
@@ -115,7 +115,6 @@ else {
my $ii = 0;
while (my $row = $Tickets->Next) {
for my $col (@columns) {
- my @x = @$col;
$m->out(join("\t", map {
my $val = ProcessColumnMapValue($_->{map}, Arguments => [$row, $ii++], Escape => 0);
# remove tabs from all field values, they screw up the tsv
commit d0c0ca931233dfb524ed33061ffa40c2b1b71747
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Tue Aug 10 17:57:32 2010 +0800
localize content of Status.
diff --git a/share/html/Search/Results.tsv b/share/html/Search/Results.tsv
index 29197ce..0346293 100644
--- a/share/html/Search/Results.tsv
+++ b/share/html/Search/Results.tsv
@@ -62,6 +62,8 @@ my @Format = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $Disp
my @columns;
+my $should_loc = { map { $_ => 1 } qw(Status) };
+
my $col_entry = sub {
my $col = shift;
return {
@@ -71,6 +73,7 @@ my $col_entry = sub {
Name => $col->{attribute},
Attr => 'value'
),
+ should_loc => $should_loc->{$col->{attribute}},
}
};
@@ -117,6 +120,7 @@ while (my $row = $Tickets->Next) {
for my $col (@columns) {
$m->out(join("\t", map {
my $val = ProcessColumnMapValue($_->{map}, Arguments => [$row, $ii++], Escape => 0);
+ $val = loc($val) if $_->{should_loc};
# remove tabs from all field values, they screw up the tsv
$val = '' unless defined $val;
$val =~ s/(?:\n|\r)//g; $val =~ s{\t}{ }g;
commit 012c16d0f25610293f251793e8f79c85fb276f95
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Thu Aug 12 23:50:14 2010 +0800
encode_utf8
diff --git a/share/html/Search/Results.tsv b/share/html/Search/Results.tsv
index 0346293..6b86784 100644
--- a/share/html/Search/Results.tsv
+++ b/share/html/Search/Results.tsv
@@ -67,7 +67,7 @@ my $should_loc = { map { $_ => 1 } qw(Status) };
my $col_entry = sub {
my $col = shift;
return {
- header => loc($col->{title} || $col->{attribute}),
+ header => Encode::encode_utf8(loc($col->{title} || $col->{attribute})),
map => $m->comp(
"/Elements/ColumnMap",
Name => $col->{attribute},
@@ -124,7 +124,7 @@ while (my $row = $Tickets->Next) {
# remove tabs from all field values, they screw up the tsv
$val = '' unless defined $val;
$val =~ s/(?:\n|\r)//g; $val =~ s{\t}{ }g;
- $val;
+ Encode::encode_utf8($val);
} @$col)."\n");
}
}
commit 494da84235d89254e89da60d94a51d4dcc9ff38a
Merge: 8561063 012c16d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Aug 13 14:10:10 2010 -0400
Merge branch 'spreadsheet-improvements' into 3.9-trunk
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list