*** empty log message ***

[modules/smesh.git] / doc / salome / gui / SMESH / whfhost.js

diff --git a/doc/salome/gui/SMESH/whfhost.js b/doc/salome/gui/SMESH/whfhost.js
index a30564d416176817fee8cf833f37df86e7a9749b..167acc45915b05c012cd31f07c821f7b6471945f 100755 (executable)
--- a/doc/salome/gui/SMESH/whfhost.js
+++ b/doc/salome/gui/SMESH/whfhost.js
@@ -1,3 +1,4 @@
+//     WebHelp 5.10.003\r
 var gsSK2=null;\r
 var gsSK=null;\r
 var gsFtsBreakChars="\t\r\n\"\\ .,!@#$%^&*()~'`:;<>?/{}[]|+-=\x85\x92\x93\x94\x95\x96\x97\x99\xA9\xAE\xB7";\r
@@ -35,6 +36,7 @@ var goErrFont=null;
 var goHoverFont=null;\r
 var gsABgColor="#cccccc";\r
 var gbWhFHost=false;\r
+var gbFirst=false;\r
 \r
 function setBackground(sBgImage)\r
 {\r
@@ -90,6 +92,26 @@ function addFtsInfo(sPPath,sDPath,sFtsFile)
        gaData[gaData.length]=new ftsInfo(sPPath,sDPath,sFtsFile);\r
 }\r
 \r
+function onLoadXMLError()\r
+{\r
+       if(gnLoadFts==1)\r
+       {\r
+               var aFCD=new Array();\r
+               var aFTCD=new Array();\r
+               ftsReady(aFCD,aFTCD);\r
+       }\r
+       else if(gnLoadFts==3)\r
+       {\r
+               var aTopics=new Array();\r
+               putFtsTData(aTopics);\r
+       }\r
+       else if(gnLoadFts==2)\r
+       {\r
+               putFtsWData(aFtsContents);\r
+               var aFtsContents=new Array();\r
+       }\r
+}\r
+\r
 function putDataXML(xmlDoc,sDocPath)\r
 {\r
        if(gnLoadFts==1)\r
@@ -267,7 +289,7 @@ function loadFts()
                                var sLangId=aProj[0].sLangId;\r
                                for(var i=0;i<aProj.length;i++)\r
                                {\r
-                                       if(aProj[i].sFts!=null&&aProj[i].sFts!=""&&aProj[i].sLangId==sLangId)\r
+                                       if(aProj[i].sFts&&aProj[i].sLangId==sLangId)\r
                                        {\r
                                                addFtsInfo(aProj[i].sPPath,aProj[i].sDPath,aProj[i].sFts);\r
                                        }\r
@@ -312,11 +334,14 @@ function loadData2(sFile)
 function findFTSKey()\r
 {\r
        gaTI=new Array();\r
-       gnCurrentOp=0;\r
+       gnCurrentOp=1;\r
        gbNot=false;\r
        displayMsg(gsSearchMsg);\r
        if(gsSK!="")\r
+       {\r
+               gbFirst=true;\r
                findOneKey();\r
+       }\r
 }\r
 \r
 function findOneKey()\r
@@ -360,7 +385,6 @@ function findOneKey()
                        return;\r
                }\r
                findOneKey();\r
-               return;\r
        }\r
        else{\r
                displayTopics();\r
@@ -370,6 +394,8 @@ function findOneKey()
 \r
 function checkAgain()\r
 {\r
+       gsCheckKey = "";\r
+       gnIndexNum = 0;\r
        gsSK=gsSK2;\r
        gsSK2=null;\r
        if(gsSK!=null)\r
@@ -381,7 +407,7 @@ function displayTopics()
        var sHTML="";\r
        var sLine="";\r
        for(var i=0;i<gaTI.length;i++){\r
-               sLine+="<dt><nobr><a href='"+_textToHtml(gaTI[i].sTopicURL)+"'>"+_textToHtml(gaTI[i].sTopicTitle)+"</a></nobr></dt>";\r
+               sLine+="<dt><nobr><a href='"+gaTI[i].sTopicURL+"'>"+_textToHtml(gaTI[i].sTopicTitle)+"</a></nobr></dt>";\r
                if(i>>4<<4==i)\r
                {\r
                        sHTML+=sLine;\r
@@ -472,7 +498,10 @@ function ftsFindKeyword()
                                aTI=mergeTopics(aTI,aTIPart);\r
                }\r
                if(mergewithPreviousResult(aTI))\r
+               {\r
+                       gbFirst=false;\r
                        findOneKey();\r
+               }\r
                else\r
                        checkAgain();\r
        }\r
@@ -483,7 +512,7 @@ function mergewithPreviousResult(aTI)
        if(aTI!=null&&aTI.length!=0)\r
        {\r
                var nNumTopics=aTI.length;\r
-               if(gnCurrentOp==0){\r
+               if(gnCurrentOp==0||gbFirst){\r
                        if(gbNot){\r
                                displayMsg(gsHelpCannotSearch);\r
                                return false;\r
@@ -836,7 +865,7 @@ function GetStem(szWord)
        var csStem="";\r
        for(var iStem=0;iStem<aStems.length;iStem++){\r
 \r
-               if(aStems[iStem].length>=szWord.length-1)       break;\r
+               if(aStems[iStem].length>=szWord.length-1)       continue;\r
                nStemPos=szWord.lastIndexOf(aStems[iStem]);\r
                if(nStemPos>0){\r
                        var cssub=szWord.substring(nStemPos);\r