Changeset 2480

Timestamp:

Aug 2, 2006, 11:21:07 AM (17 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:

• BioMaterialEvent.java (modified) (1 diff)
• Install.java (modified) (3 diffs)
• PlateEvent.java (modified) (1 diff)
• Update.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/BioMaterialEvent.java

@@ -395 +395 @@
   /**
     Get the {@link Hardware} that was used in this event.
-    @param hardware A <code>Hardware</code> item, or null if not 
+    @param hardware A <code>Hardware</code> item, or null if not known
     @throws PermissionDeniedException If the logged in user doesn't have
       write permission on this event or use permission for the hardware

trunk/src/core/net/sf/basedb/core/Install.java

@@ -92 +92 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = 7;
+  public static final int NEW_SCHEMA_VERSION = 8;
 
   public static synchronized void createTables(boolean update, final ProgressReporter progress)
@@ -304 +304 @@
       createRoleKey(Item.PROTOCOLTYPE, "Protocol types", "Gives access to protocol types", guests_use_power_users_all);
       createRoleKey(Item.PROTOCOL, "Protocols", "Gives access to protocols", power_users_create);
-      createRoleKey(Item.HARDWARETYPE, "Hardware types", "Gives access to hardware types", all_use_administrators_write);
+      createRoleKey(Item.HARDWARETYPE, "Hardware types", "Gives access to hardware types", guests_use_power_users_all);
       createRoleKey(Item.HARDWARE, "Hardware", "Gives access to hardware", power_users_create);
       createRoleKey(Item.SOFTWARETYPE, "Software types", "Gives access to software types", all_use_administrators_write);
@@ -382 +382 @@
       HardwareTypeData scanner = createHardwareType(HardwareType.SCANNER, "Scanner", "Scans the microarray images.");
       HardwareTypeData robot = createHardwareType(HardwareType.PRINT_ROBOT, "Print robot", "Spot the probe on the array.");
+      
 
       // Hardware 

trunk/src/core/net/sf/basedb/core/PlateEvent.java

@@ -267 +267 @@
     @param hardware A <code>Hardware</code> item or null if not known.
     @throws PermissionDeniedException If the logged in user doesn't have 
-      write on this event or use permission for the hardware.
+      write permission on this event or use permission for the hardware.
   */
   public void setHardware(Hardware hardware)

trunk/src/core/net/sf/basedb/core/Update.java

@@ -114 +114 @@
         <code>RawBioAssayData</code>.
       <li>Delete all {@link FormulaData} with affymetrix raw data type.
+      </ul>
+    </td>
+  </tr>
+  
+  <tr>
+    <td>8</td>
+    <td>
+      <ul>
+      <li>Added {@link net.sf.basedb.core.data.HardwareData} to BioMaterialEvents and PlateEvents.
       </ul>
     </td>
@@ -207 +216 @@
       }
 
+      
+      if (schemaVersion < 8)
+      {
+        if (progress != null) progress.display((int)(7*progress_factor), "--Updating to schema version 8...");
+        schemaVersion = setSchemaVersionInTransaction(8);
+      }
       /*
-      if (schemaVersion < 8)
-      {
-        if (progress != null) progress.display((int)(7*progress_factor), "--Updating to schema version 8...");
-        schemaVersion = updateToSchemaVersion8();
-        - or -
-        schemaVersion = setSchemaVersionInTransaction(8);
+      if (schemaVersion < 9)
+      {
+        if (progress != null) progress.display((int)(8*progress_factor), "--Updating to schema version 9...");
+        schemaVersion = setSchemaVersionInTransaction(9);
       }
       ... etc...