insercion de todos los campos en la bbdd

application/libraries/ParserDatabase.php

@@ -29,19 +29,35 @@ class ParserDatabase
                     if ($idLicitacion['result']) {
                         $this->idLicitacion = $idLicitacion['id'];
 
-                        $this->setContractInfo($row['contractInfo']);
+                        if ($row['general']['id_licitacion'] == "8500237") {
+                            $var = 1;
+                        }
+
+                        $this->setDatosSingular($row['contractInfo'], "BRUTO_contract_folder", $this->idLicitacion, "ContractInfo");
+
+                        $this->setDatosSingular($row['tenderingProcess'], "BRUTO_tendering_process", $this->idLicitacion, "TenderingProcess");
+
+                        $this->setProcurementProject($row['procurementProject']);
+
+                        $this->setProcurementProjectLot($row['procurementProjectLot']);
+
+                        $this->setTenderingTerms($row['tenderingTerms']);
 
                         $this->setLocatedContractingParty($row['locatedContractingParty']);
 
                         $this->setParty($row['party']);
 
-                        $this->setLegalDocs($row['legalDocs']);
+                        $this->setValidNoticeInfo($row['validNoticeInfo']);
+
+                        $this->setDatosMultiples($row['tenderingResult'], "BRUTO_tender_result", $this->idLicitacion, "TenderResult");
 
-                        $this->setTechnicalDocs($row['technicalDocs']);
+                        $this->setDatosMultiples($row['legalDocs'], "BRUTO_legal_documents", $this->idLicitacion, "LegalDocs");
 
-                        $this->setGeneralDocs($row['generalDocs']);
+                        $this->setDatosMultiples($row['technicalDocs'], "BRUTO_technical_documents", $this->idLicitacion, "TechnicalDocs");
 
-                        $this->setAdditionalDocs($row['additionalDocs']);
+                        $this->setDatosMultiples($row['generalDocs'], "BRUTO_general_documents", $this->idLicitacion, "GeneralDocs");
+
+                        $this->setDatosMultiples($row['additionalDocs'], "BRUTO_additional_documents", $this->idLicitacion, "AdditionalDocs");
 
                     }
                 }
@@ -66,203 +82,209 @@ class ParserDatabase
         return $result;
     }
 
-    private function setContractInfo($contractInfo): void
+    private function setLocatedContractingParty($contractInfo): void
     {
-        $setInsert = array();
-        $resultInsert = 0;
+        $locatedContractingPartyId = $this->setDatosSingular($contractInfo['locatedContractingParty'], "BRUTO_located_contracting_party", $this->idLicitacion, "locatedContractingParty");
 
-        if (!empty($contractInfo)) {
+        $this->setDatosMultiples($contractInfo['activity'], "BRUTO_located_contracting_party_activity", $locatedContractingPartyId, "locatedContractingParty_Activity");
+    }
 
-            $contractInfo['id_ajena_licitacion'] = $this->idLicitacion;
+    private function setParty($partyInfo): void
+    {
+        $partyId = $this->setDatosSingular($partyInfo['party'], "BRUTO_party", $this->idLicitacion, "PartyInfo");
 
-            if ($resultInsert) {
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "ContractInfo Finalizada Inserción", "false");
-            } else {
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "ContractInfo Fallida", "false", 2);
-            }
-        } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "ContractInfo vacio", "false");
-        }
+        $this->setDatosMultiples($partyInfo['partyIdentification'], "BRUTO_party_party_idenfitication", $partyId, "PartyInfo_PartyIdentification");
     }
 
