Changeset 10529 for trunk/FACT++/src/Fits.cc

Timestamp:

05/03/11 14:04:37 (14 years ago)

Author:

lyard

Message:

Various bug fixes and new commands added

File:

• trunk/FACT++/src/Fits.cc (modified) (2 diffs)

trunk/FACT++/src/Fits.cc

@@ -143 +143 @@
                 std::string factTableName = "FACT-" + tableName;
                 fTable = fFile->addTable(factTableName, 0, allNames, allDataTypes, allUnits);
+                fTable->makeThisCurrent();
                 fCopyBuffer = new unsigned char[fTotalNumBytes]; 
                 fNumRows = fTable->rows();
                 if (fNumRows !=0)
                 {//If the file already existed, then we must load its data to memory before writing to it.
-                        std::vector<std::string> tableNameString;
-                        tableNameString.push_back(tableName);
-                        fFile->read(tableNameString);   
+                        BinTable* bTable = dynamic_cast<BinTable*>(fTable);
+                        if (!bTable)
+                        {
+                                fMess->Error("The table " + factTableName + " could not be converted to a binary table. skipping");
+                                return;
+                        }       
+                        //read the table binary data.
+                        std::vector<string> colName;
+                        bTable->readData(true, colName);
+
+                        //double check that the data was indeed read from the disk. Go through the fTable instead as colName is empty (yes, it is !)
                         std::map<std::string, Column*> cMap = fTable->column();
                         std::map<std::string, Column*>::iterator cMapIt;
+
                         for (cMapIt = cMap.begin(); cMapIt != cMap.end(); cMapIt++)
                         {
-                                //TODO this only works for scalar columns I assume. upgrade it to fully read vector columns
-                                cMapIt->second->readData(1, fNumRows);          
-                        }       
+                                if (!cMapIt->second->isRead())
+                                {
+                                        fMess->Error("Column " + cMapIt->first + "Could not be read back from the disk");
+                                        return; 
+                                }       
+                        }
                         updating = true;
                 }
@@ -255 +268 @@
 {
 
-        fTable->makeThisCurrent();
         try
         {
+                fTable->makeThisCurrent();
                 fTable->insertRows(fNumRows);
         }