import rt 3.8.9

[freeside.git] / rt / html / REST / 1.0 / search / ticket

diff --git a/rt/html/REST/1.0/search/ticket b/rt/html/REST/1.0/search/ticket
index 2443529..bd3d63f 100644 (file)
--- a/rt/html/REST/1.0/search/ticket
+++ b/rt/html/REST/1.0/search/ticket
@@ -1,8 +1,14 @@
-%# BEGIN LICENSE BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
-%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explictly superceded by other copyright notices)
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -14,13 +20,31 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# Unless otherwise specified, all modifications, corrections or
-%# extensions to this work which alter its source code become the
-%# property of Best Practical Solutions, LLC when submitted for
-%# inclusion in the work.
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%# 
 %# 
+%# CONTRIBUTION SUBMISSION POLICY:
 %# 
-%# END LICENSE BLOCK
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
 %# REST/1.0/search/ticket
 %#
 <%ARGS>
@@ -35,10 +59,10 @@ my $status = "200 Ok";
 my $tickets = new RT::Tickets $session{CurrentUser};
 
 # Parse and validate any field specifications.
-my $field  = '[a-zA-Z][a-zA-Z0-9_-]*';
+my $field  = '[a-zA-Z](?:[a-zA-Z0-9_-]|\s+)*';
 my (%fields, @fields);
 if ($fields) {
-    $format = "l";
+    $format ||= "l";
     unless ($fields =~ /^(?:$field,)*$field$/) {
         $status = "400 Bad Request";
         $output = "Invalid field specification: $fields";
@@ -93,15 +117,29 @@ my @output;
 while (my $ticket = $tickets->Next) {
     $n++;
 
+       my $id = $ticket->Id;
     if ($format eq "i") {
-        $output .= "ticket/" . $ticket->Id . "\n";
+        $output .= "ticket/" . $id . "\n";
     }
     elsif ($format eq "s") {
-        $output .= $ticket->Id . ": ". $ticket->Subject . "\n";
+       if ($fields) {
+               my $result = $m->comp("/REST/1.0/Forms/ticket/default", id => $id, format => $format, fields => \%fields);
+               my ($notes, $order, $key_values, $errors) = @$result;
+               # If it's the first time through, add our header
+               if ($n == 1) {
+                       $output .= join("\t",@$order)."\n";
+               }
+               # Cut off the annoying ticket/ before the id;
+               $key_values->{'id'} = $id;
+               $output .= join("\t", map {$key_values->{$_}} @$order)."\n";
+       
+
+       } else {        
+               $output .= $ticket->Id . ": ". $ticket->Subject . "\n";
+       }
     }
     else {
-       my $id = $ticket->Id;
-        my $d = $m->comp("$RT::WebPath/REST/1.0/Forms/ticket/default", id => $id, format => $format, fields => \%fields);
+        my $d = $m->comp("/REST/1.0/Forms/ticket/default", id => $id, format => $format, fields => \%fields);
         my ($c, $o, $k, $e) = @$d;
        push @output, [ $c, $o, $k ];
     }
@@ -113,7 +151,8 @@ if ($n == 0 && $format ne "i") {
 $output = form_compose(\@output) if @output;
 
 OUTPUT:
-</%INIT>
-RT/<% $RT::VERSION %> <% $status %>
+$m->out("RT/". $RT::VERSION . " " . $status ."\n\n");
 
-<% $output |n %>
+$m->out($output );
+return();
+</%INIT>