[Mapbender-commits] r4302 - branches/mifan_dev/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: mifan
Date: 2009-07-04 15:33:33 -0400 (Sat, 04 Jul 2009)
New Revision: 4302

Modified:
   branches/mifan_dev/mapbender/http/classes/class_csw.php
Log:
load cap cat

Modified: branches/mifan_dev/mapbender/http/classes/class_csw.php
===================================================================
--- branches/mifan_dev/mapbender/http/classes/class_csw.php	2009-07-04 19:03:29 UTC (rev 4301)
+++ branches/mifan_dev/mapbender/http/classes/class_csw.php	2009-07-04 19:33:33 UTC (rev 4302)
@@ -136,10 +136,10 @@
 			if(mb_strtolower($element[tag]) == "ows:AccessConstraints"){
 				$this->accessconstraints = $element[value];
 			}
-			if(mb_strtolower($element[tag]) == "contactperson"){
+			if(mb_strtolower($element[tag]) == "ows:IndividualName"){
 				$this->contactperson = $element[value];
 			}
-			if(mb_strtolower($element[tag]) == "contactposition"){
+			if(mb_strtolower($element[tag]) == "ows:PositionName"){
 				$this->contactposition = $element[value];
 			}
 			if(mb_strtolower($element[tag]) == "contactorganization"){
@@ -169,11 +169,26 @@
 			if(mb_strtolower($element[tag]) == "ows:ElectronicMailAddress"){
 				$this->contactelectronicmailaddress = $element[value];
 			}
-	  		if(mb_strtolower($element[tag]) == "keyword" && $section != 'layer'){
-				$this->wms_keyword[count($this->wms_keyword)] = $element[value];
+			
+			//Store array of keywords
+	  		if(mb_strtolower($element[tag]) == "ows:Keyword"){
+				$this->keywords[count($this->keywords)] = $element[value];
 			}
 			
 		}
+		
+		
+		//Success/Failure
+		if(!$this->cat_title || $this->cat_title == ""){
+			$this->cat_status = false;
+			$e = new mb_exception("class_csw: createCatObjFromXML: CSW " . $url . " could not be loaded.");
+			return false;
+		}
+		else{
+			$this->cat_status = true;
+			$e = new mb_notice("class_csw: createCatObjFromXML: CSW " . $url . " has been loaded successfully.");
+			return true;
+		}
 	}
 	
 	/**
@@ -194,7 +209,7 @@
 	public function setCatObjToDB($gui)
 	{
 		global $con;
-		db_begin();
+		//db_begin();
 		$sql = "INSERT INTO cat ()";
 	}