[cig-commits] r7867 - in cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal: . portlets

wei at geodynamics.org wei at geodynamics.org
Wed Aug 22 17:10:37 PDT 2007


Author: wei
Date: 2007-08-22 17:10:36 -0700 (Wed, 22 Aug 2007)
New Revision: 7867

Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
Log:
Changed attributes name back, and now the MAG portal works.

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java	2007-08-22 19:56:18 UTC (rev 7866)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java	2007-08-23 00:10:36 UTC (rev 7867)
@@ -56,7 +56,7 @@
 		ft.local2remote(dataset, myconfig.get("grid.sites.magdir."+site)+"/datasets/par.sample");
 
 		// 3. submit job : GT4 method
-		System.out.println("\nStep 3: submit job to "+site);
+		System.out.println("\nStep 3: submit MAG job to "+site);
 		String rsl = SimpleRSL.getRSL_GT4(myconfig, site, 32, 4, "par.sample", "p.sample");
 		System.out.println("RSL:\n"+rsl);
 		SimpleRunGT4 sr = new SimpleRunGT4(proxy);
@@ -71,7 +71,7 @@
 
 	    // 4. transfer results back
 	    System.out.println("\nStep 4: transfer result from "+site);
-	    String remotefile = myconfig.get("grid.sites.magdir."+site)+"/results/*.sample";
+	    String remotefile = myconfig.get("grid.sites.magdir."+site)+"/results/*.bench0";
 		System.out.println("result file: " + remotefile);
 	    ft.remote2local(remotefile, testhome+"/.");
 

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java	2007-08-22 19:56:18 UTC (rev 7866)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java	2007-08-23 00:10:36 UTC (rev 7867)
@@ -81,7 +81,7 @@
 						numviz = item.getKnum();
 						for (int v=0; v<numviz; v++) {
 							// this job exists, check if result is there
-							String rfile = this.getPortletContext().getRealPath("storage/"+uid+"/Mag/images/" + cursid+"."+item.getK(v) + ".jpg");
+							String rfile = this.getPortletContext().getRealPath("storage/"+uid+"/mag/images/" + cursid+"."+item.getK(v) + ".jpg");
 							File rF = new File(rfile);
 							if (rF.isFile()) 
 								numReady++;
@@ -98,11 +98,11 @@
 					ArrayList<String> imagelink = new ArrayList<String>(numviz);
 					ArrayList<String> vizklist = new ArrayList<String>(numviz);
 					for (int v=0; v<numviz; v++) {
-						resultlink.add("/"+mywebappname+"/storage/"+uid+"/Mag/results/" + cursid+"."+item.getK(v) + ".dat");
-						imagelink.add("/"+mywebappname+"/storage/"+uid+"/Mag/images/" + cursid+"."+item.getK(v) + ".jpg");
+						resultlink.add("/"+mywebappname+"/storage/"+uid+"/mag/results/" + cursid+"."+item.getK(v) + ".dat");
+						imagelink.add("/"+mywebappname+"/storage/"+uid+"/mag/images/" + cursid+"."+item.getK(v) + ".jpg");
 						vizklist.add(Integer.toString(item.getK(v)));
 					}
-					String rfile = this.getPortletContext().getRealPath("storage/"+uid+"/Mag/results/" + cursid+"."+item.getK(0) + ".dat");
+					String rfile = this.getPortletContext().getRealPath("storage/"+uid+"/mag/results/" + cursid+"."+item.getK(0) + ".dat");
 					String str_zrange = this.getZRange(rfile);
 					String[] minmax = str_zrange.split(",");
 					int zmax=0, zmin=0;
@@ -111,27 +111,27 @@
 						zmax=Integer.parseInt(minmax[1]);
 					}
 					String legendlink = "/"+mywebappname+"/images/vizlegend.jpg";
