Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a9307221

Von martin vor mehr als 15 Jahren hinzugefügt

  • ID a93072215fa48c7c61611bba2b02c84a123cc665
  • Vorgänger 39a66360
  • Nachfolger 7183059f

Started moving to new synchronous IO framework.

We need to adapt AqBanking as well because now the DBIO functions use
GWEN_SYNCIO pointers instead of GWEN_IO_LAYER pointers.

Since we don't need guiid and timeout arguments for the new sync io functions
they have been removed now.

Removed IPC code.

git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1724 70169cfe-8b10-0410-8925-dcb4b91034d8

Unterschiede anzeigen:

test/gwentest.c
fprintf(stderr,"Reading file\n");
if (GWEN_DB_ReadFile(db, "test.db",
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP, 0, 2000)) {
GWEN_PATH_FLAGS_CREATE_GROUP)) {
fprintf(stderr,"Error reading file.\n");
return 1;
}
......
fprintf(stderr,"Reading file\n");
if (GWEN_DB_ReadFile(db, argv[2],
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP, 0, 2000)) {
GWEN_PATH_FLAGS_CREATE_GROUP)) {
fprintf(stderr,"Error reading file.\n");
return 1;
}
if (GWEN_DB_WriteFile(db, argv[3],
GWEN_DB_FLAGS_DEFAULT
&~GWEN_DB_FLAGS_ESCAPE_CHARVALUES, 0, 2000
)) {
&~GWEN_DB_FLAGS_ESCAPE_CHARVALUES)) {
fprintf(stderr,"Error writing file.\n");
return 1;
}
......
fprintf(stderr,"Reading file\n");
if (GWEN_DB_ReadFile(db, argv[2],
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP,
0, 30000)) {
GWEN_PATH_FLAGS_CREATE_GROUP)) {
fprintf(stderr,"Error reading file.\n");
return 1;
}
if (GWEN_DB_WriteFile(db, argv[3],
GWEN_DB_FLAGS_DEFAULT
&~GWEN_DB_FLAGS_ESCAPE_CHARVALUES, 0, 2000
)) {
&~GWEN_DB_FLAGS_ESCAPE_CHARVALUES)) {
fprintf(stderr,"Error writing file.\n");
return 1;
}
......
fprintf(stderr,"Reading file\n");
if (GWEN_DB_ReadFile(db, "test.db",
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP, 0, 2000)) {
GWEN_PATH_FLAGS_CREATE_GROUP)) {
fprintf(stderr,"Error reading file.\n");
return 1;
}
......
"olddb",
dbParams,
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP, 0, 2000)) {
GWEN_PATH_FLAGS_CREATE_GROUP)) {
DBG_ERROR(0, "Could not read test file");
return 2;
}
if (GWEN_DB_WriteFile(db,
"test.out",
GWEN_DB_FLAGS_DEFAULT, 0, 2000)) {
GWEN_DB_FLAGS_DEFAULT)) {
DBG_ERROR(0, "Could not write outfile");
}
......
"rfc822",
dbParams,
GWEN_PATH_FLAGS_CREATE_GROUP |
GWEN_DB_FLAGS_UNTIL_EMPTY_LINE, 0, 2000)) {
GWEN_DB_FLAGS_UNTIL_EMPTY_LINE)) {
GWEN_DB_Dump(db, stderr, 2);
DBG_ERROR(0, "Could not read test file");
return 2;
......
if (GWEN_DB_WriteFile(db,
"test.out",
GWEN_DB_FLAGS_DEFAULT, 0, 2000)) {
GWEN_DB_FLAGS_DEFAULT)) {
DBG_ERROR(0, "Could not write outfile");
}
......
"rfc822",
dbParams,
GWEN_PATH_FLAGS_CREATE_GROUP |
GWEN_DB_FLAGS_UNTIL_EMPTY_LINE, 0, 2000)) {
GWEN_DB_FLAGS_UNTIL_EMPTY_LINE)) {
DBG_ERROR(0, "Could not read test file");
return 2;
}
......
"test.822.out",
"rfc822",
dbParams,
GWEN_DB_FLAGS_DEFAULT, 0, 2000)) {
GWEN_DB_FLAGS_DEFAULT)) {
DBG_ERROR(0, "Could not write outfile");
}
......
"test.xmldb.out",
"xmldb",
dbParams,
GWEN_DB_FLAGS_DEFAULT, 0, 2000)) {
GWEN_DB_FLAGS_DEFAULT)) {
DBG_ERROR(0, "Could not write outfile");
}
......
"xmldb",
dbParams,
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP, 0, 2000)) {
GWEN_PATH_FLAGS_CREATE_GROUP)) {
DBG_ERROR(0, "Could not read test file");
return 2;
}
if (GWEN_DB_WriteFile(db,
"test.out",
GWEN_DB_FLAGS_DEFAULT, 0, 2000)) {
GWEN_DB_FLAGS_DEFAULT)) {
DBG_ERROR(0, "Could not write outfile");
}
......
time_t startTime;
time_t stopTime;
GWEN_XML_CONTEXT *ctx;
GWEN_IO_LAYER *io;
int fd;
GWEN_SYNCIO *sio;
int rv;
if (argc<3) {
fprintf(stderr, "Name of testfile needed.\n");
return 1;
}
sio=GWEN_SyncIo_File_new(argv[2], GWEN_SyncIo_File_CreationMode_OpenExisting);
GWEN_SyncIo_AddFlags(sio, GWEN_SYNCIO_FILE_FLAGS_READ);
rv=GWEN_SyncIo_Connect(sio);
if (rv<0) {
DBG_INFO(GWEN_LOGDOMAIN, "here (%d)", rv);
GWEN_SyncIo_free(sio);
return rv;
}
n=GWEN_XMLNode_new(GWEN_XMLNodeTypeTag, "root");
//GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Debug);
GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Error);
......
ctx=GWEN_XmlCtxStore_new(n,
GWEN_XML_FLAGS_DEFAULT |
GWEN_XML_FLAGS_TOLERANT_ENDTAGS |
GWEN_XML_FLAGS_HANDLE_HEADERS,
0, 30000);
fd=open(argv[2], O_RDONLY);
if (fd==-1) {
DBG_ERROR(0, "Could not open file (%s)", strerror(errno));
return 2;
}
io=GWEN_Io_LayerFile_new(fd, -1);
GWEN_Io_Manager_RegisterLayer(io);
GWEN_XML_FLAGS_HANDLE_HEADERS);
startTime=time(0);
if (GWEN_XML_ReadFromIo(ctx, io)) {
if (GWEN_XML_ReadFromIo(ctx, sio)) {
fprintf(stderr, "Error reading XML file.\n");
return 1;
}

Auch abrufbar als: Unified diff