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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-02-19 04:07:23 -0800 (Fri, 19 Feb 2016)
New Revision: 9402

Modified:
   trunk/mapbender/http/classes/class_iso19139.php
Log:
smal bugfix for metadata management

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2016-02-18 13:28:40 UTC (rev 9401)
+++ trunk/mapbender/http/classes/class_iso19139.php	2016-02-19 12:07:23 UTC (rev 9402)
@@ -2032,6 +2032,7 @@
 							return $result;
 						}
 					} 
+					$this->harvestResult = 1;
 				} else {
 					$e = new mb_exception("class_Iso19139:"."MetadataURL format or type of following url is not supported: Format: ".$this->format." | type: ".$this->type);
 				}
@@ -2042,17 +2043,18 @@
 				if ($metadata == false) {
 					//try to insert only MetadataURL elements
 					if (!$this->insertMetadataUrlToDB($resourceType, $resourceId)) {
-						$e = new mb_exception("class_Iso19139:"."Problem while storing MetadataURL entry from wms capabilities to mb_metadata table!");
+						$e = new mb_exception("class_Iso19139:"."Problem while storing metadata source to mb_metadata table!");
 						$result['value'] = false;
-						$result['message'] = "Problem while storing MetadataURL entry from wms capabilities to mb_metadata table!";
+						$result['message'] = "Problem while storing metadata source to mb_metadata table!";
 						return $result;
 					} else {
-						$e = new mb_exception("class_Iso19139:"."Storing only MetadataURL ".$metadata->href." from capabilities to mb database cause the target could not be accessed or parsed!");
+						$e = new mb_exception("class_Iso19139:"."Storing only MetadataURL ".$metadata->href." from external source to mb database cause the target could not be accessed or parsed!");
 						$result['value'] = true;
-						$result['message'] = "Storing only MetadataURL ".$metadata->href." from capabilities to mb database cause the target could not be accessed or parsed!";
+						$result['message'] = "Storing only MetadataURL ".$metadata->href." from external source to mb database cause the target could not be accessed or parsed!";
 						return $result;
 					}
 				} 
+				$this->harvestResult = 1;
 				break;
 			case "metador":
 				//nothing to do at all?
@@ -2070,10 +2072,11 @@
 					return $result;
 				}
 				//else save it into database
+				$this->harvestResult = 1;
 				break;
 			case "internal":
 				//only set relation to existing record - return true;
-				//is actually handled thru plugins/mn_metadata_server* 
+				//is actually handled thru plugins/mb_metadata_server* 
 				break;
 			default:
        				$e = new mb_exception("class_Iso19139:"."Metadata origin is not known - please set it before storing values to DB!");
@@ -2088,7 +2091,9 @@
 		if ($metadataId != false) {
 			//update the metadata - new random id set therefor there is no problem when setting the relation afterwards
 			$e = new mb_notice("existing metadata fileIdentifier found at metadata with id: ".$metadataId[0]." - update will be performed");
-			//check if the timestamp of an existing metadata element is not newer than the timestamp of the current metadata object!!!!
+			//TODO: Check if the timestamp of an existing metadata element is not newer than the timestamp of the current metadata object!!!!
+			//for uploaded metadata the harvesting was ok otherwise the function returned before
+		
 			$res = $this->updateMetadataById($metadataId[0]);
 			$this->insertKeywordsAndCategoriesIntoDB($metadataId[0],$resourceType,$resourceId);
 		} else {