[cig-commits] r7927 - cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/gisolve/demo/portlets

[lis at geodynamics.org]

Author: lis
Date: 2007-09-05 13:32:18 -0700 (Wed, 05 Sep 2007)
New Revision: 7927

Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/gisolve/demo/portlets/GISolveDMSPortlet.java
Log:
changed fillTemplate method, changed file uploading method

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/gisolve/demo/portlets/GISolveDMSPortlet.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/gisolve/demo/portlets/GISolveDMSPortlet.java	2007-09-05 19:24:42 UTC (rev 7926)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/gisolve/demo/portlets/GISolveDMSPortlet.java	2007-09-05 20:32:18 UTC (rev 7927)
@@ -123,36 +123,54 @@
 					setTemplate(req, "dms-1.vm");
 					return;
 				}
-			} 
-			aContext.put(SimpleGridConstants.dmsJobList, joblist);
-			aContext.put(SimpleGridConstants.dmsJobSid, cursid);
-			String statusinfo = (String)mysession.getAttribute("gisolve_dms_status_info" + uid, PortletSession.APPLICATION_SCOPE);
-			aContext.put("gisolve_dms_status_info", statusinfo);
-			ArrayList sites = this.getSiteList(myconfig);
-			aContext.put("gisolve_dms_site_list", sites);
-			String udir = this.getPortletContext().getRealPath("storage/"+uid+"/dms/datasets");
-			File userdmsDir = new File(udir);
-			if (!userdmsDir.isDirectory()) throw new PortletException(udir+": dms portlet: user dms dataset dir is not a directory.");
-			String[] flist = userdmsDir.list();
-			ArrayList<String> filelist = new ArrayList<String>(flist.length);
-			for (int i=0; i<flist.length; i++) {
-				filelist.add(flist[i]);
 			}
-			aContext.put("gisolve_dms_parm_datalist", filelist);
-			// render dataset view
-			String viewdataset = (String)mysession.getAttribute("gisolve_dms_viz_vieworig" + uid, PortletSession.APPLICATION_SCOPE);
-			if (viewdataset != null) {
-				aContext.put("gisolve_dms_viz_vieworig", viewdataset);
-				aContext.put("gisolve_dms_viz_datasetlink", "/"+mywebappname+"/storage/"+uid+"/dms/datasets/"+viewdataset);
-				aContext.put("gisolve_dms_viz_datasetimagelink", "/"+mywebappname+"/storage/"+uid+"/dms/images/"+viewdataset+".jpg");
-				mysession.setAttribute("gisolve_dms_viz_vieworig" + uid, null, PortletSession.APPLICATION_SCOPE); // reset
-			} else {
-				aContext.put("gisolve_dms_viz_vieworig", null);
+			if (curPage.equals("Job")) {
+				aContext.put(SimpleGridConstants.dmsJobList, joblist);
+				aContext.put(SimpleGridConstants.dmsJobSid, cursid);
+				String statusinfo = (String)mysession.getAttribute("gisolve_dms_status_info" + uid, PortletSession.APPLICATION_SCOPE);
+				aContext.put("gisolve_dms_status_info", statusinfo);
+				ArrayList sites = this.getSiteList(myconfig);
+				aContext.put("gisolve_dms_site_list", sites);
+				String udir = this.getPortletContext().getRealPath("storage/"+uid+"/dms/datasets");
+				File userdmsDir = new File(udir);
+				if (!userdmsDir.isDirectory()) throw new PortletException(udir+": dms portlet: user dms dataset dir is not a directory.");
+				String[] flist = userdmsDir.list();
+				ArrayList<String> filelist = new ArrayList<String>(flist.length);
+				for (int i=0; i<flist.length; i++) {
+					filelist.add(flist[i]);
+				}
+				aContext.put("gisolve_dms_parm_datalist", filelist);
+				// render dataset view
+				String viewdataset = (String)mysession.getAttribute("gisolve_dms_viz_vieworig" + uid, PortletSession.APPLICATION_SCOPE);
+				if (viewdataset != null) {
+					aContext.put("gisolve_dms_viz_vieworig", viewdataset);
+					aContext.put("gisolve_dms_viz_datasetlink", "/"+mywebappname+"/storage/"+uid+"/dms/datasets/"+viewdataset);
+					aContext.put("gisolve_dms_viz_datasetimagelink", "/"+mywebappname+"/storage/"+uid+"/dms/images/"+viewdataset+".jpg");
+					mysession.setAttribute("gisolve_dms_viz_vieworig" + uid, null, PortletSession.APPLICATION_SCOPE); // reset
+				} else {
+					aContext.put("gisolve_dms_viz_vieworig", null);
+				}
+				setTemplate(req, "dms-0.vm");
+				return;
 			}
-			setTemplate(req, "dms-0.vm");
+			
+			// download MAG parameter file for user editing
+//			String viewdataset = (String)mysession.getAttribute("gisolve_dms_viz_vieworig" + uid, PortletSession.APPLICATION_SCOPE);
+//			if (viewdataset != null) {
+//				aContext.put("gisolve_dms_viz_vieworig", viewdataset);
+//				aContext.put("gisolve_dms_viz_datasetlink", "/"+mywebappname+"/storage/"+uid+"/dms/datasets/"+viewdataset);
+//				aContext.put("gisolve_dms_viz_datasetimagelink", "/"+mywebappname+"/storage/"+uid+"/dms/images/"+viewdataset+".jpg");
+//				mysession.setAttribute("gisolve_dms_viz_vieworig" + uid, null, PortletSession.APPLICATION_SCOPE); // reset
+//			} else {
+//				aContext.put("gisolve_dms_viz_vieworig", null);
+//			}
+			String fuploadstatus = (String)mysession.getAttribute("gisolve_dms_file_upload_status"+uid, PortletSession.APPLICATION_SCOPE);
+			aContext.put("gisolve_dms_file_upload_status", fuploadstatus);
+			setTemplate(req, "dms-2.vm");
+			return;
 		} catch (Exception e) {
 			error += "User portlet::fillTemplate() error\n"+e.toString()+"\n";
-			setTemplate(req, "dms-0.vm");
+			setTemplate(req, "dms-2.vm");
 		}
 		// fille error info
 		aContext.put(SimpleGridConstants.errorInfo, actionError + error);
