Просмотр исходного кода

fixed Typespecial score function

Piotr Labudda 9 лет назад
Родитель
Сommit
c6eaafdc66
1 измененных файлов с 18 добавлено и 18 удалено
  1. 18 18
      SE/se-lib/Typespecial.php

+ 18 - 18
SE/se-lib/Typespecial.php

@@ -12,41 +12,41 @@ Lib::loadClass('TypespecialBase');
  *     PARAM_OUT
  *       DANE ALIAS do komórki z innej tabeli
  *     PARAM_WHERE
- * 
+ *
  * example:
  *   TYPESPECIAL 'id_project'
  *     PARAM_IN    ALIAS_ID -> 1260 -> IN7_DZIENNIK_KORESP.ID_PROJECT
  *     PARAM_OUT
  *       DANE ALIAS do komórki z innej tabeli
- * 
+ *
  *** TODO: new struct, TODO: remove above
  *   TYPESPECIAL
  *     PARAM_OUT format: dla PARAM_IN = vcol pokzać listę, a dla PARAM_IN = col i perm W pokazać select/search
  *       PARAM_IN alias do komórki dla której ma się pokazać PARAM_OUT
  *       DANE alias do komórki/zmiennej z danymi do podstawienia
  *     PARAM_WHERE sql params - join tables
- * 
+ *
  * $_SESSION['Typespecial_Cache'] = array(
  *   map = array(
  *     fieldID => typesiecialID
  *   ),
  *   typesiecialID => Typespecial Data
  * )
- * 
+ *
  * Typespecial types:
  *   - typespecial function for form fields in edit, create
  *   - typespecial view function for virtual fields
- * 
+ *
  * $_SESSION['USERS2_MARKETING_COLUMN']['RELATIVEDB']['SRC_COLUMN']['INTERNET_STATUS']="temp_USERS2_INTERNET_STATUS";
  * $_SESSION['USERS2_MARKETING_COLUMN']['RELATIVEDB']['TRG_COLUMN']['INTERNET_STATUS']="temp_USERS2_INTERNET_STATUS.USERS2_INTERNET_STATUS";
  * $_SESSION['USERS2_MARKETING_COLUMN']['RELATIVEDB']['TRG_COLUMN_NAME']['INTERNET_STATUS']="temp_USERS2_INTERNET_STATUS.USERS2_INTERNET_STATUS";
  * $_SESSION['USERS2_MARKETING_COLUMN']['RELATIVEDB']['JOINQUERY']['temp_USERS2_INTERNET_STATUS']="LEFT JOIN temp_USERS2_INTERNET_STATUS as temp_USERS2_INTERNET_STATUS on temp_USERS2_INTERNET_STATUS.S_ADDRESS_STREET=USERS2_MARKETING.S_ADDRESS_STREET ";
- * 
+ *
  * used `CRM_LISTA_ZASOBOW`.`TYPE`:
-			'TYPESPECIAL'				
-			'PARAM_IN'					
-			'PARAM_OUT'					
-			'PARAM_WHERE'				
+			'TYPESPECIAL'
+			'PARAM_IN'
+			'PARAM_OUT'
+			'PARAM_WHERE'
 			'SQL_LIKE'					=> "`fld` LIKE '{param}'"
 			'SQL_LIKE_PR'				=> "`fld` LIKE '%{param}%'"
 			'SQL_NOT_LIKE'			=> "`fld` NOT LIKE '{param}'"
@@ -60,7 +60,7 @@ Lib::loadClass('TypespecialBase');
 			'SQL_NOT_IN'				=> "`fld` NOT IN({params})"
 			'SQL_BETWEEN'				=> "`fld` BETWEEN {params1} AND {params2}"
 			'SQL_NOT_BETWEEN'		=> "`fld` NOT BETWEEN {params1} AND {params2}"
