max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed GetLastErrorString to GetErrorString

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4339 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-04 23:36:21 +00:00
parent 51ee087d84
commit 0fc11d724b
7 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
IPhreeqc.cpp
View File

@ -282,14 +282,14 @@ const std::string& IPhreeqc::GetAccumulatedLines(void)
return this->StringInput; return this->StringInput;
} }
void IPhreeqc::OutputLastError(void) void IPhreeqc::OutputError(void)
{ {
std::cout << this->GetLastErrorString() << std::endl; std::cout << this->GetErrorString() << std::endl;
} }
void IPhreeqc::OutputLastWarning(void) void IPhreeqc::OutputWarning(void)
{ {
std::cout << this->GetLastWarningString() << std::endl; std::cout << this->GetWarningString() << std::endl;
} }
void IPhreeqc::OutputLines(void) void IPhreeqc::OutputLines(void)
@ -392,13 +392,13 @@ void IPhreeqc::UnLoadDatabase(void)
// //
ASSERT(this->ErrorReporter); ASSERT(this->ErrorReporter);
this->ErrorReporter->Clear(); this->ErrorReporter->Clear();
this->LastErrorString.clear(); this->ErrorString.clear();
// clear warning state // clear warning state
// //
ASSERT(this->WarningReporter); ASSERT(this->WarningReporter);
this->WarningReporter->Clear(); this->WarningReporter->Clear();
this->LastWarningString.clear(); this->WarningString.clear();
// clear selectedoutput // clear selectedoutput
// //
@ -652,16 +652,16 @@ void IPhreeqc::AddSelectedOutput(const char* name, const char* format, va_list a
} }
} }
const char* IPhreeqc::GetLastErrorString(void) const char* IPhreeqc::GetErrorString(void)
{ {
this->LastErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str(); this->ErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str();
return this->LastErrorString.c_str(); return this->ErrorString.c_str();
} }
const char* IPhreeqc::GetLastWarningString(void) const char* IPhreeqc::GetWarningString(void)
{ {
this->LastWarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str(); this->WarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str();
return this->LastWarningString.c_str(); return this->WarningString.c_str();
} }
const char* IPhreeqc::GetDumpString(void) const char* IPhreeqc::GetDumpString(void)
@ -1253,10 +1253,10 @@ const char* IPhreeqc::GetWarningLine(int n)
void IPhreeqc::update_errors(void) void IPhreeqc::update_errors(void)
{ {
this->ErrorLines.clear(); this->ErrorLines.clear();
this->LastErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str(); this->ErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str();
if (this->LastErrorString.size()) if (this->ErrorString.size())
{ {
std::istringstream iss(this->LastErrorString); std::istringstream iss(this->ErrorString);
std::string line; std::string line;
while (std::getline(iss, line)) while (std::getline(iss, line))
{ {
@ -1265,10 +1265,10 @@ void IPhreeqc::update_errors(void)
} }
this->WarningLines.clear(); this->WarningLines.clear();
this->LastWarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str(); this->WarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str();
if (this->LastWarningString.size()) if (this->WarningString.size())
{ {
std::istringstream iss(this->LastWarningString); std::istringstream iss(this->WarningString);
std::string line; std::string line;
while (std::getline(iss, line)) while (std::getline(iss, line))
{ {

12
IPhreeqcF.f
View File

@ -40,17 +40,17 @@
UnLoadDatabase = UnLoadDatabaseF(ID) UnLoadDatabase = UnLoadDatabaseF(ID)
END FUNCTION UnLoadDatabase END FUNCTION UnLoadDatabase
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE OutputLastError(ID) SUBROUTINE OutputError(ID)
IMPLICIT NONE IMPLICIT NONE
INTEGER :: ID INTEGER :: ID
CALL OutputLastErrorF(ID) CALL OutputErrorF(ID)
END SUBROUTINE OutputLastError END SUBROUTINE OutputError
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE OutputLastWarning(ID) SUBROUTINE OutputWarning(ID)
IMPLICIT NONE IMPLICIT NONE
INTEGER :: ID INTEGER :: ID
CALL OutputLastWarningF(ID) CALL OutputWarningF(ID)
END SUBROUTINE OutputLastWarning END SUBROUTINE OutputWarning
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION AccumulateLine(ID,LINE) FUNCTION AccumulateLine(ID,LINE)
IMPLICIT NONE IMPLICIT NONE

24
IPhreeqcLib.cpp
View File

@ -64,51 +64,51 @@ UnLoadDatabase(int id)
} }
void void
OutputLastError(int id) OutputError(int id)
{ {
static const char err_msg[] = "OutputLastError: Bad instance.\n"; static const char err_msg[] = "OutputError: Bad instance.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
IPhreeqcPtr->OutputLastError(); IPhreeqcPtr->OutputError();
return; return;
} }
std::cout << err_msg << std::endl; std::cout << err_msg << std::endl;
} }
void void
OutputLastWarning(int id) OutputWarning(int id)
{ {
static const char err_msg[] = "OutputLastWarning: Bad instance.\n"; static const char err_msg[] = "OutputWarning: Bad instance.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
IPhreeqcPtr->OutputLastWarning(); IPhreeqcPtr->OutputWarning();
return; return;
} }
std::cout << err_msg << std::endl; std::cout << err_msg << std::endl;
} }
const char* const char*
GetLastErrorString(int id) GetErrorString(int id)
{ {
static const char err_msg[] = "GetLastErrorString: Bad instance.\n"; static const char err_msg[] = "GetErrorString: Bad instance.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
return IPhreeqcPtr->GetLastErrorString(); return IPhreeqcPtr->GetErrorString();
} }
return err_msg; return err_msg;
} }
const char* const char*
GetLastWarningString(int id) GetWarningString(int id)
{ {
static const char err_msg[] = "GetLastWarningString: Bad instance.\n"; static const char err_msg[] = "GetWarningString: Bad instance.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
return IPhreeqcPtr->GetLastWarningString(); return IPhreeqcPtr->GetWarningString();
} }
return err_msg; return err_msg;
} }