-					aContext.put("cigportal_mag_viz_zmax", zmax);
-					aContext.put("cigportal_mag_viz_zmin", zmin);
-					aContext.put("cigportal_mag_viz_legendlink", legendlink);
-					aContext.put("cigportal_mag_viz_resultlink", resultlink);
-					aContext.put("cigportal_mag_viz_imagelink", imagelink);
-					aContext.put("cigportal_mag_viz_klist", vizklist);
-					aContext.put("cigportal_mag_viz_dataset", item.getDataset());
-					aContext.put("cigportal_mag_viz_jobid", item.getId());
+					aContext.put("cig_mag_viz_zmax", zmax);
+					aContext.put("cig_mag_viz_zmin", zmin);
+					aContext.put("cig_mag_viz_legendlink", legendlink);
+					aContext.put("cig_mag_viz_resultlink", resultlink);
+					aContext.put("cig_mag_viz_imagelink", imagelink);
+					aContext.put("cig_mag_viz_klist", vizklist);
+					aContext.put("cig_mag_viz_dataset", item.getDataset());
+					aContext.put("cig_mag_viz_jobid", item.getId());
 					
 					aContext.put(SimpleGridConstants.errorInfo, actionError + error);
-					setTemplate(req, "Mag-1.vm");
+					setTemplate(req, "mag-1.vm");
 					return;
 				}
 			} 
 			aContext.put(SimpleGridConstants.MagJobList, joblist);
 			aContext.put(SimpleGridConstants.MagJobSid, cursid);
-			String statusinfo = (String)mysession.getAttribute("cigportal_mag_status_info" + uid, PortletSession.APPLICATION_SCOPE);
-			aContext.put("cigportal_mag_status_info", statusinfo);
+			String statusinfo = (String)mysession.getAttribute("cig_mag_status_info" + uid, PortletSession.APPLICATION_SCOPE);
+			aContext.put("cig_mag_status_info", statusinfo);
 			ArrayList sites = this.getSiteList(myconfig);
-			aContext.put("cigportal_mag_site_list", sites);
-			String udir = this.getPortletContext().getRealPath("storage/"+uid+"/Mag/datasets");
+			aContext.put("cig_mag_site_list", sites);
+			String udir = this.getPortletContext().getRealPath("storage/"+uid+"/mag/datasets");
 			File userMagDir = new File(udir);
 			if (!userMagDir.isDirectory()) throw new PortletException(udir+": Mag portlet: user Mag dataset dir is not a directory.");
 			String[] flist = userMagDir.list();
@@ -139,21 +139,21 @@
 			for (int i=0; i<flist.length; i++) {
 				filelist.add(flist[i]);
 			}
-			aContext.put("cigportal_mag_parm_datalist", filelist);
+			aContext.put("cig_mag_parm_datalist", filelist);
 			// render dataset view
-			String viewdataset = (String)mysession.getAttribute("cigportal_mag_viz_vieworig" + uid, PortletSession.APPLICATION_SCOPE);
+			String viewdataset = (String)mysession.getAttribute("cig_mag_viz_vieworig" + uid, PortletSession.APPLICATION_SCOPE);
 			if (viewdataset != null) {
-				aContext.put("cigportal_mag_viz_vieworig", viewdataset);
-				aContext.put("cigportal_mag_viz_datasetlink", "/"+mywebappname+"/storage/"+uid+"/Mag/datasets/"+viewdataset);
-				aContext.put("cigportal_mag_viz_datasetimagelink", "/"+mywebappname+"/storage/"+uid+"/Mag/images/"+viewdataset+".jpg");
-				mysession.setAttribute("cigportal_mag_viz_vieworig" + uid, null, PortletSession.APPLICATION_SCOPE); // reset
+				aContext.put("cig_mag_viz_vieworig", viewdataset);
+				aContext.put("cig_mag_viz_datasetlink", "/"+mywebappname+"/storage/"+uid+"/mag/datasets/"+viewdataset);
+				aContext.put("cig_mag_viz_datasetimagelink", "/"+mywebappname+"/storage/"+uid+"/mag/images/"+viewdataset+".jpg");
+				mysession.setAttribute("cig_mag_viz_vieworig" + uid, null, PortletSession.APPLICATION_SCOPE); // reset
 			} else {
-				aContext.put("cigportal_mag_viz_vieworig", null);
+				aContext.put("cig_mag_viz_vieworig", null);
 			}