- * 
+ *
  *
 'TYPESPECIAL','PARAM_IN','PARAM_OUT','PARAM_WHERE','SQL_LIKE','SQL_LIKE_PR','SQL_NOT_LIKE','SQL_EQUAL','SQL_NOT_EQUAL','SQL_IS_EMPTY','SQL_IS_NOT_EMPTY','SQL_IS_NULL','SQL_IS_NOT_NULL','SQL_IN','SQL_NOT_IN','SQL_BETWEEN','SQL_NOT_BETWEEN'
 
@@ -206,7 +206,7 @@ if(V::get('DBG_TS', 0, $_GET) > 0){echo'<pre style="max-height:200px;overflow:au
 			[ALIAS_ID] => 0
 			[TYPE] => DANE
 			[DESC] => NORMAL
-			[ALIAS_DESC] => 
+			[ALIAS_DESC] =>
 			[PARAM_ID] => 4526
 			[PARAM_DESC] => IN
 			[TYPE_ID] => 4519
@@ -461,7 +461,7 @@ if(V::get('DBG_TS', 0, $_GET) > 0){echo "\nTODO: SQL_EQUAL count(sqlValues) < 2\
 								$sqlValues[] = "'{$_SESSION['ADM_COMPANY']}'";
 								break;
 							default:
-								
+
 						}
 					} else {
 						if(V::get('DBG_TS', 0, $_GET) > 0){echo "\nTODO: SQL_LIKE unknown ALIAS_DESC ($vFltr->ALIAS_DESC) \n";}
@@ -485,7 +485,7 @@ if(V::get('DBG_TS', 0, $_GET) > 0){echo "\nTODO: SQL_EQUAL count(sqlValues) < 2\
 
 	/**
 	 * Create sql query by given filters
-	 * 
+	 *
 	 * @requires before $this->convertFilters();
 	 * @uses $this->filters
 	 * @uses $this->fldAliasList
@@ -698,7 +698,7 @@ jQuery('#typeahead-{$fName}').typeahead({
 	}
 	tsNode.attr('name', '{$fName}');
 	tsNode.attr('tabindex', fldNode.attr('tabindex'));
-	
+
 
 	tsNode.selectize({
 		theme: 'typespecial',
@@ -758,7 +758,7 @@ jQuery('#typeahead-{$fName}').typeahead({
 		score: function(query) {
 			var score = this.getScoreFunction(query);
 			return function(item) {
-				var retScore = 0, lName = item.name.toLowerCase(), lQuery = query.toLowerCase();
+				var retScore = 0, lName = ('' + item.name).toLowerCase(), lQuery = query.toLowerCase();
 				if (query.search(' ') > -1) {
 					retScore = score(item);
 				}
@@ -942,7 +942,7 @@ if(V::get('DBG_TS', 0, $_GET) > 1){echo'<pre style="max-height:200px;overflow:au
 if(V::get('DBG_TS', 0, $_GET) > 1){echo'<pre style="max-height:200px;overflow:auto;border:1px solid orange;text-align:left;">this->tblAliasList (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($this->tblAliasList);echo'</pre>';}// TODO: RMME
 if(V::get('DBG_TS', 0, $_GET) > 1){echo'<pre style="max-height:200px;overflow:auto;border:1px solid orange;text-align:left;">this (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($this);echo'</pre>';}// TODO: RMME
 
-		$retFldName = ''; 
+		$retFldName = '';
 		$sqlWhereAdd = array();
 		$tblFound = null;
 		foreach ($_SESSION['Typespecial_Cache']['sqlTablesInfo'] as $vTblInfo) {
@@ -1008,7 +1008,7 @@ if(V::get('DBG_TS', 0, $_GET) > 1){echo'<pre style="max-height:200px;overflow:au
 		$sqlLimit = "limit {$sqlLimit}";
 		$sqlFrom = implode(", ", $sqlFrom);
 		$sql = "select " . implode("\n\t\t,", $sqlSelect) . "
-			from {$sqlFrom} 
+			from {$sqlFrom}
 			where {$this->sqlQuery->where}
 				{$sqlWhereAdd}
 			{$sqlLimit}