Changeset 2321 for trunk

Timestamp:

10/04/11 14:15:54 (13 years ago)

Author:

Malte Marquarding

Message:

Ticket #249: scantbable schema was changed. This required an update to scantable version 4. I have added a class STUpgrade to handle all schema upgrades. This is handled transparently in the scantable constructor

Location:

trunk

Files:

• SConstruct (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/STMolecules.h (modified) (2 diffs)
• src/STUpgrade.cpp (added)
• src/STUpgrade.h (added)
• src/Scantable.cpp (modified) (2 diffs)
• src/Scantable.h (modified) (2 diffs)

trunk/SConstruct

@@ -196 +196 @@
     env = conf.Finish()
 
-env["version"] = "3.1.x"
+env["version"] = "4.0.x"
 
 if env['mode'] == 'release':
@@ -270 +270 @@
         env.Command("No data tables available. Use 'asap_update_data' after install",
                     '', env.MessageAction)
-    arch = env.Archiver(os.path.join("dist",
-                                     env["stagedir"]+"_"+env["makedist"]),
-                        env["stagedir"])
+#    arch = env.Archiver(os.path.join("dist",
+#                                    env["stagedir"]+"_"+env["makedist"]),
+#                        env["stagedir"])
 #    env.AddPostAction(arch, Delete("$stagedir"))
 

trunk/src/CMakeLists.txt

@@ -57 +57 @@
      ${SRCDIR}/MSWriter.cpp
      ${SRCDIR}/AsapLogSink.cpp
+     ${SRCDIR}/STUpgrade.cpp 
      ${SRCDIR}/Templates.cpp )
 

trunk/src/STMolecules.h

@@ -44 +44 @@
 ***/
 
-  casa::uInt addEntry( casa::Vector<casa::Double> restfreq, const casa::Vector<casa::String>& name=casa::Vector<casa::String>(0),
+  casa::uInt addEntry( casa::Vector<casa::Double> restfreq, 
+                       const casa::Vector<casa::String>& name=casa::Vector<casa::String>(0),
                        const casa::Vector<casa::String>& formattedname=casa::Vector<casa::String>(0));
 
@@ -51 +52 @@
                  casa::String& formattedname, casa::uInt id) const;
 ***/
-  void getEntry( casa::Vector<casa::Double>& restfreq, casa::Vector<casa::String>& name,
-                 casa::Vector<casa::String>& formattedname, casa::uInt id) const;
+  void getEntry( casa::Vector<casa::Double>& restfreq, 
+                 casa::Vector<casa::String>& name,
+                 casa::Vector<casa::String>& formattedname, 
+                 casa::uInt id) const;
 
   std::vector<double> getRestFrequencies() const;

trunk/src/Scantable.cpp

@@ -68 +68 @@
 #include "STPolLinear.h"
 #include "STPolStokes.h"
+#include "STUpgrade.h"
 #include "Scantable.h"
 
@@ -116 +117 @@
   uInt version = tab.keywordSet().asuInt("VERSION");
   if (version != version_) {
-    if ( version == 2 && version_ == 3 ) {
-      // run asap2to3 command
+      STUpgrade upgrader(version_);
       LogIO os( LogOrigin( "Scantable" ) ) ;
-      string command="asap2to3" ;
-      string exec=command+" in="+name ;
-      string outname=name ;
-      if ( name.at(name.length()-1) == '/' )
-        outname = outname.substr( 0, name.length()-1 ) ;
-      outname += ".asap3" ;
       os << LogIO::WARN
-         << name << " is incompatible data format (Scantable v2)." << endl 
-         << "Running " << command << " to create " << outname << ", " << endl  
-         << "which is identical to " << name << " but compatible " << endl 
-         << "data format with current software version (Scantable v3)." 
+         << name << " data format version " << version 
+         << " is deprecated" << endl 
+         << "Running upgrade."<< endl  
          << LogIO::POST ;  
-      int ret = system( string("which "+command+" > /dev/null 2>&1").c_str() ) ;
-      if ( ret != 0 )
-        throw(AipsError(command+" is not installed")) ;
+      std::string outname = upgrader.upgrade(name);
       os << LogIO::WARN
          << "Data will be loaded from " << outname << " instead of " 
          << name << LogIO::POST ;
-      int tmp = system( exec.c_str() ) ;
-      (void) tmp;
       tab = Table(outname, Table::Update ) ;
-      //os << "tab.tableName()=" << tab.tableName() << LogIO::POST ;
-    }
-    else {
-      throw(AipsError("Unsupported version of ASAP file."));
-    }
   }
   if ( type_ == Table::Memory ) {

trunk/src/Scantable.h

@@ -86 +86 @@
 
   /**
-   * Create a Scantable object form an existing table on disk
+   * Create a Scantable object from an existing table on disk
    * @param[in] name the name of the existing Scantable
    */
-  explicit Scantable(const std::string& name, casa::Table::TableType ttype = casa::Table::Memory);
+  explicit Scantable(const std::string& name, 
+                     casa::Table::TableType ttype = casa::Table::Memory);
 
   /// @fixme this is only sensible for MemoryTables....
@@ -638 +639 @@
   std::vector<uint> getNumbers(const casa::ScalarColumn<casa::uInt>& col) const;
 
-  static const casa::uInt version_ = 3;
+  static const casa::uInt version_ = 4;
 
   STSelector selector_;