# HG changeset patch # User casties # Date 1508331819 -7200 # Node ID f2c1e5be355c51877fbe469cb6e7d68ff13e45e1 # Parent 84d20006521c99283f51da44a2792a69badeb75f changing images.rasi.mcgill.ca URLs again. diff -r 84d20006521c -r f2c1e5be355c src/main/java/de/mpiwg/itgroup/diva/rest/DivaProxy.java --- 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(); } diff -r 84d20006521c -r f2c1e5be355c src/main/webapp/imageServer/displayDigi.jsp --- 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, diff -r 84d20006521c -r f2c1e5be355c src/main/webapp/imageServer/resources/js/diva4ismi.js --- 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){