diff --git a/Source/src/main/java/edu/ncrn/cornell/ced2ar/api/data/BaseX.java b/Source/src/main/java/edu/ncrn/cornell/ced2ar/api/data/BaseX.java index 2338d55..040e2d4 100644 --- a/Source/src/main/java/edu/ncrn/cornell/ced2ar/api/data/BaseX.java +++ b/Source/src/main/java/edu/ncrn/cornell/ced2ar/api/data/BaseX.java @@ -340,7 +340,7 @@ public static String httpGetWriter(String reqPrefix,String request){ c.buildRequest(RequestType.GET, reqPrefix, request); c.writerAuthorize(); String s = c.execute(); - c.close(); + c.close(); return s; } diff --git a/Source/src/main/java/edu/ncrn/cornell/ced2ar/eapi/rest/queries/EditCodebookData.java b/Source/src/main/java/edu/ncrn/cornell/ced2ar/eapi/rest/queries/EditCodebookData.java index 9e5b988..b620db9 100644 --- a/Source/src/main/java/edu/ncrn/cornell/ced2ar/eapi/rest/queries/EditCodebookData.java +++ b/Source/src/main/java/edu/ncrn/cornell/ced2ar/eapi/rest/queries/EditCodebookData.java @@ -799,7 +799,6 @@ public int editVarMulti(String baseHandle, String version, String var, public int editVarGrp(String baseHandle, String version, String id, String name, String labl, String txt){ //TODO: versioning for this - String handle = baseHandle+version; String replaceStmt = ""; diff --git a/Source/src/main/java/edu/ncrn/cornell/ced2ar/ei/controllers/EditVarGroups.java b/Source/src/main/java/edu/ncrn/cornell/ced2ar/ei/controllers/EditVarGroups.java index 758cb98..b3aba7c 100644 --- a/Source/src/main/java/edu/ncrn/cornell/ced2ar/ei/controllers/EditVarGroups.java +++ b/Source/src/main/java/edu/ncrn/cornell/ced2ar/ei/controllers/EditVarGroups.java @@ -284,6 +284,7 @@ public String groupEditForm2P(@PathVariable(value = "c") String baseHandle, break; case "txt": txt = newValue; + txt = txt.replaceAll("'", "'"); break; } diff --git a/Source/src/main/webapp/WEB-INF/ajaxViews/groupFieldEdit.jsp b/Source/src/main/webapp/WEB-INF/ajaxViews/groupFieldEdit.jsp index 07f0df5..4d22c58 100644 --- a/Source/src/main/webapp/WEB-INF/ajaxViews/groupFieldEdit.jsp +++ b/Source/src/main/webapp/WEB-INF/ajaxViews/groupFieldEdit.jsp @@ -17,6 +17,27 @@ + +

${editDoc}