-			setTemplate(req, "Mag-0.vm");
+			setTemplate(req, "mag-0.vm");
 		} catch (Exception e) {
 			error += "User portlet::fillTemplate() error\n"+e.toString()+"\n";
-			setTemplate(req, "Mag-0.vm");
+			setTemplate(req, "mag-0.vm");
 		}
 		// fille error info
 		aContext.put(SimpleGridConstants.errorInfo, actionError + error);
@@ -183,7 +183,7 @@
     		PortletSession mysession = req.getPortletSession(true);
 			User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
 			String uid = user.getUserID();
-			String str_klist = req.getParameter("cigportal_mag_parm_k");
+			String str_klist = req.getParameter("cig_mag_parm_k");
 			if (str_klist == null || str_klist.equals(""))
 				throw new Exception("Please specify K-value");
 			String[] klist = str_klist.split("\\s*,\\s*");
@@ -199,10 +199,10 @@
 			ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.MagJobList + uid, PortletSession.APPLICATION_SCOPE);
 			String jid = uid +".job."+ timestamp;
 			MagjobBean job = new MagjobBean(jid);
-			job.setDataset(req.getParameter("cigportal_mag_parm_dataset"));
-			job.setN(Integer.parseInt(req.getParameter("cigportal_mag_parm_r")));
+			job.setDataset(req.getParameter("cig_mag_parm_dataset"));
+			job.setN(Integer.parseInt(req.getParameter("cig_mag_parm_r")));
 			job.setKList(int_klist);
-			job.setSite(req.getParameter("cigportal_mag_parm_site"));
+			job.setSite(req.getParameter("cig_mag_parm_site"));
 			job.setStatus("cigportal:New");
 			job.setGtVersion(req.getParameter("cigportal_mag_parm_globus"));
 			//job.setGtVersion("GT2");
@@ -211,7 +211,7 @@
 			mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 			mysession.setAttribute(SimpleGridConstants.MagJobSid + uid, jid, PortletSession.APPLICATION_SCOPE);
 			mysession.setAttribute(SimpleGridConstants.MagPage + uid, "Main", PortletSession.APPLICATION_SCOPE);
-			mysession.setAttribute("cigportal_mag_status_info" + uid, job.getDataset() + "(jobId="+job.getId()+"): Job is created. Clieck \"Next\" to transfer dataset to remote site", PortletSession.APPLICATION_SCOPE);
+			mysession.setAttribute("cig_mag_status_info" + uid, job.getDataset() + "(jobId="+job.getId()+"): Job is created. Clieck \"Next\" to transfer dataset to remote site", PortletSession.APPLICATION_SCOPE);
     	}catch (Exception e) {
 			error += "CigPortalMagAction::doMag_create: error\n"+e.toString()+"\nBe sure to select required parameters\n";
 		}
@@ -239,9 +239,9 @@
     		PortletSession mysession = req.getPortletSession(true);
 			User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
 			String uid = user.getUserID();
-			String viewdataset = req.getParameter("cigportal_mag_parm_dataset");
+			String viewdataset = req.getParameter("cig_mag_parm_dataset");
 			if (viewdataset.equals(""))	viewdataset = null;
-			mysession.setAttribute("cigportal_mag_viz_vieworig" + uid, viewdataset, PortletSession.APPLICATION_SCOPE);
+			mysession.setAttribute("cig_mag_viz_vieworig" + uid, viewdataset, PortletSession.APPLICATION_SCOPE);
     	}catch (Exception e) {
 			error += "CigPortalMagAction::doMag_view_dataset: error\n"+e.toString() + "\n";
 		}
@@ -256,7 +256,7 @@
 			User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
 			String uid = user.getUserID();
 			// get job id
