nuevos campos multiples, ordenar campos

application/controllers/ParserFile.php

@@ -90,12 +90,24 @@ class ParserFile extends CI_Controller
             $LocatedContractingParty = $xml->ContractFolderStatus->LocatedContractingParty;
 
             $resultEntries['contractingPartyTypeCode'] = $this->existNodo($LocatedContractingParty, "ContractingPartyTypeCode", 'string');
-            $resultEntries['activityCode'] = $this->existNodo($LocatedContractingParty, "ActivityCode", 'string');
+            $resultEntries['contractingPartyTypeCodeUri'] = (string) $LocatedContractingParty->ContractingPartyTypeCode->attributes()['listURI'];
+
+            if (isset($LocatedContractingParty->ActivityCode)) {
+                if (count($LocatedContractingParty->ActivityCode) > 1) {
+                    for ($i = 0; $i < $LocatedContractingParty->ActivityCode; $i++) {
+                        $resultEntries['activityCode'][$i] = $this->existNodo($LocatedContractingParty, "ActivityCode", 'string');
+                        $resultEntries['activityCodeUri'][$i] = (string) $LocatedContractingParty->ActivityCode->attributes()['listURI'];
+                    }
+                } else {
+                    $resultEntries['activityCode'][0] = $this->existNodo($LocatedContractingParty, "ActivityCode", 'string');
+                    $resultEntries['activityCodeUri'][0] = (string) $LocatedContractingParty->ActivityCode->attributes()['listURI'];
+                }
+
+            }
+
             $resultEntries['buyerProfileURIID'] = $this->existNodo($LocatedContractingParty, "BuyerProfileURIID", 'string');
 
             if (isset($LocatedContractingParty->ParentLocatedParty)) {
-                //$resultEntries['activityCode'] = $this->existNodo($LocatedContractingParty->ParentLocatedParty, "PartyName", 'string');
-
                 $this->RecurseXML($LocatedContractingParty->ParentLocatedParty);
             }
         }
@@ -113,14 +125,21 @@ class ParserFile extends CI_Controller
             //LocatedContractingParty->Party
             $party = $contractFolder->Party;
             $resultEntries['websiteURI'] = $this->existNodo($party, "WebsiteURI", 'string');
-            $resultEntries['partyIdentification'] = $this->existNodo($party, "PartyIdentification", 'array');
+
+            if (isset($party->PartyIdentification)) {
+                for ($i = 0; $i < $party->PartyIdentification; $i++) {
+                    $resultEntries['partyIdentification'][$i]['id'] = $this->existNodo($party->PartyIdentification, "ID", 'string');
+                    $resultEntries['partyIdentification'][$i]['attr'] = $party->PartyIdentification->attributes()['schemeName'];
+                }
+            }
+
             $resultEntries['partyName'] = $this->existNodo($party->PartyName, "Name", 'string');
-            $resultEntries['address']['city'] = $this->existNodo($party->PostalAddress, "CityName", 'string');
-            $resultEntries['address']['codpostal'] = $this->existNodo($party->PostalAddress, "PostalZone", 'string');
-            $resultEntries['address']['direccion'] = $this->existNodo($party->PostalAddress->AddressLine, "Line", 'string');
-            $resultEntries['address']['country'] = $this->existNodo($party->PostalAddress->Country, "Name", 'string');
-            $resultEntries['contact']['name'] = $this->existNodo($party->Contact, "Name", 'string');
-            $resultEntries['contact']['email'] = $this->existNodo($party->Contact, "ElectronicMail", 'string');
+            $resultEntries['city'] = $this->existNodo($party->PostalAddress, "CityName", 'string');
+            $resultEntries['codpostal'] = $this->existNodo($party->PostalAddress, "PostalZone", 'string');
+            $resultEntries['direccion'] = $this->existNodo($party->PostalAddress->AddressLine, "Line", 'string');
+            $resultEntries['country'] = $this->existNodo($party->PostalAddress->Country, "Name", 'string');
+            $resultEntries['contact_name'] = $this->existNodo($party->Contact, "Name", 'string');
+            $resultEntries['contact_email'] = $this->existNodo($party->Contact, "ElectronicMail", 'string');
         }
         $resultFinal = $this->array_remove_empty($resultEntries);
         return $resultFinal;
@@ -147,14 +166,15 @@ class ParserFile extends CI_Controller
 
             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'] = $procurementProject->RequiredCommodityClassification[$i]->ItemClassificationCode->attributes();
+                    $resultEntries['itemClassification_value'] = $this->existNodo($procurementProject->RequiredCommodityClassification[$i], 'ItemClassificationCode', 'string');
+                    $resultEntries['itemClassification_attr'] = (string) $procurementProject->RequiredCommodityClassification[$i]->ItemClassificationCode['listURI'];
                 }
             }
 
             if (isset($procurementProject->RealizedLocation)) {
                 $resultEntries['countrySubentity'] = $this->existNodo($procurementProject->RealizedLocation, 'CountrySubentity', 'string');
                 $resultEntries['countrySubentityCode'] = $this->existNodo($procurementProject->RealizedLocation, 'CountrySubentityCode', 'string');
+                $resultEntries['countrySubentityCode'] = $procurementProject->RealizedLocation->CountrySubentityCode->attributes()['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');
@@ -163,8 +183,10 @@ class ParserFile extends CI_Controller
             }
 
             $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');
             if (isset($procurementProject->PlannedPeriod->DurationMeasure)) {
-                $resultEntries['medida'] = $procurementProject->PlannedPeriod->DurationMeasure->attributes();
+                $resultEntries['medida'] = (string) $procurementProject->PlannedPeriod->DurationMeasure->attributes()['unitCode'];
             }
 
             $resultEntries['contractExtension'] = $this->existNodo($procurementProject->ContractExtension, 'OptionsDescription', 'string');
@@ -212,8 +234,8 @@ class ParserFile extends CI_Controller
             $resultEntries[$i]['startDate'] = $this->existNodo($tenderResult[$i], 'StartDate', 'string');
             $resultEntries[$i]['smeawardedIndicator'] = $this->existNodo($tenderResult[$i], 'SMEAwardedIndicator', 'string');
             //AwardedTenderedProject
-            $resultEntries[$i]['contract']['id'] = $this->existNodo($tenderResult[$i]->Contract, 'ID', 'string');
-            $resultEntries[$i]['contract']['issueDate'] = $this->existNodo($tenderResult[$i]->Contract, 'IssueDate', 'string');
+            $resultEntries[$i]['contract_id'] = $this->existNodo($tenderResult[$i]->Contract, 'ID', 'string');
+            $resultEntries[$i]['contract_issueDate'] = $this->existNodo($tenderResult[$i]->Contract, 'IssueDate', 'string');
 
             $winningParty = $tenderResult[$i]->WinningParty;
             if (isset($winningParty)) {
@@ -247,24 +269,25 @@ class ParserFile extends CI_Controller
 
             $tendererQualificationRequest = $TenderingTerms->TendererQualificationRequest;
             if (isset($tendererQualificationRequest)) {
+                $resultEntries['tendererQualificationRequest']['description'] = $this->existNodo($tendererQualificationRequest, 'Description', 'string');
                 for ($i = 0; $i < count($tendererQualificationRequest); $i++) {
-                    $resultEntries['tendererQualificationRequest']['evaluationCriteriaTypeCode'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'EvaluationCriteriaTypeCode', 'string');
-                    $resultEntries['tendererQualificationRequest']['description'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'Description', 'string');
+                    $resultEntries['tendererQualificationRequest'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'EvaluationCriteriaTypeCode', 'string');
+                    $resultEntries['tendererQualificationRequest'][$i]['description'] = $this->existNodo($tendererQualificationRequest[$i]->TechnicalEvaluationCriteria, 'Description', 'string');
                 }
             }
 
             $financialEvaluationCriteria = $TenderingTerms->TendererQualificationRequest->FinancialEvaluationCriteria;
             if (isset($financialEvaluationCriteria)) {
                 for ($i = 0; $i < count($financialEvaluationCriteria); $i++) {
-                    $resultEntries['financialEvaluationCriteria']['evaluationCriteriaTypeCode'] = $this->existNodo($financialEvaluationCriteria[$i]->EvaluationCriteriaTypeCode, 'EvaluationCriteriaTypeCode', 'string');
-                    $resultEntries['financialEvaluationCriteria']['description'] = $this->existNodo($financialEvaluationCriteria[$i]->EvaluationCriteriaTypeCode, 'Description', 'string');
+                    $resultEntries['financialEvaluationCriteria'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($financialEvaluationCriteria[$i]->EvaluationCriteriaTypeCode, 'EvaluationCriteriaTypeCode', 'string');
+                    $resultEntries['financialEvaluationCriteria'][$i]['description'] = $this->existNodo($financialEvaluationCriteria[$i]->EvaluationCriteriaTypeCode, 'Description', 'string');
                 }
             }
 
             $specificTendererRequirement = $TenderingTerms->TendererQualificationRequest->SpecificTendererRequirement;
             if (isset($specificTendererRequirement)) {
                 for ($i = 0; $i < count($specificTendererRequirement); $i++) {
-                    $resultEntries['financialEvaluationCriteria']['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i]->SpecificTendererRequirement, 'RequirementTypeCode', 'string');
+                    $resultEntries['financialEvaluationCriteria'][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i]->SpecificTendererRequirement, 'RequirementTypeCode', 'string');
                 }
             }