[Mapbender-commits] r7800 - in trunk/mapbender/http: php plugins

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-05-09 08:59:25 -0700 (Mon, 09 May 2011)
New Revision: 7800

Modified:
   trunk/mapbender/http/php/wms.php
   trunk/mapbender/http/plugins/mb_metadata_server.php
Log:
Bugfixes

Modified: trunk/mapbender/http/php/wms.php
===================================================================
--- trunk/mapbender/http/php/wms.php	2011-05-09 13:04:48 UTC (rev 7799)
+++ trunk/mapbender/http/php/wms.php	2011-05-09 15:59:25 UTC (rev 7800)
@@ -251,17 +251,17 @@
 #Insert contact information
 
 #Creating "Contact Information" node
-if (validate($wms_row['contactperson']) &&
+/*if (validate($wms_row['contactperson']) &&
 	validate($wms_row['contactorganization']) &&
 	validate($wms_row['contactposition']) && 
 	validate($wms_row['address']) && 
 	validate($wms_row['city']) && 
 	validate($wms_row['stateorprovince']) && 
-	validate($wms_row['postcode']) /*AND validate($wms_row['country'])*/ &&
+	validate($wms_row['postcode']) && //AND validate($wms_row['country']) &&
 	validate($wms_row['contactvoicetelephone']) && 
 	validate($wms_row['contactfacsimiletelephone']) &&
 	validate($wms_row['contactelectronicmailaddress']))
-{
+{*/
 $contactInformation = $doc->createElement("ContactInformation");
 $contactInformation = $service->appendChild($contactInformation);
 

Modified: trunk/mapbender/http/plugins/mb_metadata_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_server.php	2011-05-09 13:04:48 UTC (rev 7799)
+++ trunk/mapbender/http/plugins/mb_metadata_server.php	2011-05-09 15:59:25 UTC (rev 7800)
@@ -737,7 +737,7 @@
 INSERT INTO mb_metadata (link, uuid, origin, title, abstract, format, ref_system, export2csw, inspire_top_consistence, tmp_reference_1, tmp_reference_2, lineage, spatial_res_type, spatial_res_value, inspire_charset, createdate) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, now())
 
 SQL;
-		$v = array($link, $uuid, $origin, $title, $abstract, $format, $ref_system, $export2csw,$inspire_top_consistence,$tmp_reference_2,$tmp_reference_2,$lineage,$spatial_res_type,$spatial_res_value,$inspire_charset);
+		$v = array($link, $uuid, $origin, $title, $abstract, $format, $ref_system, $export2csw,$inspire_top_consistence,$tmp_reference_1,$tmp_reference_2,$lineage,$spatial_res_type,$spatial_res_value,$inspire_charset);
 		$t = array('s','s','s','s','s','s','s','b','b','s','s','s','s','s','s');
 		$res = db_prep_query($sql,$v,$t);
 		if (db_error()) {