Merge pull request #738 from g-maxime/adm-implementation

Handle multiples errors in ADM implementation checker

Author: JeromeMartinez

Source/Common/FileRegistered.h

@@ -27,7 +27,8 @@ class FileRegistered
 {
 public:
     FileRegistered() : analyze_percent(0), file_id(-1), policy(-1), display(-1), verbosity(-1), report_kind(0), mil_version(0),
-        analyzed(false), implementation_valid(false), policy_valid(false), policy_has_info(false), policy_has_warning(false), create_policy(false), need_update(true)
+        analyzed(false), implementation_valid(false), implementation_has_info(false), implementation_has_warning(false),
+        policy_valid(false), policy_has_info(false), policy_has_warning(false), create_policy(false), need_update(true)
     {
     }
 
@@ -45,6 +46,8 @@ class FileRegistered
         this->analyze_percent = f.analyze_percent;
         this->analyzed = f.analyzed;
         this->implementation_valid = f.implementation_valid;
+        this->implementation_has_info = f.implementation_has_info;
+        this->implementation_has_warning = f.implementation_has_warning;
         this->policy_valid = f.policy_valid;
         this->policy_has_info = f.policy_has_info;
         this->policy_has_warning = f.policy_has_warning;
@@ -82,6 +85,8 @@ class FileRegistered
     unsigned int              index;
     bool                      analyzed;
     bool                      implementation_valid;
+    bool                      implementation_has_info;
+    bool                      implementation_has_warning;
     bool                      policy_valid;
     bool                      policy_has_info;
     bool                      policy_has_warning;

Source/Common/Reports.cpp

@@ -155,7 +155,7 @@ int Reports::checker_validate(int user, MediaConchLib::report report, const std:
         {
             //XXX
             std::string report;
-            if (get_implementation_report(user, files[i], options, report, res->valid, err) < 0)
+            if (get_implementation_report(user, files[i], options, report, res->valid, res->has_info, res->has_warning, err) < 0)
                 return -1;
         }
         else if (report == MediaConchLib::report_MediaVeraPdf)
@@ -268,7 +268,9 @@ int Reports::get_reports_output(int user, const std::vector<long>& files,
             std::string tmp;
             std::string err;
             bool is_valid = false;
-            if (get_implementation_reports(user, files, options, tmp, is_valid, err) < 0)
+            bool has_info = false;
+            bool has_warning = false;
+            if (get_implementation_reports(user, files, options, tmp, is_valid, has_info, has_warning, err) < 0)
                 tmp = std::string();
 
             if (f == MediaConchLib::format_Html)
@@ -286,6 +288,13 @@ int Reports::get_reports_output(int user, const std::vector<long>& files,
 
             if (!result->has_valid)
                 result->has_valid = true;
+
+            if (!result->has_info)
+                result->has_info = has_info;
+
+            if (!result->has_warning)
+                result->has_warning = has_warning;
+
             if (!is_valid)
                 result->valid = false;
 
@@ -466,10 +475,12 @@ int Reports::get_reports_output_JStree(int user, const std::vector<long>& files,
 //---------------------------------------------------------------------------
 int Reports::get_implementation_reports(int user, const std::vector<long>& files,
                                         const std::map<std::string, std::string>& options,
-                                        std::string& report, bool& valid, std::string& err)
+                                        std::string& report, bool& valid, bool& has_info, bool& has_warning, std::string& err)
 {
     bool AcceptsHttps = core->accepts_https();
     valid = true;
+    has_info = false;
+    has_warning = false;
 
     std::stringstream verbo;
     std::map<std::string, std::string>::const_iterator it = options.find("verbosity");
@@ -495,7 +506,9 @@ int Reports::get_implementation_reports(int user, const std::vector<long>& files
         report += "  <media ref=\"" + file + "\">";
         std::string implem;
         bool v = false;
-        if (get_implementation_report(user, files[i], options, implem, v, err) < 0)
+        bool info = false;
+        bool warn = false;
+        if (get_implementation_report(user, files[i], options, implem, v, info, warn, err) < 0)
             implem = std::string();
         else
             get_content_of_media_in_xml(implem);
@@ -504,6 +517,9 @@ int Reports::get_implementation_reports(int user, const std::vector<long>& files
 
         if (!v)
             valid = false;
+
+        has_info |= info;
+        has_warning |= warn;
     }
 
     report += "</MediaConch>\n";
@@ -513,10 +529,12 @@ int Reports::get_implementation_reports(int user, const std::vector<long>& files
 
 //---------------------------------------------------------------------------
 int Reports::get_implementation_report(int user, long file, const std::map<std::string, std::string>& options,
-                                       std::string& report, bool& valid, std::string& err)
+                                       std::string& report, bool& valid, bool& has_info, bool& has_warning, std::string& err)
 {
     std::string options_str = Core::serialize_string_from_options_map(options);
     valid = true;
+    has_info = false;
+    has_warning = false;
     std::string tmp_report;
 
     bool registered = false;
@@ -544,7 +562,10 @@ int Reports::get_implementation_report(int user, long file, const std::map<std::
         return -1;
 
     if (valid)
+    {
         valid = implementation_is_valid(tmp_report);
+        implementation_has_info_or_warning(tmp_report, has_info, has_warning);
+    }
     report += tmp_report;
 
     return 0;
@@ -846,7 +867,9 @@ int Reports::create_report_ma_xml(int user, const std::vector<long>& files,
         {
             std::string implem;
             bool valid;
-            if (get_implementation_report(user, files[i], options, implem, valid, err) < 0)
+            bool info;
+            bool warning;
+            if (get_implementation_report(user, files[i], options, implem, valid, info, warning, err) < 0)
                 implem = std::string();
             else
                 get_content_of_media_in_xml(implem);
@@ -983,6 +1006,33 @@ bool Reports::implementation_is_valid(const std::string& report)
     return true;
 }
 
+//---------------------------------------------------------------------------
+bool Reports::implementation_has_info_or_warning(const std::string& report, bool& has_info, bool& has_warning)
+{
+    has_info=false;
+    has_warning=false;
+
+    size_t pos=0;
+    std::string search(" outcome=\"");
+    while ((pos = report.find(search, pos)) != std::string::npos)
+    {
+        if (pos + search.size() + 4 < report.size())
+        {
+            if (report[pos + search.size()] == 'i' && report[pos + search.size() + 1] == 'n' && report[pos + search.size() + 2] == 'f' && report[pos + search.size() + 3] == 'o')
+                has_info = true;
+            else if (report[pos + search.size()] == 'w' && report[pos + search.size() + 1] == 'a' && report[pos + search.size() + 2] == 'r' && report[pos + search.size() + 3] == 'n')
+                has_warning = true;
+
+            if (has_info && has_warning)
+                break;
+        }
+
+        pos += search.size();
+    }
+
+    return has_info || has_warning;
+}
+
 //---------------------------------------------------------------------------
 bool Reports::policy_is_valid(const std::string& report)
 {
@@ -1012,7 +1062,6 @@ bool Reports::policy_has_info_or_warning(const std::string& report, bool& has_in
     has_info=false;
     has_warning=false;
 
-
     size_t pos=0;
     std::string search(" outcome=\"");
     while ((pos = report.find(search, pos)) != std::string::npos)

Source/Common/Reports.h

@@ -78,9 +78,9 @@ class Reports
                                     std::string& report, std::string& err);
     int   get_implementation_reports(int user, const std::vector<long>& files,
                                      const std::map<std::string, std::string>& options,
-                                     std::string& report, bool& valid, std::string& err);
+                                     std::string& report, bool& valid, bool& has_info, bool& has_warning, std::string& err);
     int   get_implementation_report(int user, long file, const std::map<std::string, std::string>& options,
-                                    std::string& report, bool& valid, std::string& err);
+                                    std::string& report, bool& valid, bool& has_info, bool& has_warning, std::string& err);
     int   get_verapdf_report(int user, long file, std::string& report, bool& valid, std::string& err);
     int   get_dpfmanager_report(int user, long file, std::string& report, bool& valid, std::string& err);
     int   get_imsc1validation_report(int user, long file, std::string& report, bool& valid, std::string& err);
@@ -96,6 +96,7 @@ class Reports
 
     // Reports validity
     bool  implementation_is_valid(const std::string& report);
+    bool  implementation_has_info_or_warning(const std::string& report, bool& has_info, bool& has_warning);
     bool  policy_is_valid(const std::string& report);
     bool  policy_has_info_or_warning(const std::string& report, bool& has_info, bool& has_warning);
     bool  verapdf_report_is_valid(const std::string& report);

Source/Common/XsltPolicy.cpp

@@ -712,7 +712,10 @@ int XsltPolicy::create_rule_from_media_track_child(xmlNodePtr node, const std::s
          || name == "BitRate"
          || name == "Delay"
          || name == "Count"
-         || name == "CodecID_Url")
+         || name == "CodecID_Url"
+         || name == "Errors"
+         || name == "Warnings"
+         || name == "Infos")
             continue;
 
         if(xmlChildElementCount(child))

Source/Common/generated/ImplementationReportDisplayCSVXsl.h

@@ -78,10 +78,14 @@ const char implementation_report_display_csv_xsl[] = {
 ,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x63','\x68','\x6f','\x6f','\x73','\x65','\x3e','\x0d'
 ,'\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x40','\x66','\x61','\x69','\x6c','\x5f','\x63','\x6f','\x75','\x6e','\x74','\x20','\x3d','\x20','\x27','\x30','\x27','\x22','\x3e','\x70','\x61','\x73','\x73','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x3e','\x0d'
-,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x40','\x66','\x61','\x69','\x6c','\x5f','\x63','\x6f','\x75','\x6e','\x74','\x20','\x3e','\x20','\x27','\x30','\x27','\x22','\x3e','\x66','\x61','\x69','\x6c','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x3e','\x0d'
 ,'\x0a'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x40','\x77','\x61','\x72','\x6e','\x5f','\x63','\x6f','\x75','\x6e','\x74','\x20','\x3e','\x20','\x27','\x30','\x27','\x22','\x3e','\x77','\x61','\x72','\x6e','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x3e','\x0d'
+,'\x0a'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x40','\x69','\x6e','\x66','\x6f','\x5f','\x63','\x6f','\x75','\x6e','\x74','\x20','\x3e','\x20','\x27','\x30','\x27','\x22','\x3e','\x69','\x6e','\x66','\x6f','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x77','\x68','\x65','\x6e','\x3e','\x0d'
+,'\x0a'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x6f','\x74','\x68','\x65','\x72','\x77','\x69','\x73','\x65','\x3e','\x70','\x61','\x73','\x73','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x6f','\x74','\x68','\x65','\x72','\x77','\x69','\x73','\x65','\x3e','\x0d'
+,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x63','\x68','\x6f','\x6f','\x73','\x65','\x3e','\x0d'
 ,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x66','\x6f','\x72','\x2d','\x65','\x61','\x63','\x68','\x3e','\x0d'