From 49b9e306fa139acc1affa6fe3eb8d669e06b25d3 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Jun 2009 10:46:33 +0200
Subject: [PATCH] SBusch: strip i96 string par's
---
pub/src/file_io.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pub/src/file_io.cpp b/pub/src/file_io.cpp
index e5abc16e..c19b95d0 100644
--- a/pub/src/file_io.cpp
+++ b/pub/src/file_io.cpp
@@ -340,11 +340,11 @@ void NFileIO::Load_96( FILE *F_in, string flong )
if ( mystd::freadln(F_in, &lin)<=0 || lin.length()<24 ||
lin.substr(0,3)!=string("tit") )
throw string( "tag 'tit' not found in block 2" );
- old.lDoc.push_back( lin.substr(24) );
+ old.lDoc.push_back( mystd::strip(lin.substr(24)) );
while( mystd::freadln(F_in, &lin)>0 && lin.length()>=24 &&
lin.substr(0,3)==string("doc") )
- old.lDoc.push_back( lin.substr(24) );
+ old.lDoc.push_back( mystd::strip(lin.substr(24)) );
if( lin.substr(0,3)!=string("dir") )
throw string( "tag 'dir' not found in block 2" );
@@ -389,17 +389,17 @@ void NFileIO::Load_96( FILE *F_in, string flong )
if ( mystd::freadln(F_in, &lin)<=0 || lin.length()<28 ||
lin.substr(0,1)!=string("x") )
throw string( "no x coordinate" );
- old.xco = CCoord( lin.substr(4,24), lin.substr(28,24) );
+ old.xco = CCoord( mystd::strip(lin.substr(4,24)), mystd::strip(lin.substr(28,24)) );
if ( mystd::freadln(F_in, &lin)<=0 || lin.length()<28 ||
lin.substr(0,1)!=string("y") )
throw string( "no y coordinate" );
- old.yco = CCoord( lin.substr(4,24), lin.substr(28,24) );
+ old.yco = CCoord( mystd::strip(lin.substr(4,24)), mystd::strip(lin.substr(28,24)) );
if ( mystd::freadln(F_in, &lin)<=0 || lin.length()<28 ||
lin.substr(0,1)!=string("z") )
throw string( "no z coordinate" );
- old.ZCo.push_back( CCoord( lin.substr(4,24), lin.substr(28,24) ) );
+ old.ZCo.push_back( CCoord( mystd::strip(lin.substr(4,24)), mystd::strip(lin.substr(28,24)) ) );
if ( mystd::freadln(F_in, &lin)<=0 || lin.length()<6 ||
lin.substr(0,6)!=string("&eob 5") )
--
GitLab