-    private function setLocatedContractingParty($contractInfo): void
+    private function setProcurementProject($procurementInfo): void
     {
-        $setInsert = array();
-        $contractInfoInsert = 0;
+        $procurementProjectId = $this->setDatosSingular($procurementInfo['budget'], "BRUTO_procurement_project", $this->idLicitacion, "ProcurementProject");
 
-        if (!empty($contractInfo)) {
+        if (array_key_exists("itemClass", $procurementInfo)) {
+            $this->setDatosMultiples($procurementInfo['itemClass'], "BRUTO_procurement_project_itemClass", $procurementProjectId, "ProcurementProject_ItemClass");
+        }
 
-            $contractInfo['locatedContractingParty']['id_ajena_licitacion'] = $this->idLicitacion;
+    }
 
-            $contractInfoInsert = $this->CI->Parser_model->setLocatedContractInfo($contractInfo['locatedContractingParty']);
+    private function setProcurementProjectLot($procurementLotInfo): void
+    {
 
-            if ($contractInfoInsert) {
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "locatedContractingParty Finalizada Inserción", "false");
+        $resultInsert = 0;
 
-                if (!empty($contractInfo['activity'])) {
-                    $activityArr = array();
+        if (!empty($procurementLotInfo)) {
+            $aux = 0;
+            foreach ($procurementLotInfo as $row) {
+                $setInsert = array();
+                $setInsert[$aux] = $row;
+                $setInsert[$aux]['id_ajena'] = $this->idLicitacion;
+                unset($setInsert[$aux]['itemClassification']);
 
-                    foreach ($contractInfo['activity'] as $clave => $row) {
-                        $activityArr[$clave] = $row;
-                        $activityArr[$clave]['id_ajena_located_contracting_party'] = $contractInfoInsert;
+                if (!empty($setInsert)) {
+                    $resultInsert = insertBucle($setInsert, "BRUTO_procurement_project_lot", "setLicitacion_" . $this->fechaInicioParser);
+                    if ($row['itemClassification']) {
+                        $this->setDatosMultiples($row['itemClassification'], "BRUTO_procurement_project_lot_item", $resultInsert, "ProcurementLotItem");
                     }
-                    $activityInsert = insertBucle($activityArr, 'BRUTO_located_contracting_party_activity', "setLicitacion_" . $this->fechaInicioParser);
-                } else {
-                    guardar_log("setLicitacion_" . $this->fechaInicioParser, "locatedContractingParty_Activity vacio", "false");
                 }
+                $aux++;
+            }
+
+            if ($resultInsert) {
+                $result = array("result" => true);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, "ProcurementLot Finalizada Inserción", "false");
             } else {
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "locatedContractingParty Fallida", "false", 2);
+                $result = array("result" => true, "id" => 0);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, "ProcurementLot Fallida", "false", 2);
             }
         } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "locatedContractingParty vacio", "false");
+            guardar_log("setLicitacion_" . $this->fechaInicioParser, "ProcurementLot vacio", "false");
         }
     }
 
-    private function setParty($partyInfo): void
+    private function setTenderingTerms($tenderingTermsInfo): void
     {
-        $setInsert = array();
-        $partyInfoInsert = 0;
 
-        if (!empty($partyInfo)) {
-
-            $partyInfo['party']['id_ajena_licitacion'] = $this->idLicitacion;
-
-            $partyInfoInsert = $this->CI->Parser_model->setParty($partyInfo['party']);
+        $resultInsert = 0;
 
-            if ($partyInfoInsert) {
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "PartyInfo Finalizada Inserción", "false");
+        if (!empty($tenderingTermsInfo)) {
+            $aux = 0;
+            //foreach ($tenderingTermsInfo as $clave => $row) {
+            $setInsert = array();
+            $setInsert['tenderingTerms'][0] = $tenderingTermsInfo[0];
+            $setInsert['tenderingTerms'][0]['id_ajena'] = $this->idLicitacion;
 
-                if (!empty($partyInfo['partyIdentification'])) {
-                    $partyIdentificationArr = array();
+            if (!empty($setInsert)) {
+                $resultInsert = insertBucle($setInsert['tenderingTerms'], "BRUTO_tendering_terms", "setLicitacion_" . $this->fechaInicioParser);
 
-                    foreach ($partyInfo['partyIdentification'] as $clave => $row) {
-                        $partyIdentificationArr[$clave] = $row;
-                        $partyIdentificationArr[$clave]['id_ajena_party'] = $partyInfoInsert;
+                if ($resultInsert > 0) {
+                    if (array_key_exists(1, $tenderingTermsInfo)) {
+                        $this->setDatosMultiples($tenderingTermsInfo[1], "BRUTO_tendering_terms_awarding_terms", $resultInsert, "TenderingTermsAwardingTerms");
                     }
-                    $activityInsert = insertBucle($partyIdentificationArr, 'BRUTO_party_party_idenfitication', "setLicitacion_" . $this->fechaInicioParser);
-                } else {
-                    guardar_log("setLicitacion_" . $this->fechaInicioParser, "PartyInfo_PartyIdentification vacio", "false");
-                }
-            } else {
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "PartyInfo Fallida", "false", 2);
-            }
-        } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "PartyInfo vacio", "false");
-        }
-    }
 
