Project

General

Profile

« Previous | Next » 

Revision 4080

Added by daigle about 16 years ago

Merge 1.9 changes into Head

View differences:

ClientViewHelper.java
13 13 
import com.oreilly.servlet.multipart.MultipartParser;
14 14 
import com.oreilly.servlet.multipart.ParamPart;
15 15 
import com.oreilly.servlet.multipart.Part;
16 
import edu.ucsb.nceas.metacat.MetaCatUtil;
17 16 
import edu.ucsb.nceas.metacat.client.InsufficientKarmaException;
18 17 
import edu.ucsb.nceas.metacat.client.MetacatClient;
19 18 
import edu.ucsb.nceas.metacat.client.MetacatException;
20 19 
import edu.ucsb.nceas.metacat.client.MetacatFactory;
21 20 
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;
21 
import edu.ucsb.nceas.metacat.service.PropertyService;
22 22 
import edu.ucsb.nceas.utilities.XMLUtilities;
23 
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
23 24 
import java.io.BufferedReader;
24 25 
import java.io.ByteArrayOutputStream;
25 26 
import java.io.IOException;
......
104 105 
        tmp = metacatPath.replaceFirst("%1s", host);
105 106 
        metacatPath = tmp.replaceFirst("%2s", context);
106 107 
        metacatClient = (MetacatClient) MetacatFactory.createMetacatConnection(metacatPath);
107 
        sizeLimit = (new Integer(MetaCatUtil.getOption("datafilesizelimit"))).intValue();
108 
        try {
109 
        	sizeLimit =
110 
        		(new Integer(PropertyService.getProperty("datafilesizelimit"))).intValue();
111 
        } catch (PropertyNotFoundException pnfe) {
112 
        	throw new MetacatInaccessibleException(pnfe.getMessage());
113 
        }
108 114 
    }
109 115
110 116 
    /**

Also available in: Unified diff