@@ -209,7 +227,7 @@
 
 			mysession.setAttribute(SimpleGridConstants.dmsJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
 			mysession.setAttribute(SimpleGridConstants.dmsJobSid + uid, jid, PortletSession.APPLICATION_SCOPE);
-			mysession.setAttribute(SimpleGridConstants.dmsPage + uid, "Main", PortletSession.APPLICATION_SCOPE);
+			mysession.setAttribute(SimpleGridConstants.dmsPage + uid, "Job", PortletSession.APPLICATION_SCOPE);
 			mysession.setAttribute("gisolve_dms_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 += "GISolveDMSAction::doDms_create: error\n"+e.toString()+"\nBe sure to select required parameters\n";
@@ -252,7 +270,7 @@
 	    		// Parse the request
 	    		List items = upload.parseRequest(req);
 	    		// Check validity of directory file(s) will be written to
-	     		String udir = this.getPortletContext().getRealPath("storage/"+uid+"/dms/datasets");
+	     		String udir = this.getPortletContext().getRealPath("/home/lis/Desktop");
 	     		System.out.println(udir);
 	     		File userdmsDir = new File(udir);
 				if (!userdmsDir.isDirectory()) throw new PortletException(udir+": dms portlet: user dms dataset dir is not a directory.");
@@ -261,16 +279,19 @@
 	    		while (iter.hasNext()) 
 	    		{
 	    		    FileItem item = (FileItem) iter.next();
-	    		    if (item.isFormField()){
+	    		    if (!item.isFormField()){
 	    		    	System.out.println("\nField = " + item.getFieldName());
 	    		    }
-	    		    else{
+	    		else{
 	    		    	String fileName = item.getName();
 	    		    	System.out.println("\nNAME: " + fileName);
 	        		    File uploadedFile = new File(udir, fileName);
 	        		    item.write(uploadedFile);
 	    		    }
-    		   }
+    		    }
+    			String fuploadstatus = "File uploaded."; 
+    			mysession.setAttribute("gisolve_dms_file_upload_status"+uid, fuploadstatus, PortletSession.APPLICATION_SCOPE);
+    			mysession.setAttribute(SimpleGridConstants.dmsPage + uid, "Job", PortletSession.APPLICATION_SCOPE);
 			}
     	}catch (Exception e) {
 			error += "GISolveDMSAction::doDms_file_upload: error\n"+e.toString() + "\n";