[Mapbender-commits] r4462 - branches/mifan_dev/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: mifan
Date: 2009-07-31 13:57:30 -0400 (Fri, 31 Jul 2009)
New Revision: 4462

Modified:
   branches/mifan_dev/mapbender/http/javascripts/mod_searchCSW_ajax.php
Log:
modifed cat ui

Modified: branches/mifan_dev/mapbender/http/javascripts/mod_searchCSW_ajax.php
===================================================================
--- branches/mifan_dev/mapbender/http/javascripts/mod_searchCSW_ajax.php	2009-07-31 09:53:14 UTC (rev 4461)
+++ branches/mifan_dev/mapbender/http/javascripts/mod_searchCSW_ajax.php	2009-07-31 17:57:30 UTC (rev 4462)
@@ -72,50 +72,15 @@
 	
 	var global_is_advanced = false;
 
+	//defaults
+	var getrecords_media = 'GET';
+	var getrecords_query = 'CQL';
+	
 	//set server side URL for query builder
 	var phpUrl        = '../php/mod_searchCatQueryBuilder_server.php?<?php echo $urlParameters;?>';
 
 
-	//Build CSW query and search
-	function mod_searchCSW(){
-		var simplesearchterm = document.getElementById('basic_search').value;
-		
-		//check for simple or advanced
-		if(global_is_advanced){
-			//handle advanced search
-			imageOn();
-			parent.mb_ajax_json(phpUrl, {"command":"getrecordsadvanced"}, function (json, status) {
-				imageOff();
-				displayRecords(json.cats);
-				//displayGroups(json.group);
-			});
-				
-		}
-		else{
-			//handle simple search
-			alert('1');
-			
-			//imageOn();
-			parent.mb_ajax_json(phpUrl, {"command":"getrecordssimple", "search":simplesearchterm }, function (json, status) {
-				//imageOff();
-				alert('3');
-				displayRecords(json.cats);
-				//displayGroups(json.group);
-			});
-				
-		}	
-		
-	}
 
-	// Display Catalog records returned by getrecords
-	function displayRecords(catarray){
-		alert('2');
-		for (var i=0;i<catarray.length; i++) {
-			alert(catarray[i]);
-		}
-	}
-
-
 	function hide_advanced_form(){
 
 		global_is_advanced = false;
@@ -193,6 +158,21 @@
 		html = html + "<fieldset id='cont_options'>";
 		html = html + "<label for='opt_result_cont'><?php echo _mb('No. of Hits'); ?>:</label>";
 		html = html + "<input type='text' id='opt_result_cont' name='opt_result_cont' /> <br /><br />";
+		html = html + "<label for='opt_getrecords_media'><?php echo _mb('Getrecords Medium'); ?>:</label>";
+		html = html + "<select id='opt_getrecords_media' name='opt_getrecords_media'>";
+		html = html + "<option value='get'>GET</option>";
+		html = html + "<option value='post'>POST</option>";
+		html = html + "<option value='post-soap' disabled>SOAP</option>";
+		html = html + "</select>";
+		html = html + "<br /><br />";
+
+		html = html + "<label for='opt_getrecords_query'><?php echo _mb('Query Language'); ?>:</label>";
+		html = html + "<select id='opt_getrecords_query' name='opt_getrecords_query'>";
+		html = html + "<option value='cql'>CQL</option>";
+		html = html + "<option value='filter'>Filter</option>";
+		html = html + "</select>";
+		html = html + "<br /><br />";
+		
 		html = html + "</fieldset>";
 		document.getElementById('options_div').innerHTML=html;
 	}
@@ -352,6 +332,11 @@
 		document.getElementById("resultString").innerHTML = noResultText;
 	}
 
+	function noResultV(val) {
+		document.getElementById("resultTable").style.visibility = 'hidden';
+		document.getElementById("resultString").innerHTML = noResultText+val;
+	}
+
 	function setButtons() {
 		var containerCapabilities = document.getElementById('container_capabilities');
 		var containerButtons      = document.getElementById('container_buttons');
@@ -457,10 +442,75 @@
 			noResult();
 		}
 	}
+
+
+	// Display Catalog records returned by getrecords
+	function displayRecords(catarray){
+	
+		if (catarray.length > 0) {
+			setTableHeader(selectWmsText, CatName, CatAbstract);
+
+			for (var i = 0; i < catarray.length; i++) {
+
+				/*
+				if (global_source == "db" && typeof(guiId) !== "undefined" ) {
+					var onClick = "mod_addWMSfromDB('" + guiId + "', '" + wmsArray[i].id + "')";
+				}		
+				else {
+					var onClick = "mod_addWMSfromfilteredList('" + wmsArray[i].getCapabilitiesUrl + "', '" + wmsArray[i].version + "')";
+				}
+				*/
+				addTableRow(catarray[i].id, catarray[i].title);
+			}
+		}
+		else {
+			noResultV(catarray[0]);
+		}
+		
+	}
+	
+
+
+	//Build CSW query and search
+	function mod_searchCSW(){
+		var simplesearchterm = document.getElementById('basic_search').value;
+		var getrecords_media = document.getElementById('opt_getrecords_media').value;
+		var getrecords_query = document.getElementById('opt_getrecords_query').value;
+		
+		//check for simple or advanced
+		if(global_is_advanced){
+			//handle advanced search
+			imageOn();
+			parent.mb_ajax_json(phpUrl, {"command":"getrecordsadvanced"}, function (json, status) {
+				imageOff();
+				displayRecords(json.cats);
+				//displayGroups(json.group);
+			});
+				
+		}
+		else{
+			//handle simple search
+			imageOn();
+			parent.mb_ajax_json(phpUrl, {"command":"getrecordssimple", "search":simplesearchterm, "getrecordsmedia":getrecords_media,"getrecordsquery":getrecords_query }, function (json, status) {
+				imageOff();
+				displayRecords(json.cats);
+			});
+				
+		}	
+		
+	}
+
+		
 	-->
 	</script>
 	<?php include("../include/dyn_css.php"); ?>
 	<script type="text/javascript">
+
+	var CatName = '<?php echo _mb("Catalog Name");?>';
+	var CatAbstract = '<?php echo _mb("Cat abstract");?>';
+	var CatTitle = '<?php echo _mb("Cat Title");?>';
+
+	
 	var wmsNameText = '<?php echo _mb("WMS name");?>';
 	var wmsAbstractText = '<?php echo _mb("WMS abstract");?>';
 	var selectWmsText = '<?php echo _mb("Please select a WMS") . ":";?>';
@@ -529,14 +579,13 @@
 </form>
  -->
  
- 
-<!-- 
+  
 <p id="progressIndicator" name="progressIndicator">
 	<img src="../img/indicator_wheel.gif" />
 	<?php echo _mb("Loading"); ?> ... 
 </p>
- -->
 
+
 <h2 id="resultString" name="resultString"></h2>
 
 <table id="resultTable" name="resultTable">