-    private function setLegalDocs($legalDocs): void
-    {
-        $setInsert = array();
-        $resultInsert = 0;
+                    if (array_key_exists(2, $tenderingTermsInfo)) {
+                        $this->setDatosMultiples($tenderingTermsInfo[2], "BRUTO_tendering_terms_qualification_request", $resultInsert, "TenderingTermsQualificationRequest");
+                    }
 
-        if (!empty($legalDocs)) {
-            $aux = 0;
-            foreach ($legalDocs as $row) {
-                $setInsert[$aux] = $row;
-                $setInsert[$aux]['id_ajena_licitacion'] = $this->idLicitacion;
-                $aux++;
-            }
+                    if (array_key_exists(3, $tenderingTermsInfo)) {
+                        $this->setDatosMultiples($tenderingTermsInfo[3], "BRUTO_tendering_terms_financial_evaluation", $resultInsert, "TenderingTermsFinancialEvaluation");
+                    }
 
-            if (!empty($setInsert)) {
-                $resultInsert = insertBucle($setInsert, 'BRUTO_legal_documents', "setLicitacion_" . $this->fechaInicioParser);
+                    if (array_key_exists(4, $tenderingTermsInfo)) {
+                        $this->setDatosMultiples($tenderingTermsInfo[4], "BRUTO_tendering_terms_specific_terms", $resultInsert, "TenderingTermsSpecificRequirement");
+                    }
+                }
             }
+            //$aux++;
+            //}
 
             if ($resultInsert) {
                 $result = array("result" => true);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "LegalDocs Finalizada Inserción", "false");
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, "TenderingTerms Finalizada Inserción", "false");
             } else {
                 $result = array("result" => true, "id" => 0);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "LegalDocs Fallida", "false", 2);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, "TenderingTerms Fallida", "false", 2);
             }
         } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "LegalDocs vacio", "false");
+            guardar_log("setLicitacion_" . $this->fechaInicioParser, "TenderingTerms vacio", "false");
         }
-
     }
 
-    private function setGeneralDocs($generalDocs): void
+    private function setValidNoticeInfo($validNoticeInfo): void
     {
-        $setInsert = array();
+
         $resultInsert = 0;
-        if (!empty($generalDocs)) {
+
+        if (!empty($validNoticeInfo)) {
             $aux = 0;
-            foreach ($generalDocs as $row) {
+            foreach ($validNoticeInfo as $row) {
+                $setInsert = array();
                 $setInsert[$aux] = $row;
-                $setInsert[$aux]['id_ajena_licitacion'] = $this->idLicitacion;
-                $aux++;
-            }
+                $setInsert[$aux]['id_ajena'] = $this->idLicitacion;
 
-            if (!empty($setInsert)) {
-                $resultInsert = insertBucle($setInsert, 'BRUTO_general_documents', "setLicitacion_" . $this->fechaInicioParser);
+                unset($setInsert[$aux]['documento']);
+                unset($setInsert[$aux]['fechas']);
+
+                if (!empty($setInsert)) {
+                    $resultInsert = insertBucle($setInsert, "BRUTO_valid_notice_info", "setLicitacion_" . $this->fechaInicioParser);
+                    if (array_key_exists("documento", $row)) {
+                        $this->setDatosMultiples($row['documento'], "BRUTO_valid_notice_info_documento", $resultInsert, "validNoticeInfoFechas");
+                    }
+
+                    if (array_key_exists("fechas", $row)) {
+                        $this->setDatosMultiples($row['fechas'], "BRUTO_valid_notice_info_fecha", $resultInsert, "validNoticeInfoDocumento");
+                    }
+                }
+                $aux++;
             }
 
             if ($resultInsert) {
                 $result = array("result" => true);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "GeneralDocs Finalizada Inserción", "false");
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, "validNoticeInfo Finalizada Inserción", "false");
             } else {
                 $result = array("result" => true, "id" => 0);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "GeneralDocs Fallida", "false", 2);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, "validNoticeInfo Fallida", "false", 2);
             }
         } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "GeneralDocs vacio", "false");
+            guardar_log("setLicitacion_" . $this->fechaInicioParser, "validNoticeInfo vacio", "false");
         }
-
     }
 
