Changeset 2480


Ignore:
Timestamp:
Aug 2, 2006, 11:21:07 AM (16 years ago)
Author:
Martin Svensson
Message:

Updated db schema_version and correct comments in BioMaterialEvent? and PlateEvent?

Location:
trunk/src/core/net/sf/basedb/core
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/core/net/sf/basedb/core/BioMaterialEvent.java

    r2479 r2480  
    395395  /**
    396396    Get the {@link Hardware} that was used in this event.
    397     @param hardware A <code>Hardware</code> item, or null if not
     397    @param hardware A <code>Hardware</code> item, or null if not known
    398398    @throws PermissionDeniedException If the logged in user doesn't have
    399399      write permission on this event or use permission for the hardware
  • trunk/src/core/net/sf/basedb/core/Install.java

    r2470 r2480  
    9292    method.
    9393  */
    94   public static final int NEW_SCHEMA_VERSION = 7;
     94  public static final int NEW_SCHEMA_VERSION = 8;
    9595
    9696  public static synchronized void createTables(boolean update, final ProgressReporter progress)
     
    304304      createRoleKey(Item.PROTOCOLTYPE, "Protocol types", "Gives access to protocol types", guests_use_power_users_all);
    305305      createRoleKey(Item.PROTOCOL, "Protocols", "Gives access to protocols", power_users_create);
    306       createRoleKey(Item.HARDWARETYPE, "Hardware types", "Gives access to hardware types", all_use_administrators_write);
     306      createRoleKey(Item.HARDWARETYPE, "Hardware types", "Gives access to hardware types", guests_use_power_users_all);
    307307      createRoleKey(Item.HARDWARE, "Hardware", "Gives access to hardware", power_users_create);
    308308      createRoleKey(Item.SOFTWARETYPE, "Software types", "Gives access to software types", all_use_administrators_write);
     
    382382      HardwareTypeData scanner = createHardwareType(HardwareType.SCANNER, "Scanner", "Scans the microarray images.");
    383383      HardwareTypeData robot = createHardwareType(HardwareType.PRINT_ROBOT, "Print robot", "Spot the probe on the array.");
     384     
    384385
    385386      // Hardware
  • trunk/src/core/net/sf/basedb/core/PlateEvent.java

    r2479 r2480  
    267267    @param hardware A <code>Hardware</code> item or null if not known.
    268268    @throws PermissionDeniedException If the logged in user doesn't have
    269       write on this event or use permission for the hardware.
     269      write permission on this event or use permission for the hardware.
    270270  */
    271271  public void setHardware(Hardware hardware)
  • trunk/src/core/net/sf/basedb/core/Update.java

    r2470 r2480  
    114114        <code>RawBioAssayData</code>.
    115115      <li>Delete all {@link FormulaData} with affymetrix raw data type.
     116      </ul>
     117    </td>
     118  </tr>
     119 
     120  <tr>
     121    <td>8</td>
     122    <td>
     123      <ul>
     124      <li>Added {@link net.sf.basedb.core.data.HardwareData} to BioMaterialEvents and PlateEvents.
    116125      </ul>
    117126    </td>
     
    207216      }
    208217
     218     
     219      if (schemaVersion < 8)
     220      {
     221        if (progress != null) progress.display((int)(7*progress_factor), "--Updating to schema version 8...");
     222        schemaVersion = setSchemaVersionInTransaction(8);
     223      }
    209224      /*
    210       if (schemaVersion < 8)
    211       {
    212         if (progress != null) progress.display((int)(7*progress_factor), "--Updating to schema version 8...");
    213         schemaVersion = updateToSchemaVersion8();
    214         - or -
    215         schemaVersion = setSchemaVersionInTransaction(8);
     225      if (schemaVersion < 9)
     226      {
     227        if (progress != null) progress.display((int)(8*progress_factor), "--Updating to schema version 9...");
     228        schemaVersion = setSchemaVersionInTransaction(9);
    216229      }
    217230      ... etc...
Note: See TracChangeset for help on using the changeset viewer.