[cig-commits] r7944 - cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets

[wei at geodynamics.org]

Author: wei
Date: 2007-09-11 17:59:53 -0700 (Tue, 11 Sep 2007)
New Revision: 7944

Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
Log:
Change to transfering the tar file back.

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-09-12 00:14:46 UTC (rev 7943)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java	2007-09-12 00:59:53 UTC (rev 7944)
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.*;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -237,53 +238,52 @@
     	this.fillTemplate(aContext, req, res, error);
     }
     
-    
-	    //added file upload handling
-	public void doMag_file_upload ( ActionRequest req, ActionResponse res, Context aContext ) throws Exception
-	{
-	    // clear error info
-	    String error = "";
-	    try {
-	        PortletSession mysession = req.getPortletSession(true);
-	        User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
-	        String uid = user.getUserID();
-	        String uploadfile = req.getParameter("cig_mag_parm_filename");
-	        if (uploadfile != null)
-	         {
-	    // Check that we have a file upload request
-  	          boolean isMultipart = PortletFileUpload.isMultipartContent(req);
-	          // Create a factory for disk-based file items
-	          DiskFileItemFactory factory = new DiskFileItemFactory();
-	          //Create a new file upload handler
-              PortletFileUpload upload = new PortletFileUpload(factory);
-	          // 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+"/mag/datasets");
-	          System.out.println(udir);
-	          File usermagDir = new File(udir);
-	          if (!usermagDir.isDirectory()) throw new PortletException(udir+": mag portlet: user mag dataset dir is not a directory.");
-	           // Process the uploaded items
-	          Iterator iter = items.iterator();
-	          while (iter.hasNext())
-	           {
-	             FileItem item = (FileItem) iter.next();
-	             if (item.isFormField()){
-	             System.out.println("\nField = " + item.getFieldName());
-	             }
-	             else{
-	             String fileName = item.getName();
-	             System.out.println("\nNAME: " + fileName);
-	             File uploadedFile = new File(udir, fileName);
-	             item.write(uploadedFile);
-	             }
-	            }
-	         }
-	    }catch (Exception e) {
-	                        error += "CigPortalMagAction::doMag_file_upload: error\n"+e.toString() + "\n";
-	    }
-	    this.fillTemplate(aContext, req, res, error);
-	}
+    //added file upload handling
+//     public void doMag_file_upload ( ActionRequest req, ActionResponse res, Context aContext ) throws Exception
+//    {
+//    	// clear error info
+//    	String error = "";
+//    	try {  		
+//    		PortletSession mysession = req.getPortletSession(true);
+//    		User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
+//    		String uid = user.getUserID();
+//			String uploadfile = req.getParameter("cig_mag_parm_filename");
+//			if (uploadfile != null) 
+//			{
+//				 Check that we have a file upload request
+//	    		boolean isMultipart = PortletFileUpload.isMultipartContent(req);
+//	    		// Create a factory for disk-based file items
+//	    		DiskFileItemFactory factory = new DiskFileItemFactory();
+//	    		//Create a new file upload handler
+//	    		PortletFileUpload upload = new PortletFileUpload(factory);
+//	    		// 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+"/mag/datasets");
+//	     		System.out.println(udir);
+//	     		File userdmsDir = new File(udir);
+//				if (!userdmsDir.isDirectory()) throw new PortletException(udir+": mag portlet: user mag dataset dir is not a directory.");
+//	    		// Process the uploaded items
+//	    		Iterator iter = items.iterator();
+//	    		while (iter.hasNext()) 
+//	    		{
+//	    		    FileItem item = (FileItem) iter.next();
+//	    		    if (item.isFormField()){
+//	    		    	System.out.println("\nField = " + item.getFieldName());
+//	    		    }
+//	    		    else{
+//	    		    	String fileName = item.getName();
+//	    		    	System.out.println("\nNAME: " + fileName);
+//	        		    File uploadedFile = new File(udir, fileName);
+//	        		    item.write(uploadedFile);
+//	    		    }
+//    		   }
+//			}
+//   	}catch (Exception e) {
+//			error += "CigPortalMagAction::doMag_file_upload: error\n"+e.toString() + "\n";
+//		}
+//    	this.fillTemplate(aContext, req, res, error);
+//    } */
 	 
     public void doMag_view_dataset ( ActionRequest req, ActionResponse res, Context aContext ) throws Exception 
     {
@@ -527,8 +527,8 @@
 				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");
-					remoteFileList[i] =  myconfig.get("grid.sites.Magdir."+selectedsite) +"/results/"+ job.getId()+"."+job.getK(i) + ".dat";
+					localFileList[i] = this.getPortletContext().getRealPath("storage/"+uid+"/mag/results/" + "magdata." + job.getId() + ".tar.gz");
+					remoteFileList[i] =  myconfig.get("grid.sites.Magdir."+selectedsite) +"/results/"+"magdata." + job.getId() + ".tar.gz";
 				}
 				String host = myconfig.get("grid.gridftp."+selectedsite);
 				SimpleCred mycred = (SimpleCred)mysession.getAttribute(SimpleGridConstants.SESSION_ATTR_CRED + uid, PortletSession.APPLICATION_SCOPE);