added br-select and br-print, fixed json formatting

Josh Klontz
1 parent c08a0136
Showing 8 changed files with 128 additions and 12 deletions
app/CMakeLists.txt
app/br-crawl/br-crawl.cpp
app/br-download/br-download.cpp
app/br-print/CMakeLists.txt
app/br-print/br-print.cpp
app/br-search/br-search.cpp
app/br-select/CMakeLists.txt
app/br-select/br-select.cpp
@@ -10,5 +10,7 @@ if(NOT ${BR_EMBEDDED})
   add_subdirectory(br-crawl)
   add_subdirectory(br-enroll)
   add_subdirectory(br-gui)
+  add_subdirectory(br-print)
   add_subdirectory(br-search)
+  add_subdirectory(br-select)
 endif()
@@ -72,7 +72,7 @@ static void crawl(QFileInfo url, int currentDepth = 0)
     } else if (url.isFile()) {
         const QString suffix = url.suffix();
         if ((suffix == "bmp") || (suffix == "jpg") || (suffix == "jpeg") || (suffix == "png") || (suffix == "tiff")) {
-            printf(json ? "{ URL = \"file://%s\" }\n" : "file://%s\n", qPrintable(url.canonicalFilePath()));
+            printf(json ? "{ \"URL\" : \"file://%s\" }\n" : "file://%s\n", qPrintable(url.canonicalFilePath()));
             fflush(stdout);
             currentImages++;
         }
@@ -111,11 +111,18 @@ int main(int argc, char *argv[])
         QFile file;
         file.open(stdin, QFile::ReadOnly);
         while (!file.atEnd()) {
-            const QByteArray line = file.readLine();
-            process(json ? QJsonDocument::fromJson(line).object().value("URL").toString()
-                         : QString::fromLocal8Bit(line),
-                    json ? line.simplified() : QByteArray(),
+            const QByteArray line = file.readLine().simplified();
+            if (line.isEmpty())
+                continue;
+
+            QJsonParseError error;
+            process(json ? QJsonDocument::fromJson(line, &error).object().value("URL").toString()
+                         : QString::fromLatin1(line),
+                    json ? line : QByteArray(),
                     nam);
+
+            if (error.error != QJsonParseError::NoError)
+                qDebug() << error.errorString();
         }
     }
  
+add_executable(br-print br-print.cpp ${BR_RESOURCES})
+target_link_libraries(br-print openbr ${BR_THIRDPARTY_LIBS})
+qt5_use_modules(br-print ${QT_DEPENDENCIES})
+install(TARGETS br-print RUNTIME DESTINATION bin)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright 2014 Noblis                                                     *
+ *                                                                           *
+ * Licensed under the Apache License, Version 2.0 (the "License");           *
+ * you may not use this file except in compliance with the License.          *
+ * You may obtain a copy of the License at                                   *
+ *                                                                           *
+ *     http://www.apache.org/licenses/LICENSE-2.0                            *
+ *                                                                           *
+ * Unless required by applicable law or agreed to in writing, software       *
+ * distributed under the License is distributed on an "AS IS" BASIS,         *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  *
+ * See the License for the specific language governing permissions and       *
+ * limitations under the License.                                            *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <cstdlib>
+#include <cstring>
+#include <openbr/universal_template.h>
+
+static void help()
+{
+    printf("br-print [args]\n"
+           "================\n"
+           "* __stdin__  - Templates\n"
+           "* __stdout__ - Template _data_\n"
+           "\n"
+           "_br-print_ extracts template data.\n");
+}
+
+static void print_utemplate(br_const_utemplate utemplate, br_callback_context)
+{
+    fwrite(utemplate->data, 1, utemplate->size, stdout);
+    printf("\n");
+}
+
+int main(int argc, char *argv[])
+{
+    for (int i=1; i<argc; i++)
+        if      (!strcmp(argv[i], "-help")) { help(); exit(EXIT_SUCCESS); }
+
+    br_iterate_utemplates_file(stdin, print_utemplate, NULL);
+    return EXIT_SUCCESS;
+}
@@ -90,20 +90,21 @@ struct SearchResults
     {
         sort_heap(topTargets.begin(), topTargets.end());
  
-        cout << "{ \"AlgorithmID\"=" << query->algorithmID;
-        cout << ", \"QueryImageID\"=";
+        cout << "{ \"AlgorithmID\":\"" << query->algorithmID;
+        cout << "\", \"QueryImageID\":\"";
         writeMD5asHex(query->imageID);
-        cout << ", \"QueryTemplateID\"=";
+        cout << "\", \"QueryTemplateID\":\"";
         writeMD5asHex(query->templateID);
+        cout << "\"";
         printMetadata(query);
-        cout << ", \"Targets\"=[ ";
+        cout << ", \"Targets\":[ ";
         for (int i=topTargets.size()-1; i>=0; i--) {
             Target &target = topTargets[i];
-            cout  << "{ \"ImageID\"=";
+            cout  << "{ \"ImageID\":\"";
             writeMD5asHex(target.second->imageID);
-            cout << ", \"TemplateID\"=";
+            cout << "\", \"TemplateID\":\"";
             writeMD5asHex(target.second->templateID);
-            cout << ", \"Score\"=" << target.first;
+            cout << "\", \"Score\":" << target.first;
             printMetadata(target.second);
             cout << " }";
             if (i > 0)
+add_executable(br-select br-select.cpp ${BR_RESOURCES})
+target_link_libraries(br-select openbr ${BR_THIRDPARTY_LIBS})
+qt5_use_modules(br-select ${QT_DEPENDENCIES})
+install(TARGETS br-select RUNTIME DESTINATION bin)
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright 2014 Noblis                                                     *
+ *                                                                           *
+ * Licensed under the Apache License, Version 2.0 (the "License");           *
+ * you may not use this file except in compliance with the License.          *
+ * You may obtain a copy of the License at                                   *
+ *                                                                           *
+ *     http://www.apache.org/licenses/LICENSE-2.0                            *
+ *                                                                           *
+ * Unless required by applicable law or agreed to in writing, software       *
+ * distributed under the License is distributed on an "AS IS" BASIS,         *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  *
+ * See the License for the specific language governing permissions and       *
+ * limitations under the License.                                            *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <cstdlib>
+#include <cstring>
+#include <openbr/universal_template.h>
+
+static void help()
+{
+    printf("br-select [args]\n"
+           "================\n"
+           "* __stdin__  - Templates\n"
+           "* __stdout__ - Templates\n"
+           "\n"
+           "_br-select_ filters templates templates.\n"
+           "\n"
+           "Optional Arguments\n"
+           "------------------\n"
+           "* -algorithmID <int> - Allow a specific algorithmID\n");
+}
+
+static int *algorithmID = NULL;
+
+static void select_utemplate(br_const_utemplate utemplate, br_callback_context)
+{
+    if (algorithmID && utemplate->algorithmID != *algorithmID)
+        return;
+
+    br_append_utemplate(stdout, utemplate);
+}
+
+int main(int argc, char *argv[])
+{
+    for (int i=1; i<argc; i++) {
+        if      (!strcmp(argv[i], "-help")) { help(); exit(EXIT_SUCCESS); }
+        else if (!strcmp(argv[i], "-algorithmID")) algorithmID = new int(atoi(argv[++i]));
+    }
+
+    br_iterate_utemplates_file(stdin, select_utemplate, NULL);
+    return EXIT_SUCCESS;
+}