Project

General

Profile

« Previous | Next » 

Revision 9673

Merge the changes from the 2.6 branch into the trunk, fixing filename construction.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/151

View differences:

src/edu/ucsb/nceas/metacat/restservice/v1/MNResourceHandler.java
1117 1117
            String extension = ObjectFormatInfo.instance().getExtension(sm.getFormatId().getValue());
1118 1118
            String filename = id.getValue();
1119 1119
            if (extension != null) {
1120
            	filename = id.getValue() + extension;
1120
            	filename = id.getValue() + "." + extension;
1121 1121
            }
1122 1122
            response.setContentType(mimeType);
1123 1123
            response.setHeader("Content-Disposition", "inline; filename=" + filename);
1124 1124

  
src/edu/ucsb/nceas/metacat/restservice/v2/MNResourceHandler.java
1274 1274
	            }
1275 1275
	            filename = id.getValue();
1276 1276
	            if (extension != null) {
1277
	            	filename = id.getValue() + extension;
1277
	            	filename = id.getValue() + "." + extension;
1278 1278
	            }
1279 1279
            }
1280 1280
            response.setContentType(mimeType);
1281 1281

  

Also available in: Unified diff