View | Details | Raw Unified | Return to bug 14321
Collapse All | Expand All

(-)a/Koha/Upload.pm (-9 / +10 lines)
Lines 211-220 sub delete { Link Here
211
    return @res;
211
    return @res;
212
}
212
}
213
213
214
sub DESTROY {
214
=head1 CLASS METHODS
215
}
216
217
# **************  HELPER ROUTINES / CLASS METHODS ******************************
218
215
219
=head2 getCategories
216
=head2 getCategories
220
217
Lines 243-249 sub httpheaders { Link Here
243
    );
240
    );
244
}
241
}
245
242
246
# **************  INTERNAL ROUTINES ********************************************
243
=head1 INTERNAL ROUTINES
244
245
=cut
247
246
248
sub _init {
247
sub _init {
249
    my ( $self, $params ) = @_;
248
    my ( $self, $params ) = @_;
Lines 310-318 sub _full_fname { Link Here
310
    my ( $self, $rec ) = @_;
309
    my ( $self, $rec ) = @_;
311
    my $p;
310
    my $p;
312
    if( ref $rec ) {
311
    if( ref $rec ) {
313
        $p= $rec->{permanent}? $self->{rootdir}: $self->{tmpdir};
312
        $p = File::Spec->catfile(
314
        $p.= '/';
313
            $rec->{permanent}? $self->{rootdir}: $self->{tmpdir},
315
        $p.= $rec->{dir}. '/'. $rec->{hashvalue}. '_'. $rec->{filename};
314
            $rec->{dir},
315
            $rec->{hashvalue}. '_'. $rec->{filename}
316
        );
316
    }
317
    }
317
    return $p;
318
    return $p;
318
}
319
}
Lines 359-365 sub _register { Link Here
359
sub _lookup {
360
sub _lookup {
360
    my ( $self, $params ) = @_;
361
    my ( $self, $params ) = @_;
361
    my $dbh = C4::Context->dbh;
362
    my $dbh = C4::Context->dbh;
362
    my $sql = qq|
363
    my $sql = q|
363
SELECT id,hashvalue,filename,dir,filesize,categorycode,public,permanent
364
SELECT id,hashvalue,filename,dir,filesize,categorycode,public,permanent
364
FROM uploaded_files
365
FROM uploaded_files
365
    |;
366
    |;
(-)a/tools/upload-file.pl (-2 / +2 lines)
Lines 81-87 sub send_reply { # response will be sent back as JSON Link Here
81
   });
81
   });
82
}
82
}
83
83
84
sub upload_pars {
84
sub upload_pars { # this sub parses QUERY_STRING in order to build the
85
                  # parameter hash for Koha::Upload
85
    my ( $qstr ) = @_;
86
    my ( $qstr ) = @_;
86
    $qstr = Encode::decode_utf8( uri_unescape( $qstr ) );
87
    $qstr = Encode::decode_utf8( uri_unescape( $qstr ) );
87
    # category could include a utf8 character
88
    # category could include a utf8 character
88
- 

Return to bug 14321