-    private function setAdditionalDocs($additionalDocs): void
+    private function setDatosSingular($arrayDatos, $tabla, $idAjena = 0, $nodoLog): int
     {
-        $setInsert = array();
-        $resultInsert = 0;
-        if (!empty($additionalDocs)) {
-            $aux = 0;
-            foreach ($additionalDocs as $row) {
-                $setInsert[$aux] = $row;
-                $setInsert[$aux]['id_ajena_licitacion'] = $this->idLicitacion;
-                $aux++;
-            }
+        $insertedId = 0;
+        if (!empty($arrayDatos)) {
+            $arrayInsertar = array();
 
-            if (!empty($setInsert)) {
-                $resultInsert = insertBucle($setInsert, 'BRUTO_additional_documents', "setLicitacion_" . $this->fechaInicioParser);
+            $arrayInsertar[0] = $arrayDatos;
+
+            if ($idAjena > 0) {
+                $arrayInsertar[0]['id_ajena'] = $idAjena;
             }
 
-            if ($resultInsert) {
-                $result = array("result" => true);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "AdditionalDocs Finalizada Inserción", "false");
+            $insertedId = insertBucle($arrayInsertar, $tabla, "setLicitacion_" . $this->fechaInicioParser);
+
+            if ($insertedId == 0) {
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Fallido", "false");
             } else {
-                $result = array("result" => true, "id" => 0);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "AdditionalDocs Fallida", "false", 2);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Finalizada Inserción", "false");
             }
+
         } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "AdditionalDocs vacio", "false");
+            guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " vacio", "false");
         }
+
+        return $insertedId;
     }
 
-    private function setTechnicalDocs($technicalDocs): void
+    private function setDatosMultiples($arrayDatos, $tabla, $idAjena = 0, $nodoLog): void
     {
         $setInsert = array();
         $resultInsert = 0;
-        if (!empty($technicalDocs)) {
+
+        if (!empty($arrayDatos)) {
             $aux = 0;
-            foreach ($technicalDocs as $row) {
+            foreach ($arrayDatos as $row) {
                 $setInsert[$aux] = $row;
-                $setInsert[$aux]['id_ajena_licitacion'] = $this->idLicitacion;
+
+                if ($idAjena > 0) {
+                    $setInsert[$aux]['id_ajena'] = $idAjena;
+                }
+
                 $aux++;
             }
 
             if (!empty($setInsert)) {
-                $resultInsert = insertBucle($setInsert, 'BRUTO_technical_documents', "setLicitacion_" . $this->fechaInicioParser);
+                $resultInsert = insertBucle($setInsert, $tabla, "setLicitacion_" . $this->fechaInicioParser);
             }
 
             if ($resultInsert) {
                 $result = array("result" => true);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "TechnicalDocs Finalizada Inserción", "false");
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Finalizada Inserción", "false");
             } else {
                 $result = array("result" => true, "id" => 0);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, "TechnicalDocs Fallida", "false", 2);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Fallida", "false", 2);
             }
         } else {
-            guardar_log("setLicitacion_" . $this->fechaInicioParser, "TechnicalDocs vacio", "false");
+            guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " vacio", "false");
         }
     }
 

application/libraries/ParserFile.php

@@ -42,15 +42,15 @@ class ParserFile
 
                 $resultEntries[$filename][$aux]['party'] = $this->nodoParty($row); //
 
-                $resultEntries[$filename][$aux]['procurementProject'] = $this->nodoPresupuesto($row);
+                $resultEntries[$filename][$aux]['procurementProject'] = $this->nodoPresupuesto($row); //
 
-                $resultEntries[$filename][$aux]['procurementProjectLot'] = $this->nodoProcurementProjectLot($row);
+                $resultEntries[$filename][$aux]['procurementProjectLot'] = $this->nodoProcurementProjectLot($row); //
 
-                $resultEntries[$filename][$aux]['tenderingTerms'] = $this->nodoTenderingTerms($row);
+                $resultEntries[$filename][$aux]['tenderingTerms'] = $this->nodoTenderingTerms($row); //
 
-                $resultEntries[$filename][$aux]['tenderingProcess'] = $this->nodoTenderingProcess($row);
+                $resultEntries[$filename][$aux]['tenderingProcess'] = $this->nodoTenderingProcess($row); //
 
-                $resultEntries[$filename][$aux]['tenderingResult'] = $this->nodoTenderResult($row);
+                $resultEntries[$filename][$aux]['tenderingResult'] = $this->nodoTenderResult($row); //
 
                 $resultEntries[$filename][$aux]['validNoticeInfo'] = $this->nodoValidNoticeInfo($row);
 
