fix(unifiedreport): Global license appears twice in Main license section

fossology · Mar 28, 2018 · 1d6ff8e · 1d6ff8e
1 parent 9fe7f16
commit 1d6ff8e
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/unifiedreport/agent/unifiedreport.php b/src/unifiedreport/agent/unifiedreport.php
@@ -244,16 +244,26 @@ function identifiedGlobalLicenses($contents)
     $lenTotalLics = count($contents["licenses"]["statements"]);
     // both of this variables have same value but used for different operations
     $lenMainLics = $lenLicsMain = count($contents["licensesMain"]["statements"]);
-    for($j=0; $j<$lenLicsMain; $j++){
-      for($i=0; $i<$lenTotalLics; $i++){
-        if(!strcmp($contents["licenses"]["statements"][$i]["content"], $contents["licensesMain"]["statements"][$j]["content"])){
-          if(!strcmp($contents["licenses"]["statements"][$i]["text"], $contents["licensesMain"]["statements"][$j]["text"])){
-            $contents["licensesMain"]["statements"][$j]["files"] = $contents["licenses"]["statements"][$i]["files"];
-          } else {
-            $lenMainLics++;
-            $contents["licensesMain"]["statements"][$lenMainLics] = $contents["licenses"]["statements"][$i];
+    if($lenLicsMain > 0 ) {
+      for($j=0; $j<$lenLicsMain; $j++) {
+        if($lenTotalLics > 0) {
+          $found = 0;
+          for($i=0; $i<$lenTotalLics; $i++) {
+            if(!strcmp($contents["licenses"]["statements"][$i]["content"], $contents["licensesMain"]["statements"][$j]["content"])) {
+              $found += 1;
+              $lenMainLics += 1;
+              $contents["licensesMain"]["statements"][$lenMainLics] = $contents["licenses"]["statements"][$i];
+              unset($contents["licenses"]["statements"][$i]);
+            }
+          }
+          if ($found == 0 ) {
+            $lenMainLics += 1;
+            $contents["licensesMain"]["statements"][$lenMainLics] = $contents["licensesMain"]["statements"][$j];
+            unset($contents["licensesMain"]["statements"][$j]);
+          }
+          else {
+            unset($contents["licensesMain"]["statements"][$j]);
           }
-          unset($contents["licenses"]["statements"][$i]);          
         }
       }
     }
@@ -544,7 +554,7 @@ private function writeReport($contents, $uploadId, $groupId, $userId)
     $timestamp = $jobInfo['ts'];
     $packageUri = "";
     if(!empty($jobInfo['jq_cmd_args'])){
-     $packageUri = trim($jobInfo['jq_cmd_args'])."?mod=showjobs&upload=".$uploadId;
+      $packageUri = trim($jobInfo['jq_cmd_args'])."?mod=showjobs&upload=".$uploadId;
     }
 
     /* Applying document properties and styling */