Download SVG as ... - Pass Browser URL to server for error logging

yeastrc · Jun 27, 2019 · 892212f · 892212f
1 parent 641474d
commit 892212f
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 1 deletion.
diff --git a/..._end/src/js/page_js/data_pages/project_search_ids_driven_pages/common/svgDownloadUtils.js b/..._end/src/js/page_js/data_pages/project_search_ids_driven_pages/common/svgDownloadUtils.js
@@ -39,6 +39,13 @@ export class SVGDownloadUtils {
         fileTypeField.setAttribute("value", typeString);
         form.appendChild( svgStringField );
         form.appendChild( fileTypeField );
+
+		const browserURL = window.location.href;
+		const browserURLField = document.createElement( "input" );
+		browserURLField.setAttribute("name", "browserURL");
+		browserURLField.setAttribute("value", browserURL);
+		form.appendChild( browserURLField );
+
         document.body.appendChild(form);    // Not entirely sure if this is necessary
 
         form.submit();

diff --git a/...s/project_search_ids_driven_pages/common/viewPsmPerPeptideLoadedFromWebServiceTemplate.js b/...s/project_search_ids_driven_pages/common/viewPsmPerPeptideLoadedFromWebServiceTemplate.js
@@ -682,6 +682,13 @@ var ViewPsmPerPeptideLoadedFromWebServiceTemplate = function() {
 			fileTypeField.setAttribute("value", download_type);
 			form.appendChild( svgStringField );
 			form.appendChild( fileTypeField );
+
+			const browserURL = window.location.href;
+			const browserURLField = document.createElement( "input" );
+			browserURLField.setAttribute("name", "browserURL");
+			browserURLField.setAttribute("value", browserURL);
+			form.appendChild( browserURLField );
+
 			document.body.appendChild(form);    // Not entirely sure if this is necessary			
 			form.submit();
 			document.body.removeChild( form );

diff --git a/...data_pages/project_search_ids_driven_pages/common/viewPsmsLoadedFromWebServiceTemplate.js b/...data_pages/project_search_ids_driven_pages/common/viewPsmsLoadedFromWebServiceTemplate.js
@@ -857,6 +857,13 @@ var ViewPsmsLoadedFromWebServiceTemplate = function() {
 			fileTypeField.setAttribute("value", download_type);
 			form.appendChild( svgStringField );
 			form.appendChild( fileTypeField );
+
+			const browserURL = window.location.href;
+			const browserURLField = document.createElement( "input" );
+			browserURLField.setAttribute("name", "browserURL");
+			browserURLField.setAttribute("value", browserURL);
+			form.appendChild( browserURLField );
+
 			document.body.appendChild(form);    // Not entirely sure if this is necessary			
 			form.submit();
 			document.body.removeChild( form );

diff --git a/...s/project_search_ids_driven_pages/common_merged_pages/mergedSearchesVennDiagramCreator.js b/...s/project_search_ids_driven_pages/common_merged_pages/mergedSearchesVennDiagramCreator.js
@@ -137,6 +137,13 @@ var CreateMergedSearchesLinkCountsVennDiagram = function() {
 			fileTypeField.setAttribute("value", download_type);
 			form.appendChild( svgStringField );
 			form.appendChild( fileTypeField );
+
+			const browserURL = window.location.href;
+			const browserURLField = document.createElement( "input" );
+			browserURLField.setAttribute("name", "browserURL");
+			browserURLField.setAttribute("value", browserURL);
+			form.appendChild( browserURLField );
+
 			document.body.appendChild(form);    // Not entirely sure if this is necessary			
 			form.submit();
 			document.body.removeChild( form );

diff --git a/...s/page_js/data_pages/project_search_ids_driven_pages/image_page/crosslink-image-viewer.js b/...s/page_js/data_pages/project_search_ids_driven_pages/image_page/crosslink-image-viewer.js
@@ -6353,8 +6353,16 @@ var ImagePagePrimaryRootCodeClass = function() {
 		var fileTypeField = document.createElement( "input" );
 		fileTypeField.setAttribute("name", "fileType");
 		fileTypeField.setAttribute("value", typeString);
+
 		form.appendChild( svgStringField );
 		form.appendChild( fileTypeField );
+
+		const browserURL = window.location.href;
+		const browserURLField = document.createElement( "input" );
+		browserURLField.setAttribute("name", "browserURL");
+		browserURLField.setAttribute("value", browserURL);
+		form.appendChild( browserURLField );
+
 		document.body.appendChild(form);    // Not entirely sure if this is necessary			
 		form.submit();
 		document.body.removeChild( form );

diff --git a/..._js/data_pages/project_search_ids_driven_pages/qc_page/qcChart_Download_Help_HTMLBlock.js b/..._js/data_pages/project_search_ids_driven_pages/qc_page/qcChart_Download_Help_HTMLBlock.js
@@ -182,6 +182,13 @@ var QC_ChartDownloadHelp = function() {
 			fileTypeField.setAttribute("value", download_type);
 			form.appendChild( svgStringField );
 			form.appendChild( fileTypeField );
+
+			const browserURL = window.location.href;
+			const browserURLField = document.createElement( "input" );
+			browserURLField.setAttribute("name", "browserURL");
+			browserURLField.setAttribute("value", browserURL);
+			form.appendChild( browserURLField );
+
 			document.body.appendChild(form);    // Not entirely sure if this is necessary			
 			form.submit();
 			document.body.removeChild( form );

diff --git a/proxl_web_app/src/main/java/org/yeastrc/xlink/www/actions/ConvertAndDownloadSVGAction.java b/proxl_web_app/src/main/java/org/yeastrc/xlink/www/actions/ConvertAndDownloadSVGAction.java
@@ -66,7 +66,7 @@ public ActionForward execute( ActionMapping mapping,
 			  ActionForm actionForm,
 			  HttpServletRequest request,
 			  HttpServletResponse response ) throws Exception {
-
+		
 		String referrerURLString = null;
 		String thisURLString = null;
 		URL referrerURL = null;
@@ -82,6 +82,10 @@ public ActionForward execute( ActionMapping mapping,
 			throw e;
 		}
 
+//		log.warn( "Request  FileType: " + form.getFileType() );
+//		log.warn( "Request  BrowserURL: " + form.getBrowserURL() );
+//		log.warn( "Request  SvgString: " + form.getSvgString() );
+
 		try {
 			// ensure referrer was on the same server as this Action to prevent abuse
 			referrerURLString = request.getHeader("referer");
@@ -169,6 +173,8 @@ public ActionForward execute( ActionMapping mapping,
 
 			String msg = "Exception:  RemoteAddr: " + request.getRemoteAddr()  
 					+ ", Exception caught: " + e.toString()
+					+ "\nBrowserURL: " + form.getBrowserURL()
+					+ "\nFileType: " + form.getFileType()
 					+ "\nreferrerURL: " + referrerURLString
 					+ "\nthisURLString: " + thisURLString
 					+ "\nInput SVG:" + form.getSvgString();

diff --git a/proxl_web_app/src/main/java/org/yeastrc/xlink/www/forms/ConvertAndDownloadSVGForm.java b/proxl_web_app/src/main/java/org/yeastrc/xlink/www/forms/ConvertAndDownloadSVGForm.java
@@ -22,6 +22,16 @@ public String getFileType() {
 	public void setFileType(String fileType) {
 		this.fileType = fileType;
 	}
+	public String getBrowserURL() {
+		return browserURL;
+	}
+	public void setBrowserURL(String browserURL) {
+		this.browserURL = browserURL;
+	}
+
+
 	private String svgString;
 	private String fileType;
+	private String browserURL;
+
 }