Project

General

Profile

« Previous | Next » 

Revision 4080

Added by daigle almost 16 years ago

Merge 1.9 changes into Head

View differences:

ClientViewHelper.jspx
3 3
    
4 4
    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
5 5
    <jsp:directive.page import="com.oreilly.servlet.multipart.MultipartParser"/>
6
    <jsp:directive.page import="edu.ucsb.nceas.metacat.MetaCatUtil"/>
6
    <jsp:directive.page import="edu.ucsb.nceas.metacat.service.PropertyService"/>
7 7
    <jsp:directive.page import="java.io.*"/>
8 8
    <jsp:directive.page import="javax.servlet.*"/>
9 9
    <jsp:directive.page import="javax.servlet.http.*"/>
......
24 24
        if (contentType != null &amp;&amp; (contentType.indexOf("multipart/form-data") > -1)) {
25 25
            //*** Process request here if a file update.
26 26
            //*** Init the MultipartParser.
27
            sizeLimit = (new Integer(MetaCatUtil.getOption("datafilesizelimit"))).intValue();
27
            sizeLimit = (new Integer(PropertyService.getProperty("datafilesizelimit"))).intValue();
28 28
            multipartParser = new MultipartParser(request, sizeLimit * 1024 * 1024);
29 29
            message = clientHelper.handleFileUpdate(multipartParser);
30 30
        } else {

Also available in: Unified diff