[cig-commits] r21145 - cs/spatialdata/trunk/libsrc/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2012-12-13 13:06:09 -0800 (Thu, 13 Dec 2012)
New Revision: 21145

Modified:
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc
Log:
Increase buffer size for grid db I/O. Fix typo in error message.

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc	2012-12-13 20:13:31 UTC (rev 21144)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc	2012-12-13 21:06:09 UTC (rev 21145)
@@ -299,7 +299,8 @@
   const int numValues = db->_numValues;
   const int spaceDim = db->_spaceDim;
 
-  utils::LineParser parser(filein, "//");
+  const int bufsize = 32768;
+  utils::LineParser parser(filein, "//", bufsize);
   parser.eatwhitespace(true);
 
   std::istringstream buffer;

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc	2012-12-13 20:13:31 UTC (rev 21144)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc	2012-12-13 21:06:09 UTC (rev 21145)
@@ -76,7 +76,7 @@
     if (0 != strcasecmp(HEADER, hbuffer.c_str())) {
       std::ostringstream msg;
       msg
-	<< "Magic header '" << buffer << "' does not match expected header '"
+	<< "Magic header '" << buffer.str() << "' does not match expected header '"
 	<< HEADER << "' in spatial database file '" << filename() << "'.\n";
       throw std::runtime_error(msg.str());
     } // if