@@ -171,43 +171,43 @@ class ParserFile
         if (isset($procurementProject)) {
             //ProcurementProject
 
-            $resultEntries['name'] = $this->existNodo($procurementProject, 'Name', 'string');
-            $resultEntries['typeCode'] = $this->existNodo($procurementProject, 'TypeCode', 'string');
-            $resultEntries['subTypeCode'] = $this->existNodo($procurementProject, 'SubTypeCode', 'string');
+            $resultEntries['budget']['name'] = $this->existNodo($procurementProject, 'Name', 'string');
+            $resultEntries['budget']['typeCode'] = $this->existNodo($procurementProject, 'TypeCode', 'string');
+            $resultEntries['budget']['subTypeCode'] = $this->existNodo($procurementProject, 'SubTypeCode', 'string');
 
             if (isset($procurementProject->BudgetAmount)) {
-                $resultEntries['estimatedOverallContractAmount'] = $this->existNodo($procurementProject->BudgetAmount, 'EstimatedOverallContractAmount', 'string');
-                $resultEntries['totalAmount'] = $this->existNodo($procurementProject->BudgetAmount, 'TotalAmount', 'string');
-                $resultEntries['taxExclusiveAmount'] = $this->existNodo($procurementProject->BudgetAmount, 'TaxExclusiveAmount', 'string');
+                $resultEntries['budget']['estimatedOverallContractAmount'] = $this->existNodo($procurementProject->BudgetAmount, 'EstimatedOverallContractAmount', 'string');
+                $resultEntries['budget']['totalAmount'] = $this->existNodo($procurementProject->BudgetAmount, 'TotalAmount', 'string');
+                $resultEntries['budget']['taxExclusiveAmount'] = $this->existNodo($procurementProject->BudgetAmount, 'TaxExclusiveAmount', 'string');
             }
 
             if (isset($procurementProject->RequiredCommodityClassification)) {
                 for ($i = 0; $i < count($procurementProject->RequiredCommodityClassification); $i++) {
-                    $resultEntries['itemClassification_value'] = $this->existNodo($procurementProject->RequiredCommodityClassification[$i], 'ItemClassificationCode', 'string');
-                    $resultEntries['itemClassification_attr'] = (string) $procurementProject->RequiredCommodityClassification[$i]->ItemClassificationCode['listURI'];
+                    $resultEntries['itemClass'][$i]['itemClassification_value'] = $this->existNodo($procurementProject->RequiredCommodityClassification[$i], 'ItemClassificationCode', 'string');
+                    $resultEntries['itemClass'][$i]['itemClassification_attr'] = (string) $procurementProject->RequiredCommodityClassification[$i]->ItemClassificationCode['listURI'];
                 }
             }
 
             if (isset($procurementProject->RealizedLocation)) {
-                $resultEntries['countrySubentity'] = $this->existNodo($procurementProject->RealizedLocation, 'CountrySubentity', 'string');
+                $resultEntries['budget']['countrySubentity'] = $this->existNodo($procurementProject->RealizedLocation, 'CountrySubentity', 'string');
                 if (isset($procurementProject->RealizedLocation->CountrySubentityCode)) {
-                    $resultEntries['countrySubentityCode'] = $this->existNodo($procurementProject->RealizedLocation, 'CountrySubentityCode', 'string');
-                    $resultEntries['countrySubentityCode'] = $this->existAttribute($procurementProject->RealizedLocation, "CountrySubentityCode", "string", 'listURI');
+                    $resultEntries['budget']['countrySubentityCode'] = $this->existNodo($procurementProject->RealizedLocation, 'CountrySubentityCode', 'string');
+                    $resultEntries['budget']['countrySubentityCodeAttr'] = $this->existAttribute($procurementProject->RealizedLocation, "CountrySubentityCode", "string", 'listURI');
                 }
 
                 if (isset($procurementProject->RealizedLocation->Address)) {
-                    $resultEntries['cityName'] = $this->existNodo($procurementProject->RealizedLocation->Address->Country, 'CityName', 'string');
-                    $resultEntries['IdentificationCode'] = $this->existNodo($procurementProject->RealizedLocation->Address->Country, 'IdentificationCode', 'string');
-                    $resultEntries['countryName'] = $this->existNodo($procurementProject->RealizedLocation->Address->Country, 'Name', 'string');
+                    $resultEntries['budget']['cityName'] = $this->existNodo($procurementProject->RealizedLocation->Address->Country, 'CityName', 'string');
+                    $resultEntries['budget']['IdentificationCode'] = $this->existNodo($procurementProject->RealizedLocation->Address->Country, 'IdentificationCode', 'string');
+                    $resultEntries['budget']['countryName'] = $this->existNodo($procurementProject->RealizedLocation->Address->Country, 'Name', 'string');
                 }
             }
 
-            $resultEntries['durationMesure'] = $this->existNodo($procurementProject->PlannedPeriod, 'DurationMeasure', 'string');
-            $resultEntries['duracion_inicio'] = $this->existNodo($procurementProject->PlannedPeriod, 'StartDate', 'string');
-            $resultEntries['duracion_fin'] = $this->existNodo($procurementProject->PlannedPeriod, 'EndDate', 'string');
-            $resultEntries['medida'] = $this->existAttribute($procurementProject->PlannedPeriod, "DurationMeasure", "string", 'unitCode');
+            $resultEntries['budget']['durationMesure'] = $this->existNodo($procurementProject->PlannedPeriod, 'DurationMeasure', 'string');
+            $resultEntries['budget']['duracion_inicio'] = $this->existNodo($procurementProject->PlannedPeriod, 'StartDate', 'string');
+            $resultEntries['budget']['duracion_fin'] = $this->existNodo($procurementProject->PlannedPeriod, 'EndDate', 'string');
+            $resultEntries['budget']['medida'] = $this->existAttribute($procurementProject->PlannedPeriod, "DurationMeasure", "string", 'unitCode');
 
-            $resultEntries['contractExtension'] = $this->existNodo($procurementProject->ContractExtension, 'OptionsDescription', 'string');
+            $resultEntries['budget']['contractExtension'] = $this->existNodo($procurementProject->ContractExtension, 'OptionsDescription', 'string');
         }
 
         $resultFinal = $this->array_remove_empty($resultEntries);
