diff --git a/docker/Dockerfile b/Dockerfile similarity index 100% rename from docker/Dockerfile rename to Dockerfile diff --git a/docker/docker-build.sh b/docker-build.sh similarity index 71% rename from docker/docker-build.sh rename to docker-build.sh index 339fb01..42ea593 100755 --- a/docker/docker-build.sh +++ b/docker-build.sh @@ -4,7 +4,7 @@ PROJECT="forestmonitor" REPOSITORY="forest-monitor-backend" -VERSION=$(grep version ../setup.py | head -1 | sed 's/.*"\(.*\)".*/\1/') +VERSION=$(grep version setup.py | head -1 | sed 's/.*"\(.*\)".*/\1/') docker build -t $PROJECT/$REPOSITORY:v$VERSION -f Dockerfile . diff --git a/forest_monitor/monitor/business.py b/forest_monitor/monitor/business.py index 9b5da56..34bd395 100644 --- a/forest_monitor/monitor/business.py +++ b/forest_monitor/monitor/business.py @@ -74,13 +74,13 @@ def add(cls, values, user_id=None): ) INSERT INTO ''' + destinationTable + ''' (classname, quadrant, path_row, view_date, sensor, satellite, areauckm, uc, areamunkm, municipali, - uf, geom, scene_id, source, user_id, created_at, image_date) + uf, geom, scene_id, source, user_id, created_at, image_date, project) SELECT :classname AS classname, :quadrant AS quadrant, :path_row AS path_row, :view_date AS view_date, :sensor AS sensor, :satellite AS satellite, :areauckm AS areauckm, :uc AS uc, :areamunkm AS areamunkm, :municipali AS municipali, :uf AS uf, ST_Multi(geom), :scene_id AS scene_id, :source AS source, - :user_id AS user_id, :created_at as created_at, :image_date AS image_date + :user_id AS user_id, :created_at as created_at, :image_date AS image_date, :project AS project FROM result ''')