-			String selectedjobid = req.getParameter("cigportal_mag_id");
+			String selectedjobid = req.getParameter("cig_mag_id");
 			if (selectedjobid != null) {
 				// find the job
 				ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.MagJobList + uid, PortletSession.APPLICATION_SCOPE);
@@ -273,7 +273,7 @@
 						mysession.setAttribute(SimpleGridConstants.MagJobSid + uid, nextId, PortletSession.APPLICATION_SCOPE);
 						// delete
 						joblist.remove(i);
-						mysession.setAttribute("cigportal_mag_status_info" + uid, "", PortletSession.APPLICATION_SCOPE);
+						mysession.setAttribute("cig_mag_status_info" + uid, "", PortletSession.APPLICATION_SCOPE);
 						break;
 					}
 				}
@@ -281,7 +281,7 @@
     	} catch (Exception e) {
 			error += "CigPortalMagAction::doMag_delete: error\n"+e.toString() + "\n";
 			if (job != null) job.setStatus("Error");
-			//req.getPortletSession().setAttribute("cigportal_mag_status_info", e.toString(), PortletSession.APPLICATION_SCOPE);
+			//req.getPortletSession().setAttribute("cig_mag_status_info", e.toString(), PortletSession.APPLICATION_SCOPE);
 		}
     	this.fillTemplate(aContext, req, res, error);
     }
@@ -294,7 +294,7 @@
 			User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
 			String uid = user.getUserID();
 			// get job id
-			String selectedjobid = req.getParameter("cigportal_mag_id");
+			String selectedjobid = req.getParameter("cig_mag_id");
 			if (selectedjobid != null) {
 				// find the job
 				ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.MagJobList + uid, PortletSession.APPLICATION_SCOPE);
@@ -324,14 +324,14 @@
 					} else if (job.getStatus().equals("cigportal:Image Created")) {
 						opstatus = goShowViz(mysession, uid, joblist, job);
 					}
-					mysession.setAttribute("cigportal_mag_status_info" + uid, sprefix+opstatus, PortletSession.APPLICATION_SCOPE);
+					mysession.setAttribute("cig_mag_status_info" + uid, sprefix+opstatus, PortletSession.APPLICATION_SCOPE);
 					//else throw new PortletException("Unknown job status for job " + selectedjobid + ": " +job.getStatus());
 				} else  throw new PortletException("Couldn't find this job: " + selectedjobid);
 			}
     	}catch (Exception e) {
 			error += "CigPortalMagAction::doMag_submit: error\n"+e.toString() + "\n";
 			if (job != null) job.setStatus("Error");
-			//req.getPortletSession().setAttribute("cigportal_mag_status_info", e.toString(), PortletSession.APPLICATION_SCOPE);
+			//req.getPortletSession().setAttribute("cig_mag_status_info", e.toString(), PortletSession.APPLICATION_SCOPE);
 		}
     	this.fillTemplate(aContext, req, res, error);
     }
