fly/easy-osm2city-podman
1
0
Fork 0
Code Issues Pull requests Activity

Use updated, faster packaging

Browse source 
Signed-off-by: fly <merspieler@airmail.cc>
This commit is contained in:
fly 2021-06-19 00:06:46 +02:00
parent 7bbbaa04c3
commit aa7227c137
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
managment/www/api.php
View file

@ -132,7 +132,7 @@ if ($action == "set")
else if ($action == "get-job" && isset($_POST["status"]) && $_POST["status"] != "" && isset($_POST["new-status"]) && $_POST["new-status"] != "") else if ($action == "get-job" && isset($_POST["status"]) && $_POST["status"] != "" && isset($_POST["new-status"]) && $_POST["new-status"] != "")
{ {
get_lock($con); get_lock($con);
$sql = "SELECT id FROM tile WHERE status_id = (SELECT id FROM status WHERE name = ?) ORDER BY parent_id LIMIT 1"; $sql = "SELECT id, parent_id FROM tile WHERE status_id = (SELECT id FROM status WHERE name = ?) ORDER BY parent_id LIMIT 1";
$stmt = $con->prepare($sql); $stmt = $con->prepare($sql);
$stmt->bind_param("s", $_POST["status"]); $stmt->bind_param("s", $_POST["status"]);
$stmt->execute(); $stmt->execute();
@ -142,7 +142,8 @@ else if ($action == "get-job" && isset($_POST["status"]) && $_POST["status"] !=
{ {
quit(); quit();
} }
$ret->job = $result->fetch_array()[0]; $res = $result->fetch_array(); // TODO check
$ret->job = $res["id"];
if ($ret->job == Null) if ($ret->job == Null)
{ {
$ret->job = "None"; $ret->job = "None";
@ -150,6 +151,25 @@ else if ($action == "get-job" && isset($_POST["status"]) && $_POST["status"] !=
else else
{ {
set_status($con, $ret->job, $_POST["new-status"], "tile"); set_status($con, $ret->job, $_POST["new-status"], "tile");
if (isset($_POST["all-in-parent"]) && $_POST["all-in-parent"] == 1)
{
$ret->jobs = [];
$ret->jobs[] = $ret->job;
$sql = "SELECT id FROM tile WHERE parent_id = ? AND status_id = (SELECT id FROM status WHERE name = ?)";
$stmt = $con->prepare($sql);
$stmt->bind_param("ss", $res["parent_id"], $_POST["status"]);
$stmt->execute();
$result = $stmt->get_result();
$stmt->close();
if ($result != False)
{
while ($row = $result->fetch_array())
{
set_status($con, $row["id"], $_POST["new-status"], "tile");
$ret->jobs[] = $row["id"];
}
}
}
} }
rel_lock($con); rel_lock($con);
} }

2
packager/Dockerfile
View file

@ -4,7 +4,7 @@ RUN apt-get -y update && apt-get install -y git python3-pip curl vim wget
RUN pip3 install requests RUN pip3 install requests
ENV EASY_O2C_SCRIPTS_COMMIT f872846244434e85aa07059f7b7a85747585d43c ENV EASY_O2C_SCRIPTS_COMMIT 75ff8d8ba1dd727e6b3fd7dca962bfe637fd9faf
RUN git clone https://gitlab.com/merspieler/osm2city-scripts.git scripts RUN git clone https://gitlab.com/merspieler/osm2city-scripts.git scripts