Peter M. Groen / openbr

Commit a93ac4b320dd2e42f5683c4c929e86a42a908cfe

Authored by Josh Klontz
1 parent a8291d6a

added shell code for image retrieval

Inline Side-by-side
Showing 1 changed file with 11 additions and 2 deletions
app/br-serve/br-serve.cpp
  View file @a93ac4b
@@ -55,6 +55,13 @@ public slots: @@ -55,6 +55,13 @@ public slots:
55 if (process.error() != QProcess::UnknownError) 55 if (process.error() != QProcess::UnknownError)
56 qFatal("%s\n", qPrintable(process.errorString())); 56 qFatal("%s\n", qPrintable(process.errorString()));
57 message = process.readLine(); 57 message = process.readLine();
  58 + response->setHeader("Content-Type", "application/json");
  59 + } else if (urlQuery.hasQueryItem("imageID")) {
  60 + process.write(qPrintable(QString(urlQuery.queryItemValue("imageID") + "\n")));
  61 + process.waitForReadyRead();
  62 + if (process.error() != QProcess::UnknownError)
  63 + qFatal("%s\n", qPrintable(process.errorString()));
  64 + response->setHeader("Content-Type", "image/jpeg");
58 } else { 65 } else {
59 QString path = request->path(); 66 QString path = request->path();
60 if (path == "/") 67 if (path == "/")
@@ -68,18 +75,20 @@ public slots: @@ -68,18 +75,20 @@ public slots:
68 "<body>\n" 75 "<body>\n"
69 " <h1><a href=\"http://en.wikipedia.org/wiki/Query_string\">Query String</a> Parameters</h1>" 76 " <h1><a href=\"http://en.wikipedia.org/wiki/Query_string\">Query String</a> Parameters</h1>"
70 " <ul>\n" 77 " <ul>\n"
71 - " <li><b>url</b> - Query URL for processing.</li>\n" 78 + " <li><b>url</b> - Query URL for image search.</li>\n"
  79 + " <li><b>imageID</b> - Query ImageID for image retrieval.</li>\n"
72 " </ul>\n" 80 " </ul>\n"
73 " <h1>Examples</h1>\n" 81 " <h1>Examples</h1>\n"
74 " <ul>\n" 82 " <ul>\n"
75 " <li>http://%1%2/?url=data.liblikely.org/misc/lenna.tiff</li>\n" 83 " <li>http://%1%2/?url=data.liblikely.org/misc/lenna.tiff</li>\n"
  84 + " <li>http://%1%2/?imageID=ecaee0b4cd73a76dd2a8060b2909a4a1</li>\n"
76 " </ul>\n" 85 " </ul>\n"
77 "</body>\n" 86 "</body>\n"
78 "</html>").arg(path, port == 80 ? QString() : (QString(":") + QString::number(port))).toLatin1(); 87 "</html>").arg(path, port == 80 ? QString() : (QString(":") + QString::number(port))).toLatin1();
  88 + response->setHeader("Content-Type", "text/html");
79 } 89 }
80 90
81 response->setHeader("Content-Length", QString::number(message.size())); 91 response->setHeader("Content-Length", QString::number(message.size()));
82 - response->setHeader("Content-Type", "application/json");  
83 response->writeHead(200); // everything is OK 92 response->writeHead(200); // everything is OK
84 response->write(message); 93 response->write(message);
85 response->end(); 94 response->end();