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

[svn_mapbender at osgeo.org]

Author: mifan
Date: 2009-07-20 08:33:08 -0400 (Mon, 20 Jul 2009)
New Revision: 4392

Modified:
   branches/mifan_dev/mapbender/http/classes/class_csw.php
Log:
removed debug values

Modified: branches/mifan_dev/mapbender/http/classes/class_csw.php
===================================================================
--- branches/mifan_dev/mapbender/http/classes/class_csw.php	2009-07-20 12:28:38 UTC (rev 4391)
+++ branches/mifan_dev/mapbender/http/classes/class_csw.php	2009-07-20 12:33:08 UTC (rev 4392)
@@ -265,8 +265,6 @@
 			
 		}
 		
-		print('op_Val:  ');
-		print_r($this->cat_op_values);
 		//Success/Failure
 		if(!$this->cat_title || $this->cat_title == ""){
 			$this->cat_status = false;
@@ -312,7 +310,7 @@
         $sql .= "individualname, positionname, voice, facsimile, deliverypoint, "; 
         $sql .= "city, administrativearea, postalcode, country, electronicmailaddress, "; 
         $sql .= "cat_getcapabilities_doc, cat_owner, cat_timestamp) ";
-    	$sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25)";
+    	$sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21)";
     	
 		$v = array($this->cat_version,$this->cat_title,$this->cat_abstract,
 			$this->cat_upload_url,$this->fees,$this->accessconstraints,$this->providername,$this->providersite,
@@ -328,34 +326,35 @@
 			db_rollback();
 		}
 		
-		echo $sql;
 		$cat_insert_id = db_insert_id($con,'cat', 'cat_id');
 		
-		
 		//GUI_CAT 
 		$sql ="INSERT INTO gui_cat (fkey_gui_id, fkey_cat_id) ";
 		$sql .= "VALUES($1,$2)";
-		$v = array($gui_id,$cat_insert_id);
+		$v = array($gui,$cat_insert_id);
 		$t = array('s','i');
 		$res = db_prep_query($sql,$v,$t);
 		if(!$res){
 			db_rollback();	
 		}
 		
+		//Insert operational values into cat_op_conf
 		//CAT_OP_CONF
+		
+		
 		foreach ($this->cat_op_values as $op_category=>$op_name_array){
 			foreach($op_name_array as $op_type=>$op_value_array){
 				foreach($op_value_array as $op_sub_type=>$value){
-					$op_type_value = '';
+					$op_type_value = $op_type;
 					if($op_sub_type != 'dflt'){
 						//If not dflt, then it is either soap or xml - store this info as post_xml etc
-						$op_type_value = $op_type.'_'.$op_sub_type;
+						$op_type_value .= '_'.$op_sub_type;
 					}
 					//Store values
 					$sql = " INSERT INTO cat_op_conf(fk_cat_id, param_type, param_name, param_value) " ;
-	    			$sql .= " VALUES ($1, $2, $3)";
-	    			$v = array($cat_insert_id,'get_capabilities_get','');
-					$t = array('i','s','s');
+	    			$sql .= " VALUES ($1, $2, $3, $4)";
+	    			$v = array($cat_insert_id,$op_category,$op_type_value,$value);
+					$t = array('i','s','s','s');
 					$res = db_prep_query($sql,$v,$t);
 					if(!$res){
 						db_rollback();	
@@ -365,9 +364,6 @@
 		}
 		
 		
-		
-		
-		
 		//Commit Changes
 		db_commit();
 		
@@ -375,17 +371,12 @@
 	}
 	
 	public function displayCatalog(){
-		echo "Catalog Details";
-		echo "<br>id: " . $this->cat_id . " <br>";
-		echo "Version: " . $this->cat_version . " <br>";
-		echo "Title: " . $this->cat_title . " <br>";
-		echo "Abstract: " . $this->cat_abstract . " <br>";
-		echo "Capabilitiesrequest: " . $this->cat_op_getcapabilities . " <br>";
-		echo "Getrecordsrequest: " . $this->cat_op_getrecords . " <br>";
-		echo "Getrecordbyidrequest: " . $this->cat_op_getrecordbyid . " <br>";
-		echo "Describerecord: " . $this->cat_op_describerecord . " <br>";
-
-		echo "<hr>";
+		echo "Your Catalog Has Been Successfully Added <br />";
+		echo "Catalog Details: <br/>";
+		echo "Id: " . $this->cat_id . " <br />";
+		echo "Version: " . $this->cat_version . " <br />";
+		echo "Title: " . $this->cat_title . " <br />";
+		echo "Abstract: " . $this->cat_abstract . " <br />";
 		
 	}