fixed xsd types in TableAjax

SE/se-lib/TableAjax.php

@@ -1655,17 +1655,17 @@ var p5UI_TableAjax_generateFunctionNode = function(funObj, rowPK, props) {
 				switch (props.type || 'string') {
 						case "number":
 								if (placeHolder == undefined) placeHolder = priv.options.types.number.placeHolder;
-								placeHolder = (placeHolder === true || placeHolder == undefined) ? '10..20 =50' : placeHolder === false ? '' : placeHolder;
+								placeHolder = (placeHolder === true || placeHolder == undefined) ? '' : placeHolder === false ? '' : placeHolder;
 								if (tooltip == undefined) tooltip = priv.options.types.number.filterTooltip;
-								tooltip = (tooltip === true || tooltip == undefined) ? 'Values 10 to 20:<br/>10..20<br/>Values exactly 50:<br/>=50' : tooltip === false ? '' : tooltip;
+								tooltip = (tooltip === true || tooltip == undefined) ? '' : tooltip === false ? '' : tooltip;
 								elem = $('<input placeholder="{0}" class="filter" type="text" />'.f(placeHolder));
 								elem.on('keyup', {column: column}, priv.filterChanged);
 								break;
 						case "date":
 								if (placeHolder == undefined) placeHolder = priv.options.types.date.placeHolder;
-								placeHolder = (placeHolder === true || placeHolder == undefined) ? '-7..0' : placeHolder === false ? '' : placeHolder;
+								placeHolder = (placeHolder === true || placeHolder == undefined) ? '' : placeHolder === false ? '' : placeHolder;
 								if (tooltip == undefined) tooltip = priv.options.types.date.filterTooltip;
-								tooltip = (tooltip === true || tooltip == undefined) ? 'Today:<br/>0..1<br/>A week today excluded:<br/>-7..0' : tooltip === false ? '' : tooltip;
+								tooltip = (tooltip === true || tooltip == undefined) ? '' : tooltip === false ? '' : tooltip;
 								elem = $('<div><input placeholder="{0}" class="filter" type="text" /></div>'.f(placeHolder));
 
 								if (priv.options.types.date.datePicker === true || priv.options.types.date.datePicker == undefined)
@@ -6079,24 +6079,25 @@ jQuery(document).ready(function(){
 			}
 			$columnConfig->xsdType = $acl->getXsdFieldType($col);
 			if ($columnConfig->xsdType) {
-				$ex = explode(":", $columnConfig->xsdType);
-				switch ($ex[0]) {
+				list($prefix, $typeName, $refTypeName) = explode(":", $columnConfig->xsdType);
+				DBG::log([$prefix, $typeName, $refTypeName], 'array', "col '{$col}'");
+				switch ($prefix) {
 					case 'ref':
 					case 'alias_ref':
-						if (3 != count($ex)) throw new HttpException("Schema Error for field({$col}) xsdType({$columnConfig->xsdType})", 500);
+						if (!$refTypeName) throw new HttpException("Schema Error for field({$col}) xsdType({$columnConfig->xsdType})", 500);
 						$columnConfig->type = 'ref';
-						$columnConfig->xsdRefUri = Api_WfsNs::getNsUri($ex[1]);
-						$columnConfig->xsdRefType = $ex[2];
-						$columnConfig->xsdRefNsPrefix = $ex[1];
+						$columnConfig->xsdRefUri = Api_WfsNs::getNsUri($typeName);
+						$columnConfig->xsdRefType = $refTypeName;
+						$columnConfig->xsdRefNsPrefix = $typeName;
 						break;
 					case 'xsd':
-						switch ($ex[1]) {
+						switch ($typeName) {
 							case 'string': $columnConfig->type = 'string'; break;
-							case 'ind': $columnConfig->type = 'number'; break;// TODO: bug 'ind'?
+							case 'integer': $columnConfig->type = 'number'; break;
 						}
 						break;
 					case 'p5':
-						switch ($ex[1]) {
+						switch ($typeName) {
 							case 'alias': {
 								$format = $acl->getXsdFieldParam($col, 'format');
 								if ($format) $columnConfig->format = $format;