@@ -221,7 +221,7 @@ class ParserFile
 
         if (isset($procurementProjectLot)) {
             for ($i = 0; $i < count($procurementProjectLot); $i++) {
-                $resultEntries[$i]['id'] = $this->existNodo($procurementProjectLot[$i], 'ID', 'string');
+                $resultEntries[$i]['idProcurementLot'] = $this->existNodo($procurementProjectLot[$i], 'ID', 'string');
                 $resultEntries[$i]['name'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject, 'Name', 'string');
                 $resultEntries[$i]['totalAmount'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->BudgetAmount, 'TotalAmount', 'string');
                 $resultEntries[$i]['taxExclusiveAmount'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->BudgetAmount, 'TaxExclusiveAmount', 'string');
@@ -229,16 +229,16 @@ class ParserFile
                 $clasificacionItems = $procurementProjectLot[$i]->ProcurementProject->RequiredCommodityClassification;
                 if (isset($clasificacionItems)) {
                     for ($j = 0; $j < count($clasificacionItems); $j++) {
-                        $resultEntries[$i]['itemClassification']['id'][$j] = $clasificacionItems[$j]->ItemClassificationCode;
-                        $resultEntries[$i]['itemClassification']['id_attr'][$j] = $this->existAttribute($clasificacionItems[$j], "ItemClassificationCode", "string", 'listURI');
+                        $resultEntries[$i]['itemClassification'][$j]['idItem'] = $this->existNodo($clasificacionItems[$j], "ItemClassificationCode", "string");
+                        $resultEntries[$i]['itemClassification'][$j]['id_attr'] = $this->existAttribute($clasificacionItems[$j], "ItemClassificationCode", "string", 'listURI');
                     }
                 }
 
-                if (isset($procurementProjectLot[$i]->RealizedLocation)) {
+                if (isset($procurementProjectLot[$i]->ProcurementProject->RealizedLocation)) {
                     $resultEntries[$i]['countrySubentity'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->RealizedLocation, 'CountrySubentity', 'string');
                     $resultEntries[$i]['countrySubentityCode'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->RealizedLocation, 'CountrySubentityCode', 'string');
                     $resultEntries[$i]['identificationCode'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->RealizedLocation->Address->Country, 'IdentificationCode', 'string');
-                    $resultEntries[$i]['name'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->RealizedLocation->Address->Country, 'Name', 'string');
+                    $resultEntries[$i]['nameLocation'] = $this->existNodo($procurementProjectLot[$i]->ProcurementProject->RealizedLocation->Address->Country, 'Name', 'string');
                 }
             }
         }
@@ -275,8 +275,8 @@ class ParserFile
                 $resultEntries[$i]['PayableAmount'] = $this->existNodo($awardedTenderedProject->LegalMonetaryTotal, 'PayableAmount', 'string');
             }
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
-        return $resultFinal;
+        //$resultFinal = $this->array_remove_empty($resultEntries);
+        return $resultEntries;
     }
 
     private function nodoTenderingTerms($xml)
