mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
# IPQ_DLL_EXPORT int GetDumpOn(int id);
# IPQ_DLL_EXPORT int GetDumpFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetDumpOn(int id, int dump_on); # IPQ_DLL_EXPORT IPQ_RESULT SetDumpFileOn(int id, int dump_on); s/etDumpOn/etDumpFileOn/g s/etdumpon/etdumpfileon/g s/ETDUMPON/ETDUMPFILEON/g # IPQ_DLL_EXPORT int GetErrorOn(int id); # IPQ_DLL_EXPORT int GetErrorFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetErrorOn(int id, int error_on); # IPQ_DLL_EXPORT IPQ_RESULT SetErrorFileOn(int id, int error_on); s/etErrorOn/etErrorFileOn/g s/eterroron/eterrorfileon/g s/ETERRORON/ETERRORFILEON/g # IPQ_DLL_EXPORT int GetLogOn(int id); # IPQ_DLL_EXPORT int GetLogFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetLogOn(int id, int log_on); # IPQ_DLL_EXPORT IPQ_RESULT SetLogFileOn(int id, int log_on); s/etLogOn/etLogFileOn/g s/etlogon/etlogfileon/g s/ETLOGON/ETLOGFILEON/g # IPQ_DLL_EXPORT int GetOutputOn(int id); # IPQ_DLL_EXPORT int GetOutputFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetOutputOn(int id, int output_on); # IPQ_DLL_EXPORT IPQ_RESULT SetOutputFileOn(int id, int output_on); s/etOutputOn/etOutputFileOn/g s/etoutputon/etoutputfileon/g s/ETOUTPUTON/ETOUTPUTFILEON/g # IPQ_DLL_EXPORT int GetSelectedOutputOn(int id); # IPQ_DLL_EXPORT int GetSelectedOutputFileOn(int id); # IPQ_DLL_EXPORT IPQ_RESULT SetSelectedOutputOn(int id, int sel_on); # IPQ_DLL_EXPORT IPQ_RESULT SetSelectedOutputFileOn(int id, int sel_on); s/etSelectedOutputOn/etSelectedOutputFileOn/g s/etselectedoutputon/etselectedoutputfileon/g s/ETSELECTEDOUTPUTON/ETSELECTEDOUTPUTFILEON/g # IPQ_DLL_EXPORT const char* GetDumpLine(int id, int n); # IPQ_DLL_EXPORT const char* GetDumpStringLine(int id, int n); # IPQ_DLL_EXPORT int GetDumpLineCount(int id); # IPQ_DLL_EXPORT int GetDumpStringLineCount(int id); s/GetDumpLine/GetDumpStringLine/g s/getdumpline/getdumpstringline/g s/GETDUMPLINE/GETDUMPSTRINGLINE/g # IPQ_DLL_EXPORT const char* GetErrorLine(int id, int n); # IPQ_DLL_EXPORT const char* GetErrorStringLine(int id, int n); # IPQ_DLL_EXPORT int GetErrorLineCount(int id); # IPQ_DLL_EXPORT int GetErrorStringLineCount(int id); s/GetErrorLine/GetErrorStringLine/g s/geterrorline/geterrorstringline/g s/GETERRORLINE/GETERRORSTRINGLINE/g # IPQ_DLL_EXPORT const char* GetWarningLine(int id, int n); # IPQ_DLL_EXPORT const char* GetWarningStringLine(int id, int n); # IPQ_DLL_EXPORT int GetWarningLineCount(int id); # IPQ_DLL_EXPORT int GetWarningStringLineCount(int id); s/GetWarningLine/GetWarningStringLine/g s/getwarningline/getwarningstringline/g s/GETWARNINGLINE/GETWARNINGSTRINGLINE/g # IPQ_DLL_EXPORT void OutputError(int id); # IPQ_DLL_EXPORT void OutputErrorString(int id); s/OutputError/OutputErrorString/g s/outputerror/outputerrorstring/g s/OUTPUTERROR/OUTPUTERRORSTRING/g # IPQ_DLL_EXPORT void OutputLines(int id); # IPQ_DLL_EXPORT void OutputAccumulatedLines(int id); s/OutputLines/OutputAccumulatedLines/g s/outputlines/outputaccumulatedlines/g s/OUTPUTLINES/OUTPUTACCUMULATEDLINES/g # IPQ_DLL_EXPORT void OutputWarning(int id); # IPQ_DLL_EXPORT void OutputWarningString(int id); s/OutputWarning/OutputWarningString/g s/outputwarning/outputwarningstring/g s/OUTPUTWARNING/OUTPUTWARNINGSTRING/g git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4411 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
caa9bd83ca
commit
67f49a29c0
57
IPhreeqc.cpp
57
IPhreeqc.cpp
@ -37,6 +37,7 @@ int istream_getc(void *cookie)
|
||||
|
||||
IPhreeqc::IPhreeqc(void)
|
||||
: DatabaseLoaded(false)
|
||||
, ClearAccumulatedLinesOnNextAccumulate(false)
|
||||
, SelectedOutputOn(false)
|
||||
, OutputOn(false)
|
||||
, LogOn(false)
|
||||
@ -282,17 +283,17 @@ const std::string& IPhreeqc::GetAccumulatedLines(void)
|
||||
return this->StringInput;
|
||||
}
|
||||
|
||||
void IPhreeqc::OutputError(void)
|
||||
void IPhreeqc::OutputErrorString(void)
|
||||
{
|
||||
std::cout << this->GetErrorString() << std::endl;
|
||||
}
|
||||
|
||||
void IPhreeqc::OutputWarning(void)
|
||||
void IPhreeqc::OutputWarningString(void)
|
||||
{
|
||||
std::cout << this->GetWarningString() << std::endl;
|
||||
}
|
||||
|
||||
void IPhreeqc::OutputLines(void)
|
||||
void IPhreeqc::OutputAccumulatedLines(void)
|
||||
{
|
||||
std::cout << this->StringInput.c_str() << std::endl;
|
||||
}
|
||||
@ -418,42 +419,42 @@ void IPhreeqc::UnLoadDatabase(void)
|
||||
this->PhreeqcPtr->input_error = 0;
|
||||
}
|
||||
|
||||
bool IPhreeqc::GetOutputOn(void)const
|
||||
bool IPhreeqc::GetOutputFileOn(void)const
|
||||
{
|
||||
return this->OutputOn;
|
||||
}
|
||||
|
||||
void IPhreeqc::SetOutputOn(bool bValue)
|
||||
void IPhreeqc::SetOutputFileOn(bool bValue)
|
||||
{
|
||||
this->OutputOn = bValue;
|
||||
}
|
||||
|
||||
bool IPhreeqc::GetSelectedOutputOn(void)const
|
||||
bool IPhreeqc::GetSelectedOutputFileOn(void)const
|
||||
{
|
||||
return this->SelectedOutputOn;
|
||||
}
|
||||
|
||||
void IPhreeqc::SetSelectedOutputOn(bool bValue)
|
||||
void IPhreeqc::SetSelectedOutputFileOn(bool bValue)
|
||||
{
|
||||
this->SelectedOutputOn = bValue;
|
||||
}
|
||||
|
||||
bool IPhreeqc::GetLogOn(void)const
|
||||
bool IPhreeqc::GetLogFileOn(void)const
|
||||
{
|
||||
return this->LogOn;
|
||||
}
|
||||
|
||||
void IPhreeqc::SetLogOn(bool bValue)
|
||||
void IPhreeqc::SetLogFileOn(bool bValue)
|
||||
{
|
||||
this->LogOn = bValue;
|
||||
}
|
||||
|
||||
bool IPhreeqc::GetDumpOn(void)const
|
||||
bool IPhreeqc::GetDumpFileOn(void)const
|
||||
{
|
||||
return this->DumpOn;
|
||||
}
|
||||
|
||||
void IPhreeqc::SetDumpOn(bool bValue)
|
||||
void IPhreeqc::SetDumpFileOn(bool bValue)
|
||||
{
|
||||
this->DumpOn = bValue;
|
||||
}
|
||||
@ -468,12 +469,12 @@ void IPhreeqc::SetDumpStringOn(bool bValue)
|
||||
this->DumpStringOn = bValue;
|
||||
}
|
||||
|
||||
bool IPhreeqc::GetErrorOn(void)const
|
||||
bool IPhreeqc::GetErrorFileOn(void)const
|
||||
{
|
||||
return this->ErrorOn;
|
||||
}
|
||||
|
||||
void IPhreeqc::SetErrorOn(bool bValue)
|
||||
void IPhreeqc::SetErrorFileOn(bool bValue)
|
||||
{
|
||||
this->ErrorOn = bValue;
|
||||
}
|
||||
@ -1025,6 +1026,12 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (this->ClearAccumulatedLinesOnNextAccumulate)
|
||||
{
|
||||
this->ClearAccumulatedLines();
|
||||
this->ClearAccumulatedLinesOnNextAccumulate = false;
|
||||
}
|
||||
|
||||
this->ErrorReporter->Clear();
|
||||
this->WarningReporter->Clear();
|
||||
this->StringInput.append(line);
|
||||
@ -1071,11 +1078,7 @@ int IPhreeqc::RunAccumulated(void)
|
||||
}
|
||||
}
|
||||
|
||||
if (this->PhreeqcPtr->input_error == 0)
|
||||
{
|
||||
this->ClearAccumulatedLines();
|
||||
}
|
||||
|
||||
this->ClearAccumulatedLinesOnNextAccumulate = true;
|
||||
this->PhreeqcPtr->close_output_files();
|
||||
this->update_errors();
|
||||
|
||||
@ -1214,45 +1217,45 @@ VRESULT IPhreeqc::GetSelectedOutputValue(int row, int col, VAR* pVAR)
|
||||
return v;
|
||||
}
|
||||
|
||||
int IPhreeqc::GetDumpLineCount(void)const
|
||||
int IPhreeqc::GetDumpStringLineCount(void)const
|
||||
{
|
||||
return (int)this->DumpLines.size();
|
||||
}
|
||||
|
||||
const char* IPhreeqc::GetDumpLine(int n)
|
||||
const char* IPhreeqc::GetDumpStringLine(int n)
|
||||
{
|
||||
static const char empty[] = "";
|
||||
if (n < 0 || n >= this->GetDumpLineCount())
|
||||
if (n < 0 || n >= this->GetDumpStringLineCount())
|
||||
{
|
||||
return empty;
|
||||
}
|
||||
return this->DumpLines[n].c_str();
|
||||
}
|
||||
|
||||
int IPhreeqc::GetErrorLineCount(void)const
|
||||
int IPhreeqc::GetErrorStringLineCount(void)const
|
||||
{
|
||||
return (int)this->ErrorLines.size();
|
||||
}
|
||||
|
||||
const char* IPhreeqc::GetErrorLine(int n)
|
||||
const char* IPhreeqc::GetErrorStringLine(int n)
|
||||
{
|
||||
static const char empty[] = "";
|
||||
if (n < 0 || n >= this->GetErrorLineCount())
|
||||
if (n < 0 || n >= this->GetErrorStringLineCount())
|
||||
{
|
||||
return empty;
|
||||
}
|
||||
return this->ErrorLines[n].c_str();
|
||||
}
|
||||
|
||||
int IPhreeqc::GetWarningLineCount(void)const
|
||||
int IPhreeqc::GetWarningStringLineCount(void)const
|
||||
{
|
||||
return (int)this->WarningLines.size();
|
||||
}
|
||||
|
||||
const char* IPhreeqc::GetWarningLine(int n)
|
||||
const char* IPhreeqc::GetWarningStringLine(int n)
|
||||
{
|
||||
static const char empty[] = "";
|
||||
if (n < 0 || n >= this->GetWarningLineCount())
|
||||
if (n < 0 || n >= this->GetWarningStringLineCount())
|
||||
{
|
||||
return empty;
|
||||
}
|
||||
|
||||
198
IPhreeqcF.f
198
IPhreeqcF.f
@ -49,35 +49,35 @@
|
||||
GetComponentCount = GetComponentCountF(ID)
|
||||
END FUNCTION GetComponentCount
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetDumpLine(ID,N,LINE)
|
||||
FUNCTION GetDumpStringLine(ID,N,LINE)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
INTEGER(KIND=4) :: N
|
||||
CHARACTER(LEN=*) :: LINE
|
||||
INTEGER(KIND=4) :: GetDumpLine
|
||||
INTEGER(KIND=4) :: GetDumpLineF
|
||||
GetDumpLine = GetDumpLineF(ID,N,LINE)
|
||||
END FUNCTION GetDumpLine
|
||||
INTEGER(KIND=4) :: GetDumpStringLine
|
||||
INTEGER(KIND=4) :: GetDumpStringLineF
|
||||
GetDumpStringLine = GetDumpStringLineF(ID,N,LINE)
|
||||
END FUNCTION GetDumpStringLine
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetDumpLineCount(ID)
|
||||
FUNCTION GetDumpStringLineCount(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
INTEGER(KIND=4) :: GetDumpLineCount
|
||||
INTEGER(KIND=4) :: GetDumpLineCountF
|
||||
GetDumpLineCount = GetDumpLineCountF(ID)
|
||||
END FUNCTION GetDumpLineCount
|
||||
INTEGER(KIND=4) :: GetDumpStringLineCount
|
||||
INTEGER(KIND=4) :: GetDumpStringLineCountF
|
||||
GetDumpStringLineCount = GetDumpStringLineCountF(ID)
|
||||
END FUNCTION GetDumpStringLineCount
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetDumpOn(ID)
|
||||
FUNCTION GetDumpFileOn(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: GetDumpOn
|
||||
INTEGER(KIND=4) :: GetDumpOnF
|
||||
IF (GetDumpOnF(ID).EQ.0) THEN
|
||||
GetDumpOn = .FALSE.
|
||||
LOGICAL(KIND=4) :: GetDumpFileOn
|
||||
INTEGER(KIND=4) :: GetDumpFileOnF
|
||||
IF (GetDumpFileOnF(ID).EQ.0) THEN
|
||||
GetDumpFileOn = .FALSE.
|
||||
ELSE
|
||||
GetDumpOn = .TRUE.
|
||||
GetDumpFileOn = .TRUE.
|
||||
ENDIF
|
||||
END FUNCTION GetDumpOn
|
||||
END FUNCTION GetDumpFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetDumpStringOn(ID)
|
||||
IMPLICIT NONE
|
||||
@ -91,59 +91,59 @@
|
||||
ENDIF
|
||||
END FUNCTION GetDumpStringOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetErrorLine(ID,N,LINE)
|
||||
FUNCTION GetErrorStringLine(ID,N,LINE)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
INTEGER(KIND=4) :: N
|
||||
CHARACTER(LEN=*) :: LINE
|
||||
INTEGER(KIND=4) :: GetErrorLine
|
||||
INTEGER(KIND=4) :: GetErrorLineF
|
||||
GetErrorLine = GetErrorLineF(ID,N,LINE)
|
||||
END FUNCTION GetErrorLine
|
||||
INTEGER(KIND=4) :: GetErrorStringLine
|
||||
INTEGER(KIND=4) :: GetErrorStringLineF
|
||||
GetErrorStringLine = GetErrorStringLineF(ID,N,LINE)
|
||||
END FUNCTION GetErrorStringLine
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetErrorLineCount(ID)
|
||||
FUNCTION GetErrorStringLineCount(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
INTEGER(KIND=4) :: GetErrorLineCount
|
||||
INTEGER(KIND=4) :: GetErrorLineCountF
|
||||
GetErrorLineCount = GetErrorLineCountF(ID)
|
||||
END FUNCTION GetErrorLineCount
|
||||
INTEGER(KIND=4) :: GetErrorStringLineCount
|
||||
INTEGER(KIND=4) :: GetErrorStringLineCountF
|
||||
GetErrorStringLineCount = GetErrorStringLineCountF(ID)
|
||||
END FUNCTION GetErrorStringLineCount
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetErrorOn(ID)
|
||||
FUNCTION GetErrorFileOn(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: GetErrorOn
|
||||
INTEGER(KIND=4) :: GetErrorOnF
|
||||
IF (GetErrorOnF(ID).EQ.0) THEN
|
||||
GetErrorOn = .FALSE.
|
||||
LOGICAL(KIND=4) :: GetErrorFileOn
|
||||
INTEGER(KIND=4) :: GetErrorFileOnF
|
||||
IF (GetErrorFileOnF(ID).EQ.0) THEN
|
||||
GetErrorFileOn = .FALSE.
|
||||
ELSE
|
||||
GetErrorOn = .TRUE.
|
||||
GetErrorFileOn = .TRUE.
|
||||
ENDIF
|
||||
END FUNCTION GetErrorOn
|
||||
END FUNCTION GetErrorFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetLogOn(ID)
|
||||
FUNCTION GetLogFileOn(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: GetLogOn
|
||||
INTEGER(KIND=4) :: GetLogOnF
|
||||
IF (GetLogOnF(ID).EQ.0) THEN
|
||||
GetLogOn = .FALSE.
|
||||
LOGICAL(KIND=4) :: GetLogFileOn
|
||||
INTEGER(KIND=4) :: GetLogFileOnF
|
||||
IF (GetLogFileOnF(ID).EQ.0) THEN
|
||||
GetLogFileOn = .FALSE.
|
||||
ELSE
|
||||
GetLogOn = .TRUE.
|
||||
GetLogFileOn = .TRUE.
|
||||
ENDIF
|
||||
END FUNCTION GetLogOn
|
||||
END FUNCTION GetLogFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetOutputOn(ID)
|
||||
FUNCTION GetOutputFileOn(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: GetOutputOn
|
||||
INTEGER(KIND=4) :: GetOutputOnF
|
||||
IF (GetOutputOnF(ID).EQ.0) THEN
|
||||
GetOutputOn = .FALSE.
|
||||
LOGICAL(KIND=4) :: GetOutputFileOn
|
||||
INTEGER(KIND=4) :: GetOutputFileOnF
|
||||
IF (GetOutputFileOnF(ID).EQ.0) THEN
|
||||
GetOutputFileOn = .FALSE.
|
||||
ELSE
|
||||
GetOutputOn = .TRUE.
|
||||
GetOutputFileOn = .TRUE.
|
||||
ENDIF
|
||||
END FUNCTION GetOutputOn
|
||||
END FUNCTION GetOutputFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetSelectedOutputColumnCount(ID)
|
||||
IMPLICIT NONE
|
||||
@ -153,17 +153,17 @@
|
||||
GetSelectedOutputColumnCount = GetSelectedOutputColumnCountF(ID)
|
||||
END FUNCTION GetSelectedOutputColumnCount
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetSelectedOutputOn(ID)
|
||||
FUNCTION GetSelectedOutputFileOn(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: GetSelectedOutputOn
|
||||
INTEGER(KIND=4) :: GetSelectedOutputOnF
|
||||
IF (GetSelectedOutputOnF(ID).EQ.0) THEN
|
||||
GetSelectedOutputOn = .FALSE.
|
||||
LOGICAL(KIND=4) :: GetSelectedOutputFileOn
|
||||
INTEGER(KIND=4) :: GetSelectedOutputFileOnF
|
||||
IF (GetSelectedOutputFileOnF(ID).EQ.0) THEN
|
||||
GetSelectedOutputFileOn = .FALSE.
|
||||
ELSE
|
||||
GetSelectedOutputOn = .TRUE.
|
||||
GetSelectedOutputFileOn = .TRUE.
|
||||
ENDIF
|
||||
END FUNCTION GetSelectedOutputOn
|
||||
END FUNCTION GetSelectedOutputFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetSelectedOutputRowCount(ID)
|
||||
IMPLICIT NONE
|
||||
@ -187,23 +187,23 @@
|
||||
& COL,VTYPE,DVALUE,SVALUE)
|
||||
END FUNCTION GetSelectedOutputValue
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetWarningLine(ID,N,LINE)
|
||||
FUNCTION GetWarningStringLine(ID,N,LINE)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
INTEGER(KIND=4) :: N
|
||||
CHARACTER(LEN=*) :: LINE
|
||||
INTEGER(KIND=4) :: GetWarningLine
|
||||
INTEGER(KIND=4) :: GetWarningLineF
|
||||
GetWarningLine = GetWarningLineF(ID,N,LINE)
|
||||
END FUNCTION GetWarningLine
|
||||
INTEGER(KIND=4) :: GetWarningStringLine
|
||||
INTEGER(KIND=4) :: GetWarningStringLineF
|
||||
GetWarningStringLine = GetWarningStringLineF(ID,N,LINE)
|
||||
END FUNCTION GetWarningStringLine
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION GetWarningLineCount(ID)
|
||||
FUNCTION GetWarningStringLineCount(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
INTEGER(KIND=4) :: GetWarningLineCount
|
||||
INTEGER(KIND=4) :: GetWarningLineCountF
|
||||
GetWarningLineCount = GetWarningLineCountF(ID)
|
||||
END FUNCTION GetWarningLineCount
|
||||
INTEGER(KIND=4) :: GetWarningStringLineCount
|
||||
INTEGER(KIND=4) :: GetWarningStringLineCountF
|
||||
GetWarningStringLineCount = GetWarningStringLineCountF(ID)
|
||||
END FUNCTION GetWarningStringLineCount
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION LoadDatabase(ID,FILENAME)
|
||||
IMPLICIT NONE
|
||||
@ -223,68 +223,68 @@
|
||||
LoadDatabaseString = LoadDatabaseStringF(ID,INPUT)
|
||||
END FUNCTION LoadDatabaseString
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE OutputError(ID)
|
||||
SUBROUTINE OutputErrorString(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
CALL OutputErrorF(ID)
|
||||
END SUBROUTINE OutputError
|
||||
CALL OutputErrorStringF(ID)
|
||||
END SUBROUTINE OutputErrorString
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE OutputLines(ID)
|
||||
SUBROUTINE OutputAccumulatedLines(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
CALL OutputLinesF(ID)
|
||||
END SUBROUTINE OutputLines
|
||||
CALL OutputAccumulatedLinesF(ID)
|
||||
END SUBROUTINE OutputAccumulatedLines
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE OutputWarning(ID)
|
||||
SUBROUTINE OutputWarningString(ID)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
CALL OutputWarningF(ID)
|
||||
END SUBROUTINE OutputWarning
|
||||
CALL OutputWarningStringF(ID)
|
||||
END SUBROUTINE OutputWarningString
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION SetSelectedOutputOn(ID,SELECTED_ON)
|
||||
FUNCTION SetSelectedOutputFileOn(ID,SELECTED_ON)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: SELECTED_ON
|
||||
INTEGER(KIND=4) :: SetSelectedOutputOn
|
||||
INTEGER(KIND=4) :: SetSelectedOutputOnF
|
||||
SetSelectedOutputOn = SetSelectedOutputOnF(ID,SELECTED_ON)
|
||||
END FUNCTION SetSelectedOutputOn
|
||||
INTEGER(KIND=4) :: SetSelectedOutputFileOn
|
||||
INTEGER(KIND=4) :: SetSelOutFileOnF
|
||||
SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON)
|
||||
END FUNCTION SetSelectedOutputFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION SetOutputOn(ID,OUTPUT_ON)
|
||||
FUNCTION SetOutputFileOn(ID,OUTPUT_ON)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: OUTPUT_ON
|
||||
INTEGER(KIND=4) :: SetOutputOn
|
||||
INTEGER(KIND=4) :: SetOutputOnF
|
||||
SetOutputOn = SetOutputOnF(ID,OUTPUT_ON)
|
||||
END FUNCTION SetOutputOn
|
||||
INTEGER(KIND=4) :: SetOutputFileOn
|
||||
INTEGER(KIND=4) :: SetOutputFileOnF
|
||||
SetOutputFileOn = SetOutputFileOnF(ID,OUTPUT_ON)
|
||||
END FUNCTION SetOutputFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION SetErrorOn(ID,ERROR_ON)
|
||||
FUNCTION SetErrorFileOn(ID,ERROR_ON)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: ERROR_ON
|
||||
INTEGER(KIND=4) :: SetErrorOn
|
||||
INTEGER(KIND=4) :: SetErrorOnF
|
||||
SetErrorOn = SetErrorOnF(ID,ERROR_ON)
|
||||
END FUNCTION SetErrorOn
|
||||
INTEGER(KIND=4) :: SetErrorFileOn
|
||||
INTEGER(KIND=4) :: SetErrorFileOnF
|
||||
SetErrorFileOn = SetErrorFileOnF(ID,ERROR_ON)
|
||||
END FUNCTION SetErrorFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION SetLogOn(ID,LOG_ON)
|
||||
FUNCTION SetLogFileOn(ID,LOG_ON)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: LOG_ON
|
||||
INTEGER(KIND=4) :: SetLogOn
|
||||
INTEGER(KIND=4) :: SetLogOnF
|
||||
SetLogOn = SetLogOnF(ID,LOG_ON)
|
||||
END FUNCTION SetLogOn
|
||||
INTEGER(KIND=4) :: SetLogFileOn
|
||||
INTEGER(KIND=4) :: SetLogFileOnF
|
||||
SetLogFileOn = SetLogFileOnF(ID,LOG_ON)
|
||||
END FUNCTION SetLogFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION SetDumpOn(ID,DUMP_ON)
|
||||
FUNCTION SetDumpFileOn(ID,DUMP_ON)
|
||||
IMPLICIT NONE
|
||||
INTEGER(KIND=4) :: ID
|
||||
LOGICAL(KIND=4) :: DUMP_ON
|
||||
INTEGER(KIND=4) :: SetDumpOn
|
||||
INTEGER(KIND=4) :: SetDumpOnF
|
||||
SetDumpOn = SetDumpOnF(ID,DUMP_ON)
|
||||
END FUNCTION SetDumpOn
|
||||
INTEGER(KIND=4) :: SetDumpFileOn
|
||||
INTEGER(KIND=4) :: SetDumpFileOnF
|
||||
SetDumpFileOn = SetDumpFileOnF(ID,DUMP_ON)
|
||||
END FUNCTION SetDumpFileOn
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
FUNCTION SetDumpStringOn(ID,DUMP_STRING_ON)
|
||||
IMPLICIT NONE
|
||||
|
||||
@ -113,35 +113,35 @@ GetComponentCount(int id)
|
||||
}
|
||||
|
||||
const char*
|
||||
GetDumpLine(int id, int n)
|
||||
GetDumpStringLine(int id, int n)
|
||||
{
|
||||
static const char err_msg[] = "GetDumpLine: Invalid instance id.\n";
|
||||
static const char err_msg[] = "GetDumpStringLine: Invalid instance id.\n";
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return IPhreeqcPtr->GetDumpLine(n);
|
||||
return IPhreeqcPtr->GetDumpStringLine(n);
|
||||
}
|
||||
return err_msg;
|
||||
}
|
||||
|
||||
int
|
||||
GetDumpLineCount(int id)
|
||||
GetDumpStringLineCount(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return IPhreeqcPtr->GetDumpLineCount();
|
||||
return IPhreeqcPtr->GetDumpStringLineCount();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
GetDumpOn(int id)
|
||||
GetDumpFileOn(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
if (IPhreeqcPtr->GetDumpOn())
|
||||
if (IPhreeqcPtr->GetDumpFileOn())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@ -184,35 +184,35 @@ GetDumpStringOn(int id)
|
||||
}
|
||||
|
||||
const char*
|
||||
GetErrorLine(int id, int n)
|
||||
GetErrorStringLine(int id, int n)
|
||||
{
|
||||
static const char err_msg[] = "GetErrorLine: Invalid instance id.\n";
|
||||
static const char err_msg[] = "GetErrorStringLine: Invalid instance id.\n";
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return IPhreeqcPtr->GetErrorLine(n);
|
||||
return IPhreeqcPtr->GetErrorStringLine(n);
|
||||
}
|
||||
return err_msg;
|
||||
}
|
||||
|
||||
int
|
||||
GetErrorLineCount(int id)
|
||||
GetErrorStringLineCount(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return (int)IPhreeqcPtr->GetErrorLineCount();
|
||||
return (int)IPhreeqcPtr->GetErrorStringLineCount();
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
}
|
||||
|
||||
int
|
||||
GetErrorOn(int id)
|
||||
GetErrorFileOn(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
if (IPhreeqcPtr->GetErrorOn())
|
||||
if (IPhreeqcPtr->GetErrorFileOn())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@ -237,12 +237,12 @@ GetErrorString(int id)
|
||||
}
|
||||
|
||||
int
|
||||
GetLogOn(int id)
|
||||
GetLogFileOn(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
if (IPhreeqcPtr->GetLogOn())
|
||||
if (IPhreeqcPtr->GetLogFileOn())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@ -255,12 +255,12 @@ GetLogOn(int id)
|
||||
}
|
||||
|
||||
int
|
||||
GetOutputOn(int id)
|
||||
GetOutputFileOn(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
if (IPhreeqcPtr->GetOutputOn())
|
||||
if (IPhreeqcPtr->GetOutputFileOn())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@ -284,12 +284,12 @@ GetSelectedOutputColumnCount(int id)
|
||||
}
|
||||
|
||||
int
|
||||
GetSelectedOutputOn(int id)
|
||||
GetSelectedOutputFileOn(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
if (IPhreeqcPtr->GetSelectedOutputOn())
|
||||
if (IPhreeqcPtr->GetSelectedOutputFileOn())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@ -334,24 +334,24 @@ GetSelectedOutputValue(int id, int row, int col, VAR* pVAR)
|
||||
}
|
||||
|
||||
const char*
|
||||
GetWarningLine(int id, int n)
|
||||
GetWarningStringLine(int id, int n)
|
||||
{
|
||||
static const char err_msg[] = "GetWarningLine: Invalid instance id.\n";
|
||||
static const char err_msg[] = "GetWarningStringLine: Invalid instance id.\n";
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return IPhreeqcPtr->GetWarningLine(n);
|
||||
return IPhreeqcPtr->GetWarningStringLine(n);
|
||||
}
|
||||
return err_msg;
|
||||
}
|
||||
|
||||
int
|
||||
GetWarningLineCount(int id)
|
||||
GetWarningStringLineCount(int id)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return (int)IPhreeqcPtr->GetWarningLineCount();
|
||||
return (int)IPhreeqcPtr->GetWarningStringLineCount();
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
}
|
||||
@ -391,39 +391,39 @@ LoadDatabaseString(int id, const char* input)
|
||||
}
|
||||
|
||||
void
|
||||
OutputError(int id)
|
||||
OutputErrorString(int id)
|
||||
{
|
||||
static const char err_msg[] = "OutputError: Invalid instance id.\n";
|
||||
static const char err_msg[] = "OutputErrorString: Invalid instance id.\n";
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->OutputError();
|
||||
IPhreeqcPtr->OutputErrorString();
|
||||
return;
|
||||
}
|
||||
std::cout << err_msg << std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
OutputLines(int id)
|
||||
OutputAccumulatedLines(int id)
|
||||
{
|
||||
static const char err_msg[] = "OutputLines: Invalid instance id.\n";
|
||||
static const char err_msg[] = "OutputAccumulatedLines: Invalid instance id.\n";
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->OutputLines();
|
||||
IPhreeqcPtr->OutputAccumulatedLines();
|
||||
return;
|
||||
}
|
||||
std::cout << err_msg << std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
OutputWarning(int id)
|
||||
OutputWarningString(int id)
|
||||
{
|
||||
static const char err_msg[] = "OutputWarning: Invalid instance id.\n";
|
||||
static const char err_msg[] = "OutputWarningString: Invalid instance id.\n";
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->OutputWarning();
|
||||
IPhreeqcPtr->OutputWarningString();
|
||||
return;
|
||||
}
|
||||
std::cout << err_msg << std::endl;
|
||||
@ -463,12 +463,12 @@ RunString(int id, const char* input)
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetDumpOn(int id, int value)
|
||||
SetDumpFileOn(int id, int value)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->SetDumpOn(value != 0);
|
||||
IPhreeqcPtr->SetDumpFileOn(value != 0);
|
||||
return IPQ_OK;
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
@ -487,48 +487,48 @@ SetDumpStringOn(int id, int value)
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetErrorOn(int id, int value)
|
||||
SetErrorFileOn(int id, int value)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->SetErrorOn(value != 0);
|
||||
IPhreeqcPtr->SetErrorFileOn(value != 0);
|
||||
return IPQ_OK;
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetLogOn(int id, int value)
|
||||
SetLogFileOn(int id, int value)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->SetLogOn(value != 0);
|
||||
IPhreeqcPtr->SetLogFileOn(value != 0);
|
||||
return IPQ_OK;
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetOutputOn(int id, int value)
|
||||
SetOutputFileOn(int id, int value)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->SetOutputOn(value != 0);
|
||||
IPhreeqcPtr->SetOutputFileOn(value != 0);
|
||||
return IPQ_OK;
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetSelectedOutputOn(int id, int value)
|
||||
SetSelectedOutputFileOn(int id, int value)
|
||||
{
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
IPhreeqcPtr->SetSelectedOutputOn(value != 0);
|
||||
IPhreeqcPtr->SetSelectedOutputFileOn(value != 0);
|
||||
return IPQ_OK;
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
|
||||
152
fwrap.cpp
152
fwrap.cpp
@ -85,21 +85,21 @@ GetComponentF(int *id, int *n, char* comp, unsigned int line_length)
|
||||
}
|
||||
|
||||
int
|
||||
GetDumpLineCountF(int *id)
|
||||
GetDumpStringLineCountF(int *id)
|
||||
{
|
||||
return ::GetDumpLineCount(*id);
|
||||
return ::GetDumpStringLineCount(*id);
|
||||
}
|
||||
|
||||
void
|
||||
GetDumpLineF(int *id, int* n, char* line, unsigned int line_length)
|
||||
GetDumpStringLineF(int *id, int* n, char* line, unsigned int line_length)
|
||||
{
|
||||
padfstring(line, ::GetDumpLine(*id, (*n) - 1), line_length);
|
||||
padfstring(line, ::GetDumpStringLine(*id, (*n) - 1), line_length);
|
||||
}
|
||||
|
||||
int
|
||||
GetDumpOnF(int *id)
|
||||
GetDumpFileOnF(int *id)
|
||||
{
|
||||
return ::GetDumpOn(*id);
|
||||
return ::GetDumpFileOn(*id);
|
||||
}
|
||||
|
||||
int
|
||||
@ -109,33 +109,33 @@ GetDumpStringOnF(int *id)
|
||||
}
|
||||
|
||||
int
|
||||
GetErrorLineCountF(int *id)
|
||||
GetErrorStringLineCountF(int *id)
|
||||
{
|
||||
return ::GetErrorLineCount(*id);
|
||||
return ::GetErrorStringLineCount(*id);
|
||||
}
|
||||
|
||||
void
|
||||
GetErrorLineF(int *id, int* n, char* line, unsigned int line_length)
|
||||
GetErrorStringLineF(int *id, int* n, char* line, unsigned int line_length)
|
||||
{
|
||||
padfstring(line, ::GetErrorLine(*id, (*n) - 1), line_length);
|
||||
padfstring(line, ::GetErrorStringLine(*id, (*n) - 1), line_length);
|
||||
}
|
||||
|
||||
int
|
||||
GetErrorOnF(int *id)
|
||||
GetErrorFileOnF(int *id)
|
||||
{
|
||||
return ::GetErrorOn(*id);
|
||||
return ::GetErrorFileOn(*id);
|
||||
}
|
||||
|
||||
int
|
||||
GetLogOnF(int *id)
|
||||
GetLogFileOnF(int *id)
|
||||
{
|
||||
return ::GetLogOn(*id);
|
||||
return ::GetLogFileOn(*id);
|
||||
}
|
||||
|
||||
int
|
||||
GetOutputOnF(int *id)
|
||||
GetOutputFileOnF(int *id)
|
||||
{
|
||||
return ::GetOutputOn(*id);
|
||||
return ::GetOutputFileOn(*id);
|
||||
}
|
||||
|
||||
int
|
||||
@ -145,9 +145,9 @@ GetSelectedOutputColumnCountF(int *id)
|
||||
}
|
||||
|
||||
int
|
||||
GetSelectedOutputOnF(int *id)
|
||||
GetSelectedOutputFileOnF(int *id)
|
||||
{
|
||||
return ::GetSelectedOutputOn(*id);
|
||||
return ::GetSelectedOutputFileOn(*id);
|
||||
}
|
||||
|
||||
int
|
||||
@ -204,15 +204,15 @@ GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue,
|
||||
}
|
||||
|
||||
int
|
||||
GetWarningLineCountF(int *id)
|
||||
GetWarningStringLineCountF(int *id)
|
||||
{
|
||||
return ::GetWarningLineCount(*id);
|
||||
return ::GetWarningStringLineCount(*id);
|
||||
}
|
||||
|
||||
void
|
||||
GetWarningLineF(int *id, int* n, char* line, unsigned int line_length)
|
||||
GetWarningStringLineF(int *id, int* n, char* line, unsigned int line_length)
|
||||
{
|
||||
padfstring(line, ::GetWarningLine(*id, (*n) - 1), line_length);
|
||||
padfstring(line, ::GetWarningStringLine(*id, (*n) - 1), line_length);
|
||||
}
|
||||
|
||||
int
|
||||
@ -250,21 +250,21 @@ LoadDatabaseStringF(int *id, char* input, unsigned int input_length)
|
||||
}
|
||||
|
||||
void
|
||||
OutputErrorF(int *id)
|
||||
OutputErrorStringF(int *id)
|
||||
{
|
||||
::OutputError(*id);
|
||||
::OutputErrorString(*id);
|
||||
}
|
||||
|
||||
void
|
||||
OutputLinesF(int *id)
|
||||
OutputAccumulatedLinesF(int *id)
|
||||
{
|
||||
::OutputLines(*id);
|
||||
::OutputAccumulatedLines(*id);
|
||||
}
|
||||
|
||||
void
|
||||
OutputWarningF(int *id)
|
||||
OutputWarningStringF(int *id)
|
||||
{
|
||||
::OutputWarning(*id);
|
||||
::OutputWarningString(*id);
|
||||
}
|
||||
|
||||
int
|
||||
@ -308,9 +308,9 @@ RunStringF(int *id, char* input, unsigned int input_length)
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetDumpOnF(int *id, int* dump_on)
|
||||
SetDumpFileOnF(int *id, int* dump_on)
|
||||
{
|
||||
return ::SetDumpOn(*id, *dump_on);
|
||||
return ::SetDumpFileOn(*id, *dump_on);
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
@ -320,27 +320,27 @@ SetDumpStringOnF(int *id, int* dump_string_on)
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetErrorOnF(int *id, int* error_on)
|
||||
SetErrorFileOnF(int *id, int* error_on)
|
||||
{
|
||||
return ::SetErrorOn(*id, *error_on);
|
||||
return ::SetErrorFileOn(*id, *error_on);
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetLogOnF(int *id, int* log_on)
|
||||
SetLogFileOnF(int *id, int* log_on)
|
||||
{
|
||||
return ::SetLogOn(*id, *log_on);
|
||||
return ::SetLogFileOn(*id, *log_on);
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetOutputOnF(int *id, int* output_on)
|
||||
SetOutputFileOnF(int *id, int* output_on)
|
||||
{
|
||||
return ::SetOutputOn(*id, *output_on);
|
||||
return ::SetOutputFileOn(*id, *output_on);
|
||||
}
|
||||
|
||||
IPQ_RESULT
|
||||
SetSelectedOutputOnF(int *id, int* sel_on)
|
||||
SetSelOutFileOnF(int *id, int* sel_on)
|
||||
{
|
||||
return ::SetSelectedOutputOn(*id, *sel_on);
|
||||
return ::SetSelectedOutputFileOn(*id, *sel_on);
|
||||
}
|
||||
|
||||
int
|
||||
@ -383,49 +383,49 @@ DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void __stdcall GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void __stdcall GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
GetDumpStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETDUMPSTRINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
return GetDumpStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETDUMPON(int *id)
|
||||
DLL_EXPORT int __stdcall GETDUMPFILEON(int *id)
|
||||
{
|
||||
return GetDumpOnF(id);
|
||||
return GetDumpFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETDUMPSTRINGON(int *id)
|
||||
{
|
||||
return GetDumpStringOnF(id);
|
||||
}
|
||||
DLL_EXPORT void __stdcall GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void __stdcall GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
GetErrorStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETERRORSTRINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
return GetErrorStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETERRORON(int *id)
|
||||
DLL_EXPORT int __stdcall GETERRORFILEON(int *id)
|
||||
{
|
||||
return GetErrorOnF(id);
|
||||
return GetErrorFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETLOGON(int *id)
|
||||
DLL_EXPORT int __stdcall GETLOGFILEON(int *id)
|
||||
{
|
||||
return GetLogOnF(id);
|
||||
return GetLogFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETOUTPUTON(int *id)
|
||||
DLL_EXPORT int __stdcall GETOUTPUTFILEON(int *id)
|
||||
{
|
||||
return GetOutputOnF(id);
|
||||
return GetOutputFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTON(int *id)
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTFILEON(int *id)
|
||||
{
|
||||
return GetSelectedOutputOnF(id);
|
||||
return GetSelectedOutputFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
|
||||
{
|
||||
@ -435,13 +435,13 @@ DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, in
|
||||
{
|
||||
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
|
||||
}
|
||||
DLL_EXPORT void __stdcall GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
GetWarningStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETWARNINGSTRINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
return GetWarningStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
@ -451,17 +451,17 @@ DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int
|
||||
{
|
||||
return LoadDatabaseStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void __stdcall OUTPUTERROR(int *id)
|
||||
DLL_EXPORT void __stdcall OUTPUTERRORSTRING(int *id)
|
||||
{
|
||||
OutputErrorF(id);
|
||||
OutputErrorStringF(id);
|
||||
}
|
||||
DLL_EXPORT void __stdcall OUTPUTLINES(int *id)
|
||||
DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
OutputAccumulatedLinesF(id);
|
||||
}
|
||||
DLL_EXPORT void __stdcall OUTPUTWARNING(int *id)
|
||||
DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING(int *id)
|
||||
{
|
||||
OutputWarningF(id);
|
||||
OutputWarningStringF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
|
||||
{
|
||||
@ -475,29 +475,29 @@ DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void __stdcall SETDUMPON(int *id, int *dump_on)
|
||||
DLL_EXPORT void __stdcall SETDUMPFILEON(int *id, int *dump_on)
|
||||
{
|
||||
SetDumpOnF(id, dump_on);
|
||||
SetDumpFileOnF(id, dump_on);
|
||||
}
|
||||
DLL_EXPORT void __stdcall SETDUMPSTRINGON(int *id, int *dump_string_on)
|
||||
{
|
||||
SetDumpStringOnF(id, dump_string_on);
|
||||
}
|
||||
DLL_EXPORT void __stdcall SETERRORON(int *id, int *error_on)
|
||||
DLL_EXPORT void __stdcall SETERRORFILEON(int *id, int *error_on)
|
||||
{
|
||||
SetErrorOnF(id, error_on);
|
||||
SetErrorFileOnF(id, error_on);
|
||||
}
|
||||
DLL_EXPORT void __stdcall SETLOGON(int *id, int *log_on)
|
||||
DLL_EXPORT void __stdcall SETLOGFILEON(int *id, int *log_on)
|
||||
{
|
||||
SetLogOnF(id, log_on);
|
||||
SetLogFileOnF(id, log_on);
|
||||
}
|
||||
DLL_EXPORT void __stdcall SETOUTPUTON(int *id, int *output_on)
|
||||
DLL_EXPORT void __stdcall SETOUTPUTFILEON(int *id, int *output_on)
|
||||
{
|
||||
SetOutputOnF(id, output_on);
|
||||
SetOutputFileOnF(id, output_on);
|
||||
}
|
||||
DLL_EXPORT void __stdcall SETSELECTEDOUTPUTON(int *id, int *selected_on)
|
||||
DLL_EXPORT void __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
|
||||
{
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
SetSelOutFileOnF(id, selected_on);
|
||||
}
|
||||
DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
|
||||
{
|
||||
|
||||
76
fwrap.h
76
fwrap.h
@ -14,35 +14,35 @@
|
||||
#define DestroyIPhreeqcF FC_FUNC (destroyiphreeqcf, DESTROYIPHREEQCF)
|
||||
#define GetComponentCountF FC_FUNC (getcomponentcountf, GETCOMPONENTCOUNTF)
|
||||
#define GetComponentF FC_FUNC (getcomponentf, GETCOMPONENTF)
|
||||
#define GetDumpLineCountF FC_FUNC (getdumplinecountf, GETDUMPLINECOUNTF)
|
||||
#define GetDumpLineF FC_FUNC (getdumplinef, GETDUMPLINEF)
|
||||
#define GetDumpOnF FC_FUNC (getdumponf, GETDUMPONF)
|
||||
#define GetDumpStringLineCountF FC_FUNC (getdumpstringlinecountf, GETDUMPSTRINGLINECOUNTF)
|
||||
#define GetDumpStringLineF FC_FUNC (getdumpstringlinef, GETDUMPSTRINGLINEF)
|
||||
#define GetDumpFileOnF FC_FUNC (getdumpfileonf, GETDUMPFILEONF)
|
||||
#define GetDumpStringOnF FC_FUNC (getdumpstringonf, GETDUMPSTRINGONF)
|
||||
#define GetErrorLineCountF FC_FUNC (geterrorlinecountf, GETERRORLINECOUNTF)
|
||||
#define GetErrorLineF FC_FUNC (geterrorlinef, GETERRORLINEF)
|
||||
#define GetErrorOnF FC_FUNC (geterroronf, GETERRORONF)
|
||||
#define GetLogOnF FC_FUNC (getlogonf, GETLOGONF)
|
||||
#define GetOutputOnF FC_FUNC (getoutputonf, GETOUTPUTONF)
|
||||
#define GetErrorStringLineCountF FC_FUNC (geterrorstringlinecountf, GETERRORSTRINGLINECOUNTF)
|
||||
#define GetErrorStringLineF FC_FUNC (geterrorstringlinef, GETERRORSTRINGLINEF)
|
||||
#define GetErrorFileOnF FC_FUNC (geterrorfileonf, GETERRORFILEONF)
|
||||
#define GetLogFileOnF FC_FUNC (getlogfileonf, GETLOGFILEONF)
|
||||
#define GetOutputFileOnF FC_FUNC (getoutputfileonf, GETOUTPUTFILEONF)
|
||||
#define GetSelectedOutputColumnCountF FC_FUNC (getselectedoutputcolumncountf, GETSELECTEDOUTPUTCOLUMNCOUNTF)
|
||||
#define GetSelectedOutputOnF FC_FUNC (getselectedoutputonf, GETSELECTEDOUTPUTONF)
|
||||
#define GetSelectedOutputFileOnF FC_FUNC (getselectedoutputfileonf, GETSELECTEDOUTPUTFILEONF)
|
||||
#define GetSelectedOutputRowCountF FC_FUNC (getselectedoutputrowcountf, GETSELECTEDOUTPUTROWCOUNTF)
|
||||
#define GetSelectedOutputValueF FC_FUNC (getselectedoutputvaluef, GETSELECTEDOUTPUTVALUEF)
|
||||
#define GetWarningLineCountF FC_FUNC (getwarninglinecountf, GETWARNINGLINECOUNTF)
|
||||
#define GetWarningLineF FC_FUNC (getwarninglinef, GETWARNINGLINEF)
|
||||
#define GetWarningStringLineCountF FC_FUNC (getwarningstringlinecountf, GETWARNINGSTRINGLINECOUNTF)
|
||||
#define GetWarningStringLineF FC_FUNC (getwarningstringlinef, GETWARNINGSTRINGLINEF)
|
||||
#define LoadDatabaseF FC_FUNC (loaddatabasef, LOADDATABASEF)
|
||||
#define LoadDatabaseStringF FC_FUNC (loaddatabasestringf, LOADDATABASESTRINGF)
|
||||
#define OutputErrorF FC_FUNC (outputerrorf, OUTPUTERRORF)
|
||||
#define OutputLinesF FC_FUNC (outputlinesf, OUTPUTLINESF)
|
||||
#define OutputWarningF FC_FUNC (outputwarningf, OUTPUTWARNINGF)
|
||||
#define OutputErrorStringF FC_FUNC (outputerrorstringf, OUTPUTERRORSTRINGF)
|
||||
#define OutputAccumulatedLinesF FC_FUNC (outputaccumulatedlinesf, OUTPUTACCUMULATEDLINESF)
|
||||
#define OutputWarningStringF FC_FUNC (outputwarningstringf, OUTPUTWARNINGSTRINGF)
|
||||
#define RunAccumulatedF FC_FUNC (runaccumulatedf, RUNACCUMULATEDF)
|
||||
#define RunFileF FC_FUNC (runfilef, RUNFILEF)
|
||||
#define RunStringF FC_FUNC (runstringf, RUNSTRINGF)
|
||||
#define SetDumpOnF FC_FUNC (setdumponf, SETDUMPONF)
|
||||
#define SetDumpFileOnF FC_FUNC (setdumpfileonf, SETDUMPFILEONF)
|
||||
#define SetDumpStringOnF FC_FUNC (setdumpstringonf, SETDUMPSTRINGONF)
|
||||
#define SetErrorOnF FC_FUNC (seterroronf, SETERRORONF)
|
||||
#define SetLogOnF FC_FUNC (setlogonf, SETLOGONF)
|
||||
#define SetOutputOnF FC_FUNC (setoutputonf, SETOUTPUTONF)
|
||||
#define SetSelectedOutputOnF FC_FUNC (setselectedoutputonf, SETSELECTEDOUTPUTONF)
|
||||
#define SetErrorFileOnF FC_FUNC (seterrorfileonf, SETERRORFILEONF)
|
||||
#define SetLogFileOnF FC_FUNC (setlogfileonf, SETLOGFILEONF)
|
||||
#define SetOutputFileOnF FC_FUNC (setoutputfileonf, SETOUTPUTFILEONF)
|
||||
#define SetSelOutFileOnF FC_FUNC (setseloutfileonf, SETSELOUTFILEONF)
|
||||
#define UnLoadDatabaseF FC_FUNC (unloaddatabasef, UNLOADDATABASEF)
|
||||
#endif /* FC_FUNC */
|
||||
|
||||
@ -56,35 +56,35 @@ extern "C" {
|
||||
int DestroyIPhreeqcF(int *id);
|
||||
int GetComponentCountF(int *id);
|
||||
void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetDumpLineCountF(int *id);
|
||||
void GetDumpLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetDumpOnF(int *id);
|
||||
int GetDumpStringLineCountF(int *id);
|
||||
void GetDumpStringLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetDumpFileOnF(int *id);
|
||||
int GetDumpStringOnF(int *id);
|
||||
int GetErrorLineCountF(int *id);
|
||||
void GetErrorLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetErrorOnF(int *id);
|
||||
int GetLogOnF(int *id);
|
||||
int GetOutputOnF(int *id);
|
||||
int GetErrorStringLineCountF(int *id);
|
||||
void GetErrorStringLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetErrorFileOnF(int *id);
|
||||
int GetLogFileOnF(int *id);
|
||||
int GetOutputFileOnF(int *id);
|
||||
int GetSelectedOutputColumnCountF(int *id);
|
||||
int GetSelectedOutputOnF(int *id);
|
||||
int GetSelectedOutputFileOnF(int *id);
|
||||
int GetSelectedOutputRowCountF(int *id);
|
||||
IPQ_RESULT GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length);
|
||||
int GetWarningLineCountF(int *id);
|
||||
void GetWarningLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetWarningStringLineCountF(int *id);
|
||||
void GetWarningStringLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int LoadDatabaseF(int *id, char* filename, unsigned int filename_length);
|
||||
int LoadDatabaseStringF(int *id, char* input, unsigned int input_length);
|
||||
void OutputErrorF(int *id);
|
||||
void OutputLinesF(int *id);
|
||||
void OutputWarningF(int *id);
|
||||
void OutputErrorStringF(int *id);
|
||||
void OutputAccumulatedLinesF(int *id);
|
||||
void OutputWarningStringF(int *id);
|
||||
int RunAccumulatedF(int *id);
|
||||
int RunFileF(int *id, char* filename, unsigned int filename_length);
|
||||
int RunStringF(int *id, char* input, unsigned int input_length);
|
||||
IPQ_RESULT SetDumpOnF(int *id, int* dump_on);
|
||||
IPQ_RESULT SetDumpFileOnF(int *id, int* dump_on);
|
||||
IPQ_RESULT SetDumpStringOnF(int *id, int* dump_string_on);
|
||||
IPQ_RESULT SetErrorOnF(int *id, int* error_on);
|
||||
IPQ_RESULT SetLogOnF(int *id, int* log_on);
|
||||
IPQ_RESULT SetOutputOnF(int *id, int* output_on);
|
||||
IPQ_RESULT SetSelectedOutputOnF(int *id, int* selected_output_on);
|
||||
IPQ_RESULT SetErrorFileOnF(int *id, int* error_on);
|
||||
IPQ_RESULT SetLogFileOnF(int *id, int* log_on);
|
||||
IPQ_RESULT SetOutputFileOnF(int *id, int* output_on);
|
||||
IPQ_RESULT SetSelOutFileOnF(int *id, int* selected_output_on);
|
||||
int UnLoadDatabaseF(int *id);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
||||
76
fwrap2.cpp
76
fwrap2.cpp
@ -35,49 +35,49 @@ DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
GetDumpStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPLINECOUNT(int *id)
|
||||
DLL_EXPORT int GETDUMPSTRINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
return GetDumpStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPON(int *id)
|
||||
DLL_EXPORT int GETDUMPFILEON(int *id)
|
||||
{
|
||||
return GetDumpOnF(id);
|
||||
return GetDumpFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPSTRINGON(int *id)
|
||||
{
|
||||
return GetDumpStringOnF(id);
|
||||
}
|
||||
DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
GetErrorStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETERRORLINECOUNT(int *id)
|
||||
DLL_EXPORT int GETERRORSTRINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
return GetErrorStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETERRORON(int *id)
|
||||
DLL_EXPORT int GETERRORFILEON(int *id)
|
||||
{
|
||||
return GetErrorOnF(id);
|
||||
return GetErrorFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETLOGON(int *id)
|
||||
DLL_EXPORT int GETLOGFILEON(int *id)
|
||||
{
|
||||
return GetLogOnF(id);
|
||||
return GetLogFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETOUTPUTON(int *id)
|
||||
DLL_EXPORT int GETOUTPUTFILEON(int *id)
|
||||
{
|
||||
return GetOutputOnF(id);
|
||||
return GetOutputFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTON(int *id)
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTFILEON(int *id)
|
||||
{
|
||||
return GetSelectedOutputOnF(id);
|
||||
return GetSelectedOutputFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
|
||||
{
|
||||
@ -87,13 +87,13 @@ DLL_EXPORT int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype,
|
||||
{
|
||||
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
|
||||
}
|
||||
DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
GetWarningStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETWARNINGLINECOUNT(int *id)
|
||||
DLL_EXPORT int GETWARNINGSTRINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
return GetWarningStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
@ -103,17 +103,17 @@ DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTERROR(int *id)
|
||||
DLL_EXPORT void OUTPUTERRORSTRING(int *id)
|
||||
{
|
||||
OutputErrorF(id);
|
||||
OutputErrorStringF(id);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTLINES(int *id)
|
||||
DLL_EXPORT void OUTPUTACCUMULATEDLINES(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
OutputAccumulatedLinesF(id);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTWARNING(int *id)
|
||||
DLL_EXPORT void OUTPUTWARNINGSTRING(int *id)
|
||||
{
|
||||
OutputWarningF(id);
|
||||
OutputWarningStringF(id);
|
||||
}
|
||||
DLL_EXPORT int RUNACCUMULATED(int *id)
|
||||
{
|
||||
@ -127,29 +127,29 @@ DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void SETDUMPON(int *id, int *dump_on)
|
||||
DLL_EXPORT void SETDUMPFILEON(int *id, int *dump_on)
|
||||
{
|
||||
SetDumpOnF(id, dump_on);
|
||||
SetDumpFileOnF(id, dump_on);
|
||||
}
|
||||
DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on)
|
||||
{
|
||||
SetDumpStringOnF(id, dump_string_on);
|
||||
}
|
||||
DLL_EXPORT void SETERRORON(int *id, int *error_on)
|
||||
DLL_EXPORT void SETERRORFILEON(int *id, int *error_on)
|
||||
{
|
||||
SetErrorOnF(id, error_on);
|
||||
SetErrorFileOnF(id, error_on);
|
||||
}
|
||||
DLL_EXPORT void SETLOGON(int *id, int *log_on)
|
||||
DLL_EXPORT void SETLOGFILEON(int *id, int *log_on)
|
||||
{
|
||||
SetLogOnF(id, log_on);
|
||||
SetLogFileOnF(id, log_on);
|
||||
}
|
||||
DLL_EXPORT void SETOUTPUTON(int *id, int *output_on)
|
||||
DLL_EXPORT void SETOUTPUTFILEON(int *id, int *output_on)
|
||||
{
|
||||
SetOutputOnF(id, output_on);
|
||||
SetOutputFileOnF(id, output_on);
|
||||
}
|
||||
DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on)
|
||||
DLL_EXPORT void SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
|
||||
{
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
SetSelOutFileOnF(id, selected_on);
|
||||
}
|
||||
DLL_EXPORT int UNLOADDATABASE(int *id)
|
||||
{
|
||||
|
||||
76
fwrap3.cpp
76
fwrap3.cpp
@ -34,49 +34,49 @@ DLL_EXPORT int getcomponentcount_(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
GetDumpStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getdumplinecount_(int *id)
|
||||
DLL_EXPORT int getdumpstringlinecount_(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
return GetDumpStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int getdumpon_(int *id)
|
||||
DLL_EXPORT int getdumpfileon_(int *id)
|
||||
{
|
||||
return GetDumpOnF(id);
|
||||
return GetDumpFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getdumpstringon_(int *id)
|
||||
{
|
||||
return GetDumpStringOnF(id);
|
||||
}
|
||||
DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
GetErrorStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int geterrorlinecount_(int *id)
|
||||
DLL_EXPORT int geterrorstringlinecount_(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
return GetErrorStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int geterroron_(int *id)
|
||||
DLL_EXPORT int geterrorfileon_(int *id)
|
||||
{
|
||||
return GetErrorOnF(id);
|
||||
return GetErrorFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getlogon_(int *id)
|
||||
DLL_EXPORT int getlogfileon_(int *id)
|
||||
{
|
||||
return GetLogOnF(id);
|
||||
return GetLogFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getoutputon_(int *id)
|
||||
DLL_EXPORT int getoutputfileon_(int *id)
|
||||
{
|
||||
return GetOutputOnF(id);
|
||||
return GetOutputFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputcolumncount_(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputon_(int *id)
|
||||
DLL_EXPORT int getselectedoutputfileon_(int *id)
|
||||
{
|
||||
return GetSelectedOutputOnF(id);
|
||||
return GetSelectedOutputFileOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputrowcount_(int *id)
|
||||
{
|
||||
@ -86,13 +86,13 @@ DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype,
|
||||
{
|
||||
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
|
||||
}
|
||||
DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
GetWarningStringLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getwarninglinecount_(int *id)
|
||||
DLL_EXPORT int getwarningstringlinecount_(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
return GetWarningStringLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
@ -102,17 +102,17 @@ DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void outputerror_(int *id)
|
||||
DLL_EXPORT void outputerrorstring_(int *id)
|
||||
{
|
||||
OutputErrorF(id);
|
||||
OutputErrorStringF(id);
|
||||
}
|
||||
DLL_EXPORT void outputlines_(int *id)
|
||||
DLL_EXPORT void outputaccumulatedlines_(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
OutputAccumulatedLinesF(id);
|
||||
}
|
||||
DLL_EXPORT void outputwarning_(int *id)
|
||||
DLL_EXPORT void outputwarningstring_(int *id)
|
||||
{
|
||||
OutputWarningF(id);
|
||||
OutputWarningStringF(id);
|
||||
}
|
||||
DLL_EXPORT int runaccumulated_(int *id)
|
||||
{
|
||||
@ -126,29 +126,29 @@ DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void setdumpon_(int *id, int *dump_on)
|
||||
DLL_EXPORT void setdumpfileon_(int *id, int *dump_on)
|
||||
{
|
||||
SetDumpOnF(id, dump_on);
|
||||
SetDumpFileOnF(id, dump_on);
|
||||
}
|
||||
DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
|
||||
{
|
||||
SetDumpStringOnF(id, dump_string_on);
|
||||
}
|
||||
DLL_EXPORT void seterroron_(int *id, int *error_on)
|
||||
DLL_EXPORT void seterrorfileon_(int *id, int *error_on)
|
||||
{
|
||||
SetErrorOnF(id, error_on);
|
||||
SetErrorFileOnF(id, error_on);
|
||||
}
|
||||
DLL_EXPORT void setlogon_(int *id, int *log_on)
|
||||
DLL_EXPORT void setlogfileon_(int *id, int *log_on)
|
||||
{
|
||||
SetLogOnF(id, log_on);
|
||||
SetLogFileOnF(id, log_on);
|
||||
}
|
||||
DLL_EXPORT void setoutputon_(int *id, int *output_on)
|
||||
DLL_EXPORT void setoutputfileon_(int *id, int *output_on)
|
||||
{
|
||||
SetOutputOnF(id, output_on);
|
||||
SetOutputFileOnF(id, output_on);
|
||||
}
|
||||
DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on)
|
||||
DLL_EXPORT void setselectedoutputfileon_(int *id, int *selected_on)
|
||||
{
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
SetSelOutFileOnF(id, selected_on);
|
||||
}
|
||||
DLL_EXPORT int unloaddatabase_(int *id)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user