Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

ability to handle bzip2 compressed files consisting of multiple streams (pbzip2)

Browse Source
This commit is contained in:
Dennis Luxen 2010-08-11 08:56:59 +00:00
parent 85388b3112
commit a96f932016
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
DataStructures/InputReaderFactory.h
View File

@ -21,38 +21,49 @@ or see http://www.gnu.org/licenses/agpl.txt.
#ifndef INPUTREADERFACTORY_H #ifndef INPUTREADERFACTORY_H
#define INPUTREADERFACTORY_H #define INPUTREADERFACTORY_H
#include <stdio.h> #include <bzlib.h>
#include <string.h>
#include <libxml/xmlreader.h> #include <libxml/xmlreader.h>
#include <bzlib.h> struct BZ2Context {
struct Context {
FILE* file; FILE* file;
BZFILE* bz2; BZFILE* bz2;
bool error; bool error;
int nUnused;
char unused[BZ_MAX_UNUSED];
}; };
int readFromBz2Stream( void* pointer, char* buffer, int len ) int readFromBz2Stream( void* pointer, char* buffer, int len )
{ {
Context* context = (Context*) pointer; void *unusedTmpVoid=NULL;
if ( len == 0 || context->error ) char *unusedTmp=NULL;
return 0; BZ2Context* context = (BZ2Context*) pointer;
if ( len == 0 || context->error || feof(context->file) )
return -1;
int error = 0; int error = 0;
int read = BZ2_bzRead( &error, context->bz2, buffer, len ); int read = BZ2_bzRead( &error, context->bz2, buffer, len );
if ( error == BZ_OK ) if ( error == BZ_OK )
return read; return read;
context->error = true;
if ( error == BZ_STREAM_END ) if ( error == BZ_STREAM_END )
{
BZ2_bzReadGetUnused(&error, context->bz2, &unusedTmpVoid, &context->nUnused);
unusedTmp = (char*)unusedTmpVoid;
for(int i=0;i<context->nUnused;i++) {
context->unused[i] = unusedTmp[i];
}
BZ2_bzReadClose(&error, context->bz2);
if(BZ_OK != error) { context->error = true; return 0;};
context->bz2 = BZ2_bzReadOpen(&error, context->file, 0, 0, context->unused, context->nUnused);
if(NULL == context->bz2) { context->error = true; return 0;};
return read; return read;
}
context->error = true;
return 0; return 0;
} }
int closeBz2Stream( void *pointer ) int closeBz2Stream( void *pointer )
{ {
Context* context = (Context*) pointer; BZ2Context* context = (BZ2Context*) pointer;
BZ2_bzclose( context->bz2 ); BZ2_bzclose( context->bz2 );
fclose( context->file ); fclose( context->file );
delete context; delete context;
@ -65,11 +76,11 @@ xmlTextReaderPtr inputReaderFactory( const char* name )
if(inputName.find(".osm.bz2")!=string::npos) if(inputName.find(".osm.bz2")!=string::npos)
{ {
Context* context = new Context; BZ2Context* context = new BZ2Context;
context->error = false; context->error = false;
context->file = fopen( name, "r" ); context->file = fopen( name, "r" );
int error; int error;
context->bz2 = BZ2_bzReadOpen( &error, context->file, 0, 0, NULL, 0 ); context->bz2 = BZ2_bzReadOpen( &error, context->file, 0, 0, context->unused, context->nUnused );
if ( context->bz2 == NULL || context->file == NULL ) { if ( context->bz2 == NULL || context->file == NULL ) {
delete context; delete context;
return NULL; return NULL;