Mercurial > hg > ismi-richfaces

changeset 155:f2c1e5be355c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changing images.rasi.mcgill.ca URLs again.
author casties
date Wed, 18 Oct 2017 15:03:39 +0200
parents 84d20006521c
children d305a1b3e4c9
files src/main/java/de/mpiwg/itgroup/diva/rest/DivaProxy.java src/main/webapp/imageServer/displayDigi.jsp src/main/webapp/imageServer/resources/js/diva4ismi.js
diffstat 3 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/diva/rest/DivaProxy.java	Mon Oct 16 15:41:02 2017 +0200
+++ b/src/main/java/de/mpiwg/itgroup/diva/rest/DivaProxy.java	Wed Oct 18 15:03:39 2017 +0200
@@ -14,9 +14,10 @@
 
 @Path("/diva/proxy")
 public class DivaProxy {
-	
+    // FIXME: is this still used?
+
     // was https://images.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi?FIF=/data7/srv/images/
-    private static String IMG_SERVER = "https://db.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi?FIF=/data7/srv/images/";
+    private static String IMG_SERVER = "https://images.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi?FIF=/";
 	
 	@GET
 	@Path("/image")
@@ -48,8 +49,8 @@
 		json(
 			 @PathParam("file") String file) throws Exception{
 	
-	    // was https://images.rasi.mcgill.ca/data/
-		HttpStringResponse resp = HTTPUtils.getHttpSSLStringResponse("https://db.rasi.mcgill.ca/data/" + file + ".json");
+	    // was HTTPUtils.getHttpSSLStringResponse(https://images.rasi.mcgill.ca/data/
+		HttpStringResponse resp = HTTPUtils.getHttpStringResponse("https://images.rasi.mcgill.ca/data/" + file + ".json");
 		if(resp.code == 200){
 			return Response.ok(resp.content).build();	
 		}
--- a/src/main/webapp/imageServer/displayDigi.jsp	Mon Oct 16 15:41:02 2017 +0200
+++ b/src/main/webapp/imageServer/displayDigi.jsp	Wed Oct 18 15:03:39 2017 +0200
@@ -191,7 +191,7 @@
 	        iipServerURL: divaGlobal.iipServerURL,
 	        digiId: "<%=digiBean.getDigiId()%>",
 	        objectData: divaGlobal.rest_url + "/rest/diva/proxy/json/<%=digiBean.getDigiLabel()%>",
-	        imageDir: "/data7/srv/images/<%=digiBean.getDigiLabel()%>",
+	        imageDir: "/<%=digiBean.getDigiLabel()%>",
 			onSetCurrentPage : handlePageSwitch,
 			onDocumentLoaded : handleDocumentLoaded,
 			zoomLevel: 1,
--- a/src/main/webapp/imageServer/resources/js/diva4ismi.js	Mon Oct 16 15:41:02 2017 +0200
+++ b/src/main/webapp/imageServer/resources/js/diva4ismi.js	Wed Oct 18 15:03:39 2017 +0200
@@ -1,11 +1,9 @@
 var divaGlobal = {
-		rest_url : "http://localhost:18080/ismi-richfaces",
 		debugModus : false,
-		//rest_url : "https://openmind-ismi-dev.mpiwg-berlin.mpg.de/om4-ismi",
-		//rest_url : "http://ismi-dev.mpiwg-berlin.mpg.de:8080/ismi-richfaces",
+		rest_url : "https://ismi.mpiwg-berlin.mpg.de/om4-ismi",
 		iipServerURL: "https://images.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi",
-		drupal_url: "https://ismi-dev.mpiwg-berlin.mpg.de/drupal-ismi",
-		entity_url: "https://ismi-dev.mpiwg-berlin.mpg.de/om4-ismi/browse/entityDetails.xhtml?eid="
+		drupal_url: "https://ismi.mpiwg-berlin.mpg.de/drupal-ismi",
+		entity_url: "https://ismi.mpiwg-berlin.mpg.de/om4-ismi/browse/entityDetails.xhtml?eid="
 }
 
 function showTitleDetailsBig(titleId){