16
fwrap.cpp
View File

@ -290,15 +290,15 @@ GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue,
} }
void void
OutputLastErrorF(int *id) OutputErrorF(int *id)
{ {
::OutputLastError(*id); ::OutputError(*id);
} }
void void
OutputLastWarningF(int *id) OutputWarningF(int *id)
{ {
::OutputLastWarning(*id); ::OutputWarning(*id);
} }
void void
@ -363,13 +363,13 @@ DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
{ {
return UnLoadDatabaseF(id); return UnLoadDatabaseF(id);
} }
DLL_EXPORT void __stdcall OUTPUTLASTERROR(int *id) DLL_EXPORT void __stdcall OUTPUTERROR(int *id)
{ {
OutputLastErrorF(id); OutputErrorF(id);
} }
DLL_EXPORT void __stdcall OUTPUTLASTWARNING(int *id) DLL_EXPORT void __stdcall OUTPUTWARNING(int *id)
{ {
OutputLastWarningF(id); OutputWarningF(id);
} }
DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len) DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
{ {

8
fwrap.h
View File

@ -34,8 +34,8 @@
#define GetWarningLineF FC_FUNC (getwarninglinef, GETWARNINGLINEF) #define GetWarningLineF FC_FUNC (getwarninglinef, GETWARNINGLINEF)
#define GetComponentCountF FC_FUNC (getcomponentcountf, GETCOMPONENTCOUNTF) #define GetComponentCountF FC_FUNC (getcomponentcountf, GETCOMPONENTCOUNTF)
#define GetComponentF FC_FUNC (getcomponentf, GETCOMPONENTF) #define GetComponentF FC_FUNC (getcomponentf, GETCOMPONENTF)
#define OutputLastErrorF FC_FUNC (outputlasterrorf, OUTPUTLASTERRORF) #define OutputErrorF FC_FUNC (outputerrorf, OUTPUTERRORF)
#define OutputLastWarningF FC_FUNC (outputlastwarningf, OUTPUTLASTWARNINGF) #define OutputWarningF FC_FUNC (outputwarningf, OUTPUTWARNINGF)
#define OutputLinesF FC_FUNC (outputlinesf, OUTPUTLINESF) #define OutputLinesF FC_FUNC (outputlinesf, OUTPUTLINESF)
#endif /* FC_FUNC */ #endif /* FC_FUNC */
@ -95,9 +95,9 @@ extern "C" {
void GetComponentF(int *id, int* n, char* line, unsigned int line_length); void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
void OutputLastErrorF(int *id); void OutputErrorF(int *id);
void OutputLastWarningF(int *id); void OutputWarningF(int *id);
void OutputLinesF(int *id); void OutputLinesF(int *id);

8
fwrap2.cpp
View File

@ -30,13 +30,13 @@ DLL_EXPORT int UNLOADDATABASE(int *id)
{ {
return UnLoadDatabaseF(id); return UnLoadDatabaseF(id);
} }
DLL_EXPORT void OUTPUTLASTERROR(int *id) DLL_EXPORT void OUTPUTERROR(int *id)
{ {
OutputLastErrorF(id); OutputErrorF(id);
} }
DLL_EXPORT void OUTPUTLASTWARNING(int *id) DLL_EXPORT void OUTPUTWARNING(int *id)
{ {
OutputLastWarningF(id); OutputWarningF(id);
} }
DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len) DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
{ {

8
fwrap3.cpp
View File

@ -30,13 +30,13 @@ DLL_EXPORT int unloaddatabase_(int *id)
{ {
return UnLoadDatabaseF(id); return UnLoadDatabaseF(id);
} }
DLL_EXPORT void outputlasterror_(int *id) DLL_EXPORT void outputerror_(int *id)
{ {
OutputLastErrorF(id); OutputErrorF(id);
} }
DLL_EXPORT void outputlastwarning_(int *id) DLL_EXPORT void outputwarning_(int *id)
{ {
OutputLastWarningF(id); OutputWarningF(id);
} }
DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len) DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
{ {