[yoda-svn] r485 - trunk/src

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Jul  3 14:00:24 2012
New Revision: 485

Log:
Commenting out code that is supposed to read AIDA annotations but
breaks as soon as annotations are present. The error message looks like
we are trying initialise a string with NULL.

Modified:
   trunk/src/ReaderAIDA.cc

Modified: trunk/src/ReaderAIDA.cc
==============================================================================
--- trunk/src/ReaderAIDA.cc	Tue Jul  3 12:07:42 2012	(r484)
+++ trunk/src/ReaderAIDA.cc	Tue Jul  3 14:00:24 2012	(r485)
@@ -39,12 +39,13 @@
         /// @todo Clarify the memory management resulting from this... need shared_ptr?
         Scatter2D* dps = new Scatter2D(plotpath + "/" + plotname);
 
-        // Read in annotations
-        for (const TiXmlNode* annN = dpsN->FirstChild("annotation"); annN; annN = annN->NextSibling()) {
-          for (const TiXmlNode* itN = annN->FirstChild("item"); itN; itN = itN->NextSibling()) {
-            dps->setAnnotation(itN->ToElement()->Attribute("key"), itN->ToElement()->Attribute("value"));
-          }
-        }
+        // FIXME: This code crashes when there are annotations in the AIDA file:
+        //// Read in annotations
+        //for (const TiXmlNode* annN = dpsN->FirstChild("annotation"); annN; annN = annN->NextSibling()) {
+        //  for (const TiXmlNode* itN = annN->FirstChild("item"); itN; itN = itN->NextSibling()) {
+        //    dps->setAnnotation(itN->ToElement()->Attribute("key"), itN->ToElement()->Attribute("value"));
+        //  }
+        //}
 
         for (const TiXmlNode* dpN = dpsN->FirstChild("dataPoint"); dpN; dpN = dpN->NextSibling()) {
           const TiXmlNode* xMeasN = dpN->FirstChild("measurement");