Merge branch 'master' of https://github.com/intersystems-ru/iKnowDoc

Author: Beduin

CSP/csp/docsearch/js/app/app-controller.js

@@ -38,11 +38,10 @@ searchApp
 		$scope.link="http://"+ location.host +"/csp/docbook/DocBook.UI.Page.cls?KEY=";
 
 		$scope.SwitchClick = function(){
-			if($scope.frankenshtein == true){
+			if($scope.frankenshtein == true)
 				$scope.frankenshtein = false;
-			}
-			else {
-				$scope.frankenshtein = true;}
+			else
+				$scope.frankenshtein = true;
 			}
 		$scope.SwitchClickV2 = function(){
 			$scope.SwitchClick();
@@ -58,22 +57,22 @@ searchApp
 			}
 		});	
 
-		$scope.phraseClear = function() {
+		$scope.phraseClear = function () {
 			$scope.search.phrase = "";
 			$scope.makeSearch();
 		}
 
-		$scope.anyWordsClear = function() {
+		$scope.anyWordsClear = function () {
 			$scope.search.anyWords = "";
 			$scope.makeSearch();
 		}
 
-		$scope.withoutClear = function() {
+		$scope.withoutClear = function () {
 			$scope.search.without = "";
 			$scope.makeSearch();
 		}
 
-		$scope.clearAll = function() {
+		$scope.clearAll = function () {
 			$scope.search.words = "";
 			$scope.search.phrase = "";
 			$scope.search.anyWords = "";
@@ -86,13 +85,13 @@ searchApp
 				$http.get(baseUrl + 'GetSimilar/' + $scope.search.words)
 					.then(function(response) {
 						$scope.searchItems = response.data.entities;
+						
 						if(angular.isDefined($scope.searchItems))
-							if($scope.searchItems.length != 0 ){
+							if($scope.searchItems.length != 0 )
 								if (($scope.searchItems[0].value == " ") || ($scope.search.words == ""))
-								$scope.inputToggle = false;
+									$scope.inputToggle = false;
 								else 
-								$scope.inputToggle = true;
-				}
+									$scope.inputToggle = true;
 				});
 				$scope.inputToggle = false;
 			}

src/cls/iKnowDoc/Search/SearchPages.cls

@@ -28,8 +28,8 @@ ClassMethod FormQuery(obj) As %Status
 	// all these words:
 	//set words=obj.words
 	set words= $ZCONVERT(obj.words,"O","HTML")
-	set words = $REPLACE(words,"é","é")
-	set words = $REPLACE(words,"ñ","ñ")
+	/*set words = $REPLACE(words,"é","é")
+	set words = $REPLACE(words,"ñ","ñ")*/
 	// this exact word or phrase:
 	set phrase=obj.phrase
 	// any of these words:
@@ -185,8 +185,8 @@ ClassMethod FormQuery(obj) As %Status
 	  	while subresult.%Next() {
 	  		if subresult.text'="" {
 		  		set subtextKey = result.docKey_"#"_subresult.textKey
-		  		//set textInfoJSON = {"text":(subresult.text), "textKey":(subtextKey)}
-		  		set textInfoJSON = {"text":($ZCONVERT(subresult.text,"I","HTML")), "textKey":(subtextKey)}
+		  		set textInfoJSON = {"text":(subresult.text), "textKey":(subtextKey)}
+		  		//set textInfoJSON = {"text":($ZCONVERT(subresult.text,"I","HTML")), "textKey":(subtextKey)}
 		  		do tJSON.textInfo.%Push(textInfoJSON)
 		  	}
 	  	}