Changeset 4575

Timestamp:

Oct 13, 2008, 10:57:11 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1121: News item 'BASE Server installed' is created after running updatedb

File:

• trunk/src/core/net/sf/basedb/core/Install.java (modified) (6 diffs)

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

@@ -590 +590 @@
       createClient(rootUser, "net.sf.basedb.clients.jobagent", "Job agent client", "This client is used by all job agents", keyJobAgentUse);
   
-      // News
-      if (progress != null) progress.display((int)(21*progress_factor), "--Creating news...");
-      createNews("BASE Server installed", "Welcome to your new BASE server.");
-  
       // Plugins
-      if (progress != null) progress.display((int)(22*progress_factor), "--Creating plugin definitions...");
+      if (progress != null) progress.display((int)(21*progress_factor), "--Creating plugin definitions...");
       createPluginType("Autodetecting importer", "This interface should be implemented by all plugins that are capable of autodetect the file format by parsing an input stream.", 
         "net.sf.basedb.core.plugin.AutoDetectingImporter", null);
@@ -663 +659 @@
       
       // Plugin configurations
-      if (progress != null) progress.display((int)(23*progress_factor), "--Creating example plugin configurations...");
+      if (progress != null) progress.display((int)(22*progress_factor), "--Creating example plugin configurations...");
       createPluginConfigurations("/plugin_configfile.xml", update);
       createPluginConfigurations("/illumina.configurations.xml", update);
@@ -671 +667 @@
       ColoringData NO_COLORING = new ColoringData(false, false, null, null, null);
       ColoringData RATIO_COLORING = new ColoringData(true, true, -1f, 0f, 1f);
-      if (progress != null) progress.display((int)(24*progress_factor), "--Creating formulas...");
+      if (progress != null) progress.display((int)(23*progress_factor), "--Creating formulas...");
       createFormula(Formula.Type.COLUMN_EXPRESSION, Formula.Parser.JEP, Formula.AverageMethod.GEOMETRIC_MEAN,
         "Ratio, ch1 / ch2", "The ratio of channel 1 to channel 2", null, 2, 
@@ -710 +706 @@
       }
   
-      if (progress != null) progress.display((int)(25*progress_factor), "--Creating job agents...");
+      if (progress != null) progress.display((int)(24*progress_factor), "--Creating job agents...");
       // TODO
       
       // File set member types
-      if (progress != null) progress.display((int)(26*progress_factor), "--Creating data file types...");
+      if (progress != null) progress.display((int)(25*progress_factor), "--Creating data file types...");
       DataFileTypeData celFile = createDataFileType(
         DataFileType.AFFYMETRIX_CEL, "CEL file", "Affymetrix CEL file", 
@@ -747 +743 @@
       
       // Platforms and variants
-      if (progress != null) progress.display((int)(27*progress_factor), "--Creating platforms...");
+      if (progress != null) progress.display((int)(26*progress_factor), "--Creating platforms...");
       createPlatform("generic", "Generic", "Generic platform which expects data to be imported into the database",
         false, null, 0, 
@@ -758 +754 @@
         new PlatformFT(cdfFile, true)
       );
+      
+      // News
+      if (progress != null) progress.display((int)(27*progress_factor), "--Creating news...");
+      String version = "BASE " + Version.getMajor() + "." + Version.getMinor() + "." + Version.getMaintenance();
+      if (update)
+      {
+        createNews("Server upgraded to " + version, "Welcome to your upgraded BASE server");
+      }
+      else
+      {
+        createNews(version + " installed", "Welcome to your new BASE server.");
+      }
+
       
       if (progress != null) progress.display(100, "Database initialised successfully.");