litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing some iso-8859 conversions. VIVO-81

Browse source
This commit is contained in:
Brian Caruso 2013-08-28 14:37:05 -04:00
parent 314a4e638b
commit 9f4ea054ac
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
View file

@ -66,12 +66,9 @@ public class ClassgroupRetryController extends BaseEditController {
log.error("Need to implement 'record not found' error message."); log.error("Need to implement 'record not found' error message.");
} }
if (vclassGroupForEditing == null) { if (vclassGroupForEditing == null) {
try { //UTF-8 expected due to URIEncoding on Connector in server.xml
String uriToFind = new String(request.getParameter("uri").getBytes("ISO-8859-1"),"UTF-8"); String uriToFind = new String(request.getParameter("uri"));
vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(uriToFind); vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(uriToFind);
} catch (java.io.UnsupportedEncodingException uee) {
// forget it
}
} }
} else { } else {
vclassGroupForEditing = new VClassGroup(); vclassGroupForEditing = new VClassGroup();

9
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
View file

@ -65,12 +65,9 @@ public class PropertyGroupRetryController extends BaseEditController {
log.error("Need to implement 'record not found' error message."); log.error("Need to implement 'record not found' error message.");
} }
if (propertyGroupForEditing == null) { if (propertyGroupForEditing == null) {
try { // UTF-8 expected due to URIEncoding on Connector element in server.xml
String uriToFind = new String(request.getParameter("uri").getBytes("ISO-8859-1"),"UTF-8"); String uriToFind = new String(request.getParameter("uri"));
propertyGroupForEditing = (PropertyGroup)pgDao.getGroupByURI(uriToFind); propertyGroupForEditing = (PropertyGroup)pgDao.getGroupByURI(uriToFind);
} catch (java.io.UnsupportedEncodingException uee) {
// forget it
}
} }
} else { } else {
propertyGroupForEditing = new PropertyGroup(); propertyGroupForEditing = new PropertyGroup();

2
webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
View file

@ -242,7 +242,7 @@ public abstract class FreemarkerConfiguration {
* URL? * URL?
*/ */
try { try {
c.setSetting("url_escaping_charset", "ISO-8859-1"); c.setSetting("url_escaping_charset", "UTF-8");
} catch (TemplateException e) { } catch (TemplateException e) {
log.error("Error setting value for url_escaping_charset."); log.error("Error setting value for url_escaping_charset.");
} }