Peter M. Groen / openbr

Commit dc0e208682f9e424bf0005ec877f05d87294e59c

Authored by Josh Klontz
1 parent 91443f79

able to enroll PCSO xml format

Inline Side-by-side
Showing 2 changed files with 7 additions and 0 deletions
sdk/core/bee.cpp
  View file @dc0e208
@@ -47,6 +47,9 @@ FileList BEE::readSigset(QString sigset, bool ignoreMetadata) @@ -47,6 +47,9 @@ FileList BEE::readSigset(QString sigset, bool ignoreMetadata)
47 file.close(); 47 file.close();
48 48
49 QDomElement docElem = doc.documentElement(); 49 QDomElement docElem = doc.documentElement();
  50 + if (docElem.nodeName() != "biometric-signature-set")
  51 + return fileList;
  52 +
50 QDomNode subject = docElem.firstChild(); 53 QDomNode subject = docElem.firstChild();
51 while (!subject.isNull()) { 54 while (!subject.isNull()) {
52 // Looping through subjects 55 // Looping through subjects
sdk/openbr_plugin.cpp
  View file @dc0e208
@@ -377,6 +377,10 @@ TemplateList TemplateList::fromInput(const br::File &input) @@ -377,6 +377,10 @@ TemplateList TemplateList::fromInput(const br::File &input)
377 QScopedPointer<Gallery> i(Gallery::make(file)); 377 QScopedPointer<Gallery> i(Gallery::make(file));
378 TemplateList newTemplates = i->read(); 378 TemplateList newTemplates = i->read();
379 379
  380 + // If input is a Format not a Gallery
  381 + if (newTemplates.isEmpty())
  382 + newTemplates.append(input);
  383 +
380 // Propogate metadata 384 // Propogate metadata
381 for (int i=0; i<newTemplates.size(); i++) { 385 for (int i=0; i<newTemplates.size(); i++) {
382 newTemplates[i].file.append(input.localMetadata()); 386 newTemplates[i].file.append(input.localMetadata());