@@ -345,13 +345,13 @@
 			if (sitelist.get(j).equals(selectedsite)) break;
 		}
 		if (j<sitelist.size()) {
-			SimpleTransferThread mytransfer = (SimpleTransferThread)mysession.getAttribute("cigportal_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
+			SimpleTransferThread mytransfer = (SimpleTransferThread)mysession.getAttribute("cig_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
 			if (mytransfer == null) {
 				// transfer dataset to remote site
 				String[] srcdataset = new String[1];
 				String[] dstdataset = new String[1];
-				srcdataset[0] = this.getPortletContext().getRealPath("storage/"+uid+"/Mag/datasets/" + job.getDataset());
-				dstdataset[0] =  myconfig.get("grid.sites.Magdir."+selectedsite) +"/datasets/"+ job.getDataset();
+				srcdataset[0] = this.getPortletContext().getRealPath("storage/"+uid+"/mag/datasets/" + job.getDataset());
+				dstdataset[0] =  myconfig.get("grid.sites.magdir."+selectedsite) +"/datasets/"+ job.getDataset();
 				String host = myconfig.get("grid.gridftp."+selectedsite);
 				SimpleCred mycred = (SimpleCred)mysession.getAttribute(SimpleGridConstants.SESSION_ATTR_CRED + uid, PortletSession.APPLICATION_SCOPE);
 				GSSCredential proxy = mycred.get();
@@ -360,7 +360,7 @@
 				}
 				mytransfer = new SimpleTransferThread(SimpleTransferThread.LOCALTOREMOTE, proxy, host, srcdataset, dstdataset, job.getId());
 				mytransfer.start();
-				mysession.setAttribute("cigportal_mag_ft_thread" + uid, mytransfer, PortletSession.APPLICATION_SCOPE);
+				mysession.setAttribute("cig_mag_ft_thread" + uid, mytransfer, PortletSession.APPLICATION_SCOPE);
 				//job.setStatus("cigportal:Dataset Transferring");
 				mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 				return "Dataset is being transferred to remote site. Click \"Next\" to refresh the transfer status";
@@ -371,12 +371,12 @@
 				}
 				String mystatus = mytransfer.getStatus();
 				if (mystatus.equals("SUCCESS")) {
-					mysession.removeAttribute("cigportal_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
+					mysession.removeAttribute("cig_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
 					job.setStatus("cigportal:Dataset Transferred");
 					mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 					return "Dataset transferred. Click \"Next\" to submit the globus job. Note: click ONLY ONCE!";
 				} else if (mystatus.startsWith("error")) {
-					mysession.removeAttribute("cigportal_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
+					mysession.removeAttribute("cig_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
 					throw new PortletException("Error in dataset transfer for job " + job.getId()+": "+ mystatus);
 				}
 				return "Dataset is being transferred to remote site. Click \"Next\" to refresh the transfer status";
@@ -467,13 +467,13 @@
 			if (sitelist.get(j).equals(selectedsite)) break;
 		}
 		if (j<sitelist.size()) {
-			SimpleTransferThread mytransfer = (SimpleTransferThread)mysession.getAttribute("cigportal_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
+			SimpleTransferThread mytransfer = (SimpleTransferThread)mysession.getAttribute("cig_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
 			if (mytransfer == null) {
 				// transfer results to local
 				String[] localFileList = new String[job.getKnum()];
 				String[] remoteFileList = new String[job.getKnum()];
 				for (int i=0; i<job.getKnum(); i++) {
-					localFileList[i] = this.getPortletContext().getRealPath("storage/"+uid+"/Mag/results/" + job.getId()+"."+job.getK(i) + ".dat");
+					localFileList[i] = this.getPortletContext().getRealPath("storage/"+uid+"/mag/results/" + job.getId()+"."+job.getK(i) + ".dat");
 					remoteFileList[i] =  myconfig.get("grid.sites.Magdir."+selectedsite) +"/results/"+ job.getId()+"."+job.getK(i) + ".dat";
 				}
 				String host = myconfig.get("grid.gridftp."+selectedsite);
@@ -484,7 +484,7 @@
 				}
 				mytransfer = new SimpleTransferThread(SimpleTransferThread.REMOTETOLOCAL, proxy, host, localFileList, remoteFileList, job.getId());
 				mytransfer.start();
-				mysession.setAttribute("cigportal_mag_ft_thread" + uid, mytransfer, PortletSession.APPLICATION_SCOPE);
+				mysession.setAttribute("cig_mag_ft_thread" + uid, mytransfer, PortletSession.APPLICATION_SCOPE);
 				//job.setStatus("cigportal:Result Transferring");
 				//mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 				//mysession.setAttribute(SimpleGridConstants.MagJobSid + uid, job.getId(), PortletSession.APPLICATION_SCOPE);
@@ -496,12 +496,12 @@
 				}
 				String mystatus = mytransfer.getStatus();
 				if (mystatus.equals("SUCCESS")) {
-					mysession.removeAttribute("cigportal_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
+					mysession.removeAttribute("cig_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
 					job.setStatus("cigportal:Result Transferred");
 					mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 					return "Results transferred. Click \"Next\" to create visualization iamge";
 				} else if (mystatus.startsWith("error")) {
-					mysession.removeAttribute("cigportal_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
+					mysession.removeAttribute("cig_mag_ft_thread" + uid, PortletSession.APPLICATION_SCOPE);
 					throw new PortletException("Error in dataset transfer for job " + job.getId()+": "+mystatus);
 				}
 				return "results are being transferred from remote site. Click \"Next\" to refresh the transfer status";
@@ -511,7 +511,7 @@
     }
     public String goViz( PortletSession mysession, String uid, ArrayList joblist, MagjobBean job ) throws Exception 
     {
-    	IDWVizThread viz = (IDWVizThread)mysession.getAttribute("cigportal_mag_viz_thread" + uid, PortletSession.APPLICATION_SCOPE);
+    	IDWVizThread viz = (IDWVizThread)mysession.getAttribute("cig_mag_viz_thread" + uid, PortletSession.APPLICATION_SCOPE);
     	if (viz == null) {
     		int numviz = job.getKnum();
     		String s1 =  this.getPortletContext().getRealPath("storage/bnd_poly.dat");
@@ -521,13 +521,13 @@
     		String[] s5 = new String[numviz];
     		for (int i=0; i<numviz; i++) {
 	    		// set parameters
-	    		s3[i] =  this.getPortletContext().getRealPath("storage/"+uid+"/Mag/results/" + job.getId()+"."+job.getK(i) + ".dat");
-	    		s4[i] =  this.getPortletContext().getRealPath("storage/"+uid+"/Mag/results/" + job.getId()+"."+job.getK(i) + "_viz.dat");
-	    		s5[i] =  this.getPortletContext().getRealPath("storage/"+uid+"/Mag/images/" + job.getId()+"."+job.getK(i) + ".jpg");
+	    		s3[i] =  this.getPortletContext().getRealPath("storage/"+uid+"/mag/results/" + job.getId()+"."+job.getK(i) + ".dat");
+	    		s4[i] =  this.getPortletContext().getRealPath("storage/"+uid+"/mag/results/" + job.getId()+"."+job.getK(i) + "_viz.dat");
+	    		s5[i] =  this.getPortletContext().getRealPath("storage/"+uid+"/mag/images/" + job.getId()+"."+job.getK(i) + ".jpg");
     		}
     		viz = new IDWVizThread(s1, s2, s3, s4, s5, job.getId());
     		viz.start();
-    		mysession.setAttribute("cigportal_mag_viz_thread" + uid, viz, PortletSession.APPLICATION_SCOPE);
+    		mysession.setAttribute("cig_mag_viz_thread" + uid, viz, PortletSession.APPLICATION_SCOPE);
     		return "visualization image is being created. Click \"Next\" to refresh the status of visualization";
     	} else {
     		String curid = viz.getOwnerId();
@@ -536,12 +536,12 @@
 			}
 			String mystatus = viz.getStatus();
 			if (mystatus.equals("SUCCESS")) {
-				mysession.removeAttribute("cigportal_mag_viz_thread" + uid, PortletSession.APPLICATION_SCOPE);
+				mysession.removeAttribute("cig_mag_viz_thread" + uid, PortletSession.APPLICATION_SCOPE);
 				job.setStatus("cigportal:Image Created");
 				mysession.setAttribute(SimpleGridConstants.MagJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 				return "visualization image has been created. Click \"Next\" to go to visualization page";
 			} else if (mystatus.startsWith("error")) {
-				mysession.removeAttribute("cigportal_mag_viz_thread" + uid, PortletSession.APPLICATION_SCOPE);
+				mysession.removeAttribute("cig_mag_viz_thread" + uid, PortletSession.APPLICATION_SCOPE);
 				throw new PortletException("Error in visualization for job " + job.getId()+": "+mystatus);
 			}
 			return "visualization image is being created. Click \"Next\" to refresh the status of visualization";



More information about the cig-commits mailing list