tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lieu_api

Browse Source
This commit is contained in:
Al
2017-12-26 10:47:29 -05:00
parent 2afcd74779 1e7cc23b81
commit bb9f6a4c6b
6 changed files with 8090 additions and 8090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
.appveyor.yml
View File

@@ -1,30 +1,55 @@
version: 1.0.{build} version: 1.0.{build}
image: Visual Studio 2015
image: Visual Studio 2015 skip_branch_with_pr: true
platform: x64
environment:
branches: matrix:
only: - COMPILER: msys2
- master PLATFORM: x86
MSYS2_ARCH: x86
environment: MSYS2_DIR: msys64
matrix: MSYSTEM: MINGW32
- COMPILER: msys2 BIT: 32
PLATFORM: x64 - COMPILER: msys2
MSYS2_ARCH: x86_64 PLATFORM: x64
MSYS2_DIR: msys64 MSYS2_ARCH: x86_64
MSYSTEM: MINGW64 MSYS2_DIR: msys64
BIT: 64 MSYSTEM: MINGW64
BIT: 64
build_script:
- '%APPVEYOR_BUILD_FOLDER%\win_build.bat' build_script:
- cmd: cd %APPVEYOR_BUILD_FOLDER%
test_script: - ps: |
- '%APPVEYOR_BUILD_FOLDER%\test\test_libpostal.exe' Write-Host "Compiler: $Env:COMPILER"
Write-Host "Architecture: $Env:MSYS2_ARCH"
after_build: Write-Host "Platform: $Env:PLATFORM"
- 7z a libpostal.zip %APPVEYOR_BUILD_FOLDER%\libpostal.dll %APPVEYOR_BUILD_FOLDER%\libpostal.def %APPVEYOR_BUILD_FOLDER%\libpostal.exp %APPVEYOR_BUILD_FOLDER%\libpostal.lib %APPVEYOR_BUILD_FOLDER%\src\libpostal.h Write-Host "MSYS2 Directory: $Env:MSYS2_DIR"
Write-Host "MSYS2 System: $Env:MSYSTEM"
artifacts:
- path: libpostal.zip if ($Env:COMPILER -eq "msys2") {
name: libpostal $Env:Path = "C:\$Env:MSYS2_DIR\$Env:MSYSTEM\bin;C:\$Env:MSYS2_DIR\usr\bin;$Env:Path"
$Env:WDIR = $Env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
bash -lc "cd $Env:WDIR && cp -rf ./windows/* ./"
bash -lc "cd $Env:WDIR && ./bootstrap.sh"
bash -lc "cd $Env:WDIR && ./configure --datadir=/c"
bash -lc "cd $Env:WDIR && make -j4"
bash -lc "cd $Env:WDIR && make check"
bash -lc "cd $Env:WDIR && cp src/.libs/libpostal-*.dll libpostal.dll"
& 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\lib.exe' /def:libpostal.def /out:libpostal.lib /machine:$Env:PLATFORM
if ($Env:BIT -eq "32") {
$Paths = @(
(Join-Path $Env:APPVEYOR_BUILD_FOLDER "src"),
(Join-Path $Env:APPVEYOR_BUILD_FOLDER "src\.libs"),
(Join-Path $Env:APPVEYOR_BUILD_FOLDER "test"),
(Join-Path $Env:APPVEYOR_BUILD_FOLDER "test\.libs"))
Get-ChildItem -Path $Paths | ?{ $_.Name -Match '\.(exe|dll)$' } | % { & 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\editbin.exe' /NOLOGO /LARGEADDRESSAWARE $_.FullName }
}
7z a libpostal.zip $Env:APPVEYOR_BUILD_FOLDER\libpostal.dll $Env:APPVEYOR_BUILD_FOLDER\libpostal.def $Env:APPVEYOR_BUILD_FOLDER\libpostal.exp $Env:APPVEYOR_BUILD_FOLDER\libpostal.lib $Env:APPVEYOR_BUILD_FOLDER\src\libpostal.h
}
test_script:
- '%APPVEYOR_BUILD_FOLDER%\test\test_libpostal.exe'
artifacts:
- path: libpostal.zip
name: libpostal

3
resources/dictionaries/en/toponyms.txt
View File

@@ -30,6 +30,7 @@ maine|me
manitoba|mb manitoba|mb
maryland|md maryland|md
massachusetts|ma massachusetts|ma
melbourne|melb
michigan|mi michigan|mi
minnesota|mn minnesota|mn
mississippi|ms mississippi|ms
@@ -76,4 +77,4 @@ west virginia|wv
western australia|wa western australia|wa
wisconsin|wi wisconsin|wi
wyoming|wy wyoming|wy
yukon|yt|the yukon|yukon territory yukon|yt|the yukon|yukon territory

16013
src/address_expansion_data.c
View File

File diff suppressed because it is too large Load Diff

4
src/address_parser.c
View File

@@ -1770,6 +1770,10 @@ libpostal_address_parser_response_t *address_parser_parse(char *address, char *l
token_array_destroy(tokens); token_array_destroy(tokens);
tokenized_string_destroy(tokenized_str); tokenized_string_destroy(tokenized_str);
if (is_normalized) {
free(normalized);
}
return response; return response;
} }
} }

51
src/log/log.h
View File

@@ -17,48 +17,39 @@
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
#if LOG_LEVEL > LOG_LEVEL_DEBUG
#define NO_DEBUG 1
#endif
#ifdef NO_DEBUG
/* compile with all debug messages removed */
#define log_debug(M, ...) do { if (0) fprintf(stderr, "\33[34mDEBUG\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__); } while (0)
#else
#ifdef LOG_NO_COLORS
#define log_debug(M, ...) fprintf(stderr, "DEBUG " M " at %s (%s:%d) \n", ##__VA_ARGS__, __func__, __FILE__, __LINE__)
#else
#define log_debug(M, ...) fprintf(stderr, "\33[34mDEBUG\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__)
#endif /* NOCOLORS */
#endif /* NDEBUG */
/* safe readable version of errno */ /* safe readable version of errno */
#define clean_errno() (errno == 0 ? "None" : strerror(errno)) #define clean_errno() (errno == 0 ? "None" : strerror(errno))
#ifdef LOG_NO_COLORS #if defined (LOG_NO_COLORS) || defined (_WIN32)
#define log_error(M, ...) fprintf(stderr, "ERR " M " at %s (%s:%d) errno:%s\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()) #define log_error(M, ...) fprintf(stderr, "ERR " M " at %s (%s:%d) errno:%s\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno())
#define log_warn(M, ...) fprintf(stderr, "WARN " M " at %s (%s:%d) errno:%s\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()) #define log_warn(M, ...) fprintf(stderr, "WARN " M " at %s (%s:%d) errno:%s\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno())
#define log_info(M, ...) fprintf(stderr, "INFO " M " at %s (%s:%d)\n", ##__VA_ARGS__, __func__, __FILENAME__, __LINE__) #define log_info(M, ...) fprintf(stderr, "INFO " M " at %s (%s:%d)\n", ##__VA_ARGS__, __func__, __FILENAME__, __LINE__)
#define log_debug(M, ...) fprintf(stderr, "DEBUG " M " at %s (%s:%d)\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__)
#else #else
#define log_error(M, ...) fprintf(stderr, "\33[31mERR\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()) #define log_error(M, ...) fprintf(stderr, "\33[31mERR\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno())
#define log_warn(M, ...) fprintf(stderr, "\33[91mWARN\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()) #define log_warn(M, ...) fprintf(stderr, "\33[91mWARN\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno())
#define log_info(M, ...) fprintf(stderr, "\33[32mINFO\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILENAME__, __LINE__) #define log_info(M, ...) fprintf(stderr, "\33[32mINFO\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILENAME__, __LINE__)
#define log_debug(M, ...) fprintf(stderr, "\33[34mDEBUG\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__)
#endif /* NOCOLORS */ #endif /* NOCOLORS */
#if LOG_LEVEL > LOG_LEVEL_INFO #if LOG_LEVEL > LOG_LEVEL_ERROR
#undef log_info #undef log_error
#define log_info(M, ...) do { if (0) fprintf(stderr, "\33[31mERR\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()); } while(0) #define log_error(M, ...) do { if (0) fprintf(stderr, "\33[31mERR\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()); } while(0)
#endif #endif
#if LOG_LEVEL > LOG_LEVEL_WARN #if LOG_LEVEL > LOG_LEVEL_WARN
#undef log_warn #undef log_warn
#define log_warn(M, ...) do { if (0) fprintf(stderr, "\33[91mWARN\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()); } while (0) #define log_warn(M, ...) do { if (0) fprintf(stderr, "\33[91mWARN\33[39m " M " \33[90m at %s (%s:%d) \33[94merrno: %s\33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__, clean_errno()); } while (0)
#endif #endif
#if LOG_LEVEL > LOG_LEVEL_ERROR #if LOG_LEVEL > LOG_LEVEL_INFO
#undef log_error #undef log_info
#define log_error(M, ...) do { if (0) fprintf(stderr, "\33[32mINFO\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILENAME__, __LINE__); } while (0) #define log_info(M, ...) do { if (0) fprintf(stderr, "\33[32mINFO\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILENAME__, __LINE__); } while (0)
#endif #endif
#if LOG_LEVEL > LOG_LEVEL_DEBUG
#undef log_debug
#define log_debug(M, ...) do { if (0) fprintf(stderr, "\33[34mDEBUG\33[39m " M " \33[90m at %s (%s:%d) \33[39m\n", ##__VA_ARGS__, __func__, __FILE__, __LINE__); } while (0)
#endif #endif
#endif //LOG_H

24
win_build.bat
View File

@@ -1,24 +0,0 @@
@echo off
cd %APPVEYOR_BUILD_FOLDER%
echo Compiler: %COMPILER%
echo Architecture: %MSYS2_ARCH%
echo Platform: %PLATFORM%
echo MSYS2 directory: %MSYS2_DIR%
echo MSYS2 system: %MSYSTEM%
echo Configuration: %CONFIGURATION%
echo Bits: %BIT%
IF %COMPILER%==msys2 (
@echo on
SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp -rf windows/* ./"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --datadir=/c"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && make -j4"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp src/.libs/libpostal-*.dll libpostal.dll"
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\lib.exe" /def:libpostal.def /out:libpostal.lib /machine:x64
)