@@ -286,45 +286,46 @@ class ParserFile
 
         if (isset($TenderingTerms)) {
 
-            $resultEntries['requiredCurriculaIndicator'] = $this->existNodo($TenderingTerms, 'RequiredCurriculaIndicator', 'string');
-            $resultEntries['variantConstraintIndicator'] = $this->existNodo($TenderingTerms, 'VariantConstraintIndicator', 'string');
-            $resultEntries['fundingProgramCode'] = $this->existNodo($TenderingTerms, 'FundingProgramCode', 'string');
+            $resultEntries[0]['requiredCurriculaIndicator'] = $this->existNodo($TenderingTerms, 'RequiredCurriculaIndicator', 'string');
+            $resultEntries[0]['variantConstraintIndicator'] = $this->existNodo($TenderingTerms, 'VariantConstraintIndicator', 'string');
+            $resultEntries[0]['fundingProgramCode'] = $this->existNodo($TenderingTerms, 'FundingProgramCode', 'string');
             if (isset($TenderingTerms->RequiredFinancialGuarantee->GuaranteeTypeCode)) {
-                $resultEntries['guaranteeTypeCode'] = $this->existNodo($TenderingTerms->RequiredFinancialGuarantee, 'GuaranteeTypeCode', 'string');
-                $resultEntries['guaranteeTypeCode_attr'] = $this->existAttribute($TenderingTerms->RequiredFinancialGuarantee, "GuaranteeTypeCode", "string", 'listURI');
-                $resultEntries['requiredFinancialGuarantee_Amount'] = $this->existNodo($TenderingTerms->RequiredFinancialGuarantee, 'AmountRate', 'string');
+                $resultEntries[0]['guaranteeTypeCode'] = $this->existNodo($TenderingTerms->RequiredFinancialGuarantee, 'GuaranteeTypeCode', 'string');
+                $resultEntries[0]['guaranteeTypeCode_attr'] = $this->existAttribute($TenderingTerms->RequiredFinancialGuarantee, "GuaranteeTypeCode", "string", 'listURI');
+                $resultEntries[0]['requiredFinancialGuarantee_Amount'] = $this->existNodo($TenderingTerms->RequiredFinancialGuarantee, 'AmountRate', 'string');
             }
 
-            $resultEntries['procurementLegislationDocumentReference'] = $this->existNodo($TenderingTerms->ProcurementLegislationDocumentReference, 'ID', 'string');
-            $resultEntries['allowedSubcontractTerms'] = $this->existNodo($TenderingTerms->AllowedSubcontractTerms, 'Description', 'string');
+            $resultEntries[0]['procurementLegislationDocumentReference'] = $this->existNodo($TenderingTerms->ProcurementLegislationDocumentReference, 'ID', 'string');
+            $resultEntries[0]['allowedSubcontractTerms'] = $this->existNodo($TenderingTerms->AllowedSubcontractTerms, 'Description', 'string');
 
             $tendererAwardingTerms = $TenderingTerms->AwardingTerms;
             if (isset($tendererAwardingTerms) && !empty($tendererAwardingTerms)) {
                 for ($i = 0; $i < count($tendererAwardingTerms->AwardingCriteria); $i++) {
-                    $resultEntries['awardingTerms'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererAwardingTerms[$i], 'Description', 'string');
-                    $resultEntries['awardingTerms'][$i]['description'] = $this->existNodo($tendererAwardingTerms[$i], 'WeightNumeric', 'string');
+                    $resultEntries[1][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererAwardingTerms[$i], 'Description', 'string');
+                    $resultEntries[1][$i]['description'] = $this->existNodo($tendererAwardingTerms[$i], 'WeightNumeric', 'string');
                 }
             }
 
             $tendererQualificationRequest = $TenderingTerms->TendererQualificationRequest;
             if (isset($tendererQualificationRequest) && !empty($tendererQualificationRequest)) {
-                $resultEntries['tendererQualificationRequest']['description'] = $this->existNodo($tendererQualificationRequest, 'Description', 'string');
+                $resultEntries[0]['description'] = $this->existNodo($tendererQualificationRequest, 'Description', 'string');
+                $resultEntries[0]['personalSituation'] = $this->existNodo($tendererQualificationRequest, 'PersonalSituation', 'string');
                 for ($i = 0; $i < count($tendererQualificationRequest); $i++) {
                     if (isset($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria->EvaluationCriteriaTypeCode)) {
-                        $resultEntries['tendererQualificationRequest'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'EvaluationCriteriaTypeCode', 'string');
-                        $resultEntries['tendererQualificationRequest'][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, "EvaluationCriteriaTypeCode", "sting", 'listURI');
+                        $resultEntries[2][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'EvaluationCriteriaTypeCode', 'string');
+                        $resultEntries[2][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, "EvaluationCriteriaTypeCode", "sting", 'listURI');
+                        $resultEntries[2][$i]['description'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'Description', 'string');
                     }
 
-                    $resultEntries['tendererQualificationRequest'][$i]['description'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'Description', 'string');
                 }
             }
 
             $financialEvaluationCriteria = $TenderingTerms->TendererQualificationRequest->FinancialEvaluationCriteria;
             if (isset($financialEvaluationCriteria) && !empty($financialEvaluationCriteria)) {
                 for ($i = 0; $i < count($financialEvaluationCriteria); $i++) {
-                    $resultEntries['financialEvaluationCriteria'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($financialEvaluationCriteria[$i], 'EvaluationCriteriaTypeCode', 'string');
-                    $resultEntries['financialEvaluationCriteria'][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($financialEvaluationCriteria[$i], "EvaluationCriteriaTypeCode", "string", 'listURI');
-                    $resultEntries['financialEvaluationCriteria'][$i]['description'] = $this->existNodo($financialEvaluationCriteria[$i], 'Description', 'string');
+                    $resultEntries[3][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($financialEvaluationCriteria[$i], 'EvaluationCriteriaTypeCode', 'string');
+                    $resultEntries[3][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($financialEvaluationCriteria[$i], "EvaluationCriteriaTypeCode", "string", 'listURI');
+                    $resultEntries[3][$i]['description'] = $this->existNodo($financialEvaluationCriteria[$i], 'Description', 'string');
                 }
             }
 
@@ -332,15 +333,15 @@ class ParserFile
             if (isset($specificTendererRequirement) && !empty($specificTendererRequirement)) {
                 for ($i = 0; $i < count($specificTendererRequirement); $i++) {
 
-                    $resultEntries['financialEvaluationCriteria'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i]->SpecificTendererRequirement, 'RequirementTypeCode', 'string');
-                    $resultEntries['financialEvaluationCriteria'][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($specificTendererRequirement[$i]->SpecificTendererRequirement, "RequirementTypeCode", "string", 'listURI');
+                    $resultEntries[4][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i]->SpecificTendererRequirement, 'RequirementTypeCode', 'string');
+                    $resultEntries[4][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($specificTendererRequirement[$i]->SpecificTendererRequirement, "RequirementTypeCode", "string", 'listURI');
                 }
             }
 
-            $resultEntries['language'] = $this->existNodo($TenderingTerms->Language, 'ID', 'string');
+            $resultEntries[0]['language'] = $this->existNodo($TenderingTerms->Language, 'ID', 'string');
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
-        return $resultFinal;
+        //$resultFinal = $this->array_remove_empty($resultEntries);
+        return $resultEntries;
     }
 
     private function nodoTenderingProcess($xml)
@@ -446,10 +447,10 @@ class ParserFile
                 if (isset($validNoticeInfo[$i]->AdditionalPublicationStatus)) {
                     for ($j = 0; $j < count($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference); $j++) {
 
-                        $resultEntries[$i]['fechas'][] = $this->existNodo($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j], 'IssueDate', 'string');
+                        $resultEntries[$i]['fechas'][$j]['fechas'] = $this->existNodo($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j], 'IssueDate', 'string');
                         if ($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j]->DocumentTypeCode) {
-                            $resultEntries[$i]['documento']['documento'][] = $this->existNodo($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j]->Attachment->ExternalReference, 'URI', 'string');
-                            $resultEntries[$i]['documento']['filename'][] = $this->existNodo($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j]->Attachment->ExternalReference, 'FileName', 'string');
+                            $resultEntries[$i]['documento'][$j]['documento'] = $this->existNodo($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j]->Attachment->ExternalReference, 'URI', 'string');
+                            $resultEntries[$i]['documento'][$j]['filename'] = $this->existNodo($validNoticeInfo[$i]->AdditionalPublicationStatus->AdditionalPublicationDocumentReference[$j]->Attachment->ExternalReference, 'FileName', 'string');
 
                         }
                     }
@@ -457,8 +458,8 @@ class ParserFile
             }
         }
 
-        $resultFinal = $this->array_remove_empty($resultEntries);
-        return $resultFinal;
+        //$resultFinal = $this->array_remove_empty($resultEntries);
+        return $resultEntries;
     }
 
     private function nodoGeneralDocuments($xml)