Changeset 403


Ignore:
Timestamp:
Aug 17, 2007, 11:56:04 AM (16 years ago)
Author:
dominic
Message:

updated read me file for newly added annotation type and cv importer

Location:
trunk/uk/ac/ebi
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/uk/ac/ebi/AffyArrayDesignBatchImporter/src/uk/ac/ebi/nugo/common/ZipUnpacker.java

    r402 r403  
    3232    This class unpacks zip file provided by users into the base file structure
    3333    @author Dominic Oyeniran
    34     @email oyeniran@ebi.ac.uk
    35  
    36    
    37    
     34    @version 1.0
     35    @email oyeniran@ebi.ac.uk 
    3836 */
    3937
    … …  
    7472      {
    7573        createSubDirectory( file, user);
    76         // now call the mathod to unpack the zip files
    7774        PluginDefinition zipFilePlugin = PluginDefinition.getByClassName(dc, "net.sf.basedb.plugins.ZipFileUnpacker");
    7875        FileUnpacker unpacker = zipFilePlugin.newInstance(net.sf.basedb.plugins.ZipFileUnpacker.class, null, dc.getSessionControl(), null, null);
    … …  
    103100      @param inStream
    104101      @param dc
    105       @return true, if user has sufficient quqota and false otherwise
     102      @return true, if user has sufficient quota and false otherwise
    106103   */
    107104  private boolean checkUserQuota(InputStream inStream, DbControl dc)
    … …  
    112109    Quota quota = user.getQuota();
    113110    QuotaType totalQuotaType = QuotaType.getById(dc, SystemItems.getId(QuotaType.TOTAL));
    114     //unlimited storage (e.g. for user root) will return -1
    115111    long quotaValue = quota.getQuotaValue(totalQuotaType, Location.PRIMARY);   
    116     //System.out.println("the quota value of the user: " + user.getName()+ " is: "+quotaValue );
    117112    long currentDiskUsage = user.getDiskUsage(totalQuotaType, Location.PRIMARY);
    118       //check whether remaining disk space and zip file size are compatible
    119113    long remainingSpace = quotaValue - currentDiskUsage;
    120     //System.out.println("the remaining space for user: " + user.getName()+ " is: "+remainingSpace );
    121114    if(remainingSpace < zipFileSize && quotaValue!=-1)
    122115    {
    … …  
    171164      //get the parent directory
    172165      Directory zipFileDir = zipFile.getDirectory();
    173       //System.out.println("zipFile is located in dir " + zipFile.getPath());
    174166      Directory d = Directory.getById(dc, zipFileDir.getId());
    175167      Directory subDir = d.newSubDirectory();

  • trunk/uk/ac/ebi/AnnotationTypeCvImporter/README.txt

    r402 r403  
    4747    - updating existing annotation types: set to false by default, do set this to true if an existing annotation type should be updated
    4848    - character set : is the character set of the file to be imported, the default is ISO-8859-1
    49     - data separator: the data separator for multiple values in a data columns. If the import file contains more than one value per data column, do specifiy the data       separator, the default is colon. Only semi-colon, colon and comma are allowed.
     49    - data separator: the data separator for multiple values in a data columns. If the import file contains more than one value per data column, do specifiy the data         separator, the default is colon. Only semi-colon, colon and comma are allowed.
    5050  7. On the next screen click Finish and wait for the job to complete. You will be shown the progress of the import in the dialog, with the page refreshing itself regularly.
    5151 

  • trunk/uk/ac/ebi/AnnotationTypeCvImporter/src/uk/ac/ebi/nugo/common/ZipUnpacker.java

    r402 r403  
    3232    This class unpacks zip file provided by users into the base file structure
    3333    @author Dominic Oyeniran
    34     @email oyeniran@ebi.ac.uk
    35  
    36    
    37    
     34    @version 1.0
     35    @email oyeniran@ebi.ac.uk 
    3836 */
    3937
    … …  
    7472      {
    7573        createSubDirectory( file, user);
    76         // now call the mathod to unpack the zip files
    7774        PluginDefinition zipFilePlugin = PluginDefinition.getByClassName(dc, "net.sf.basedb.plugins.ZipFileUnpacker");
    7875        FileUnpacker unpacker = zipFilePlugin.newInstance(net.sf.basedb.plugins.ZipFileUnpacker.class, null, dc.getSessionControl(), null, null);
    … …  
    103100      @param inStream
    104101      @param dc
    105       @return true, if user has sufficient quqota and false otherwise
     102      @return true, if user has sufficient quota and false otherwise
    106103   */
    107104  private boolean checkUserQuota(InputStream inStream, DbControl dc)
    … …  
    112109    Quota quota = user.getQuota();
    113110    QuotaType totalQuotaType = QuotaType.getById(dc, SystemItems.getId(QuotaType.TOTAL));
    114     //unlimited storage (e.g. for user root) will return -1
    115111    long quotaValue = quota.getQuotaValue(totalQuotaType, Location.PRIMARY);   
    116     //System.out.println("the quota value of the user: " + user.getName()+ " is: "+quotaValue );
    117112    long currentDiskUsage = user.getDiskUsage(totalQuotaType, Location.PRIMARY);
    118       //check whether remaining disk space and zip file size are compatible
    119113    long remainingSpace = quotaValue - currentDiskUsage;
    120     //System.out.println("the remaining space for user: " + user.getName()+ " is: "+remainingSpace );
    121114    if(remainingSpace < zipFileSize && quotaValue!=-1)
    122115    {
    … …  
    171164      //get the parent directory
    172165      Directory zipFileDir = zipFile.getDirectory();
    173       //System.out.println("zipFile is located in dir " + zipFile.getPath());
    174166      Directory d = Directory.getById(dc, zipFileDir.getId());
    175167      Directory subDir = d.newSubDirectory();

  • trunk/uk/ac/ebi/Tab2MageExporter/src/uk/ac/ebi/nugo/common/ZipUnpacker.java

    r402 r403  
    2727import org.apache.log4j.Logger;
    2828
    29 
    30 
    3129/**
    3230    This class unpacks zip file provided by users into the base file structure
    3331    @author Dominic Oyeniran
    34     @email oyeniran@ebi.ac.uk
    35  
    36    
    37    
     32    @version 1.0
     33    @email oyeniran@ebi.ac.uk 
    3834 */
    3935
    … …  
    7470      {
    7571        createSubDirectory( file, user);
    76         // now call the mathod to unpack the zip files
    7772        PluginDefinition zipFilePlugin = PluginDefinition.getByClassName(dc, "net.sf.basedb.plugins.ZipFileUnpacker");
    7873        FileUnpacker unpacker = zipFilePlugin.newInstance(net.sf.basedb.plugins.ZipFileUnpacker.class, null, dc.getSessionControl(), null, null);
    … …  
    10398      @param inStream
    10499      @param dc
    105       @return true, if user has sufficient quqota and false otherwise
     100      @return true, if user has sufficient quota and false otherwise
    106101   */
    107102  private boolean checkUserQuota(InputStream inStream, DbControl dc)
    … …  
    112107    Quota quota = user.getQuota();
    113108    QuotaType totalQuotaType = QuotaType.getById(dc, SystemItems.getId(QuotaType.TOTAL));
    114     //unlimited storage (e.g. for user root) will return -1
    115109    long quotaValue = quota.getQuotaValue(totalQuotaType, Location.PRIMARY);   
    116     //System.out.println("the quota value of the user: " + user.getName()+ " is: "+quotaValue );
    117110    long currentDiskUsage = user.getDiskUsage(totalQuotaType, Location.PRIMARY);
    118       //check whether remaining disk space and zip file size are compatible
    119111    long remainingSpace = quotaValue - currentDiskUsage;
    120     //System.out.println("the remaining space for user: " + user.getName()+ " is: "+remainingSpace );
    121112    if(remainingSpace < zipFileSize && quotaValue!=-1)
    122113    {
    … …  
    171162      //get the parent directory
    172163      Directory zipFileDir = zipFile.getDirectory();
    173       //System.out.println("zipFile is located in dir " + zipFile.getPath());
    174164      Directory d = Directory.getById(dc, zipFileDir.getId());
    175165      Directory subDir = d.newSubDirectory();
Note: See TracChangeset for help on using the changeset viewer.