[Mapbender-commits] r8803 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-03-25 04:26:31 -0700 (Tue, 25 Mar 2014)
New Revision: 8803

Modified:
   trunk/mapbender/http/classes/class_iso19139.php
Log:
Bugfix for inspire monitoring areas if both are equal

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2014-03-21 08:06:59 UTC (rev 8802)
+++ trunk/mapbender/http/classes/class_iso19139.php	2014-03-25 11:26:31 UTC (rev 8803)
@@ -238,16 +238,21 @@
 					break;
 					case "mapbender.2.inspireWholeArea":
 						$this->inspireWholeArea = $keyword;
-						//$e = new mb_exception("inspireWholeArea: ".$this->inspireWholeArea);
 					break;
 					case "mapbender.2.inspireActualCoverage":
 						$this->inspireActualCoverage = $keyword;
-						//$e = new mb_exception("inspireActualCoverage: ".$this->inspireActualCoverage);
 					break;
 				}
 				unset($thesaurusName);
 				$iKeyword++;
 			}
+			//solve problem with identical keywords for areas:
+			if ($this->inspireWholeArea == 0 && $this->inspireActualCoverage !== 0) {
+					$this->inspireWholeArea = $this->inspireActualCoverage;
+			}
+			if ($this->inspireWholeArea !== 0 && $this->inspireActualCoverage == 0) {
+					$this->inspireActualCoverage = $this->inspireWholeArea;
+			}
 			$iKeyword = 0;
 			$this->isoCategoryKeys = $iso19139Xml->xpath('//gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:topicCategory/gmd:MD_TopicCategoryCode');
 			//create mapbenders internal category objects
@@ -1371,7 +1376,6 @@
 	}
 
 	public function insertMetadataIntoDB() {
-		
 		//insert an instance for iso19139 into mapbenders database
 		$sql = <<<SQL
 INSERT INTO mb_metadata (lastchanged, link, origin, md_format, data, linktype, uuid, title, createdate, changedate, abstract, searchtext, type, tmp_reference_1, tmp_reference_2, export2csw, datasetid, datasetid_codespace, randomid, fkey_mb_user_id, harvestresult, harvestexception, lineage, inspire_top_consistence, spatial_res_type, spatial_res_value, update_frequency, format, inspire_charset, ref_system, the_geom, datalinks, inspire_whole_area, inspire_actual_coverage, inspire_download)  VALUES(now(), $1, $18, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34)