added timeout setting for sqlite to aquire a lock
improved error message for 500 error
fix for missing result. onnly temporary

to test:

from extractor import *

string="in-in(e13,x2,x0) ^ card(e12,x3,3) ^ card(e11,x3,1000000) ^ people-nn(e10,x3) ^ live-vb(x2,x3,u8,u9) ^ poverty-nn(e7,x1) ^ in-in(e6,x2,x1) ^ australia-nn\
(e4,x0) ^ loc(e5,x0) ^ !=(e4,e5) ^ !=(e12,e11) ^ !=(e13,e6) ^ TS#POVERTY(x1) ^ T#ECONOMIC-INEQUALITY(_0) ^ S#PHYSICAL_LOCATION(x2) ^ SS#PHYSICAL_LOCATION%DEFINE\
D_REGION(x2,x2,x1) ^ I#PHYSICAL_LOCATION(x2)"
string2="in-in(e13,x2,x0) ^ card(e12,x3,3) ^ card(e11,x3,1000000) ^ people-nn(e10,x3) ^ live-vb(x2,x3,u8,u9) ^ poverty-nn(e7,x1) ^ in-in(e6,x2,x1) ^ australia-n\
n(e4,x0) ^ loc(e5,x0) ^ !=(e4,e5) ^ !=(e12,e11) ^ !=(e13,e6) ^ TS#POVERTY(x1) ^ T#ECONOMIC-INEQUALITY(_0) ^ S#PHYSICAL_LOCATION(x2) ^ SS#PHYSICAL_LOCATION%DEFIN\
ED_REGION(x2,x1) ^ I#PHYSICAL_LOCATION(x2) ^ I#PHYSICAL_LOCATION%DEFINED_REGION(x2,x1)"

extract_CM_mapping("1",string,None,"",None) #this call finds a result
extract_CM_mapping("1",string2,None,"",None) #this doesn't
Merge branches 'dev' and 'master'
Merge branch 'master' of https://github.com/isi-metaphor/lcc-service
Merge branches 'master' and 'dev'
redoing https://github.com/isi-metaphor/lcc-service/commit/acafa0a6caff507225b4ab357c086639d320ff36
added code to filter LF input to henry based on supplied source and target spans.
for spanish it underfilters as the tokenizer restarts from 1 for every sentence in the input.
forgot to commit these 2 files in previous commit
reverting changes in: https://github.com/isi-metaphor/lcc-service/commit/1084deed7c5dbaf3b1788ca89a2361aa29637f0e
Merge branch 'master' into dev
Merge branches 'master' and 'dev'
Merge branches 'dev' and 'master' into dev