changeset 187:be6bc580b137

changed "update" method for witness page number in displayDigi.jsp to use POST. changed receiving method in RestWitness.
author Robert Casties <casties@mpiwg-berlin.mpg.de>
date Tue, 30 Oct 2018 20:09:59 +0100
parents b0b0f8e63c26
children 34ac2e1b323a
files src/main/java/de/mpiwg/itgroup/diva/rest/RestWitness.java src/main/webapp/imageServer/displayDigi.jsp
diffstat 2 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/diva/rest/RestWitness.java	Mon Jul 30 14:00:52 2018 +0200
+++ b/src/main/java/de/mpiwg/itgroup/diva/rest/RestWitness.java	Tue Oct 30 20:09:59 2018 +0100
@@ -2,22 +2,19 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
-import org.mpi.openmind.repository.bo.Attribute;
 import org.mpi.openmind.repository.bo.Entity;
 
 import de.mpiwg.itgroup.diva.utils.JSONEntity;
-import de.mpiwg.itgroup.diva.utils.JSONParam;
-import de.mpiwg.itgroup.ismi.entry.beans.CurrentCodexBean;
 
 
 @Path("/witness")	
@@ -26,27 +23,27 @@
 	
 	private static Logger logger = Logger.getLogger(RestWitness.class);
 	
-	@GET
+	@POST
 	@Path("/update")
+	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response 
 		saveWitnessPagesIndexing(
 			 @Context HttpServletRequest request, 
 			 @Context HttpServletResponse response,
-			 @QueryParam("data") JSONParam jsonParam) throws Exception{
+			 String jsonParam) throws Exception{
 
 		JSONObject resp = new JSONObject();
 		
 		try {
 			if(getSessionBean(request, response).isCanEdit()){
-				JSONObject json = jsonParam.getObj();
+				JSONObject json = new JSONObject(jsonParam);
 		
 				logger.info(json.toString());	
 							
 				if(json.getJSONObject("witness") != null && json.getJSONObject("witness").get("id") != null){
 					
 					JSONEntity jsonEnt = new JSONEntity(json.getJSONObject("witness"), json.getJSONObject("witness").getLong("id"));
-					Long digiId = json.getLong("digi_id");
 				
 					Entity ent = getWrapper(request, response).getEntityByIdWithContent(jsonEnt.id);
 					ent = jsonEnt.updateEntity(ent);
--- a/src/main/webapp/imageServer/displayDigi.jsp	Mon Jul 30 14:00:52 2018 +0200
+++ b/src/main/webapp/imageServer/displayDigi.jsp	Tue Oct 30 20:09:59 2018 +0100
@@ -52,9 +52,10 @@
 			witnessLink.data('start', startPageInput[0].value);
 			
 			$.ajax(
-					divaGlobal.rest_url + "/rest/witness/update?data=" + JSON.stringify(data), {
-			         type: 'GET',
+					divaGlobal.rest_url + "/rest/witness/update", {
+					    type: 'POST',
 			            contentType: "application/json",
+			            data: JSON.stringify(data),
 				        success: function(data, textStatus, jqXHR){
 				        	var state = data["state"];
 				        	if(state == "ok"){
@@ -429,8 +430,8 @@
 								            						readonly="readonly"
 								            						value="<c:out value="${witness.endPage}"/>" class="inputPageNumber">
 								            					<c:if test="${digiBean.canEdit()}">	
-																	<button class="set-end-set ismi-button" data-witness="<c:out value="${witness.id}"/>">Set Start</button>
-																	<button class="set-end-reset ismi-button" data-witness="<c:out value="${witness.id}"/>">Reset Start</button>
+																	<button class="set-end-set ismi-button" data-witness="<c:out value="${witness.id}"/>">Set End</button>
+																	<button class="set-end-reset ismi-button" data-witness="<c:out value="${witness.id}"/>">Reset End</button>
 																</c:if>
 								            				</td>
 								            				<c:if test="${digiBean.canEdit()}">