Menu
▾
▴
SF.net SVN: docbook:[9516] branches/mobile/xsl/mobile
|
From: <gih...@us...> - 2012-08-02 20:19:37
|
Revision: 9516
http://docbook.svn.sourceforge.net/docbook/?rev=9516&view=rev
Author: gihanchanuka
Date: 2012-08-02 20:19:29 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Successfully created search feature.
Added the search feature. Have do mobile settings/keep history of user settings and act appa according to those.
Modified Paths:
--------------
branches/mobile/xsl/mobile/build.properties
branches/mobile/xsl/mobile/build.xml
branches/mobile/xsl/mobile/template_mobile/content/search/nwSearchFnt.js
branches/mobile/xsl/mobile/template_mobile/js/jquery.cookie.min.js
branches/mobile/xsl/mobile/xsl/mobile.xsl
Modified: branches/mobile/xsl/mobile/build.properties
===================================================================
--- branches/mobile/xsl/mobile/build.properties 2012-08-01 09:03:21 UTC (rev 9515)
+++ branches/mobile/xsl/mobile/build.properties 2012-08-02 20:19:29 UTC (rev 9516)
@@ -11,7 +11,7 @@
output-dir=www
# The set of files to be excluded:
-# add excluded files separated by "," symbol
+# Add excluded files separated by ","/ comma.
# Ex: ch02.*.html,ch03.html => will be excluded all files those are started with [ch02. and .html and any thing between] files and ch03.html file.
indexer-excluded-files=menubar.html,settings.html,toc.html
Modified: branches/mobile/xsl/mobile/build.xml
===================================================================
--- branches/mobile/xsl/mobile/build.xml 2012-08-01 09:03:21 UTC (rev 9515)
+++ branches/mobile/xsl/mobile/build.xml 2012-08-02 20:19:29 UTC (rev 9516)
@@ -112,11 +112,11 @@
<path refid="classpath"/>
<pathelement location="${xercesImpl.jar}"/>
<pathelement location="${xml-apis.jar}"/>
- <!-- <pathelement location="/usr/share/java/xercesImpl.jar"/> -->
- <!-- <pathelement location="/usr/share/java/xml-apis.jar"/> -->
+ <pathelement location="/usr/share/java/xercesImpl.jar"/>
+ <pathelement location="/usr/share/java/xml-apis.jar"/>
<!-- Gentoo Linux friendly default classpath-->
- <pathelement location="/usr/share/xerces-2/lib/xercesImpl.jar"/>
- <pathelement location="/usr/share/xml-commons/lib/xml-apis.jar"/>
+ <!-- <pathelement location="/usr/share/xerces-2/lib/xercesImpl.jar"/>-->
+ <!-- <pathelement location="/usr/share/xml-commons/lib/xml-apis.jar"/>-->
</classpath>
</java>
Modified: branches/mobile/xsl/mobile/template_mobile/content/search/nwSearchFnt.js
===================================================================
--- branches/mobile/xsl/mobile/template_mobile/content/search/nwSearchFnt.js 2012-08-01 09:03:21 UTC (rev 9515)
+++ branches/mobile/xsl/mobile/template_mobile/content/search/nwSearchFnt.js 2012-08-02 20:19:29 UTC (rev 9516)
@@ -6,86 +6,155 @@
www.nexwave.biz Nadege Quaine
http://kasunbg.blogspot.com/ Kasun Gajasinghe
*/
-
//string initialization
-var htmlfileList = "htmlFileList.js";
+var htmlfileList = "htmlFileInfoList.js";
var htmlfileinfoList = "htmlFileInfoList.js";
var useCJKTokenizing = false;
-/* Cette fonction verifie la validite de la recherche entrre par l utilisateur */
-function Verifie(ditaSearch_Form) {
+var w = new Object();
+var scoring = new Object();
- // Check browser compatibitily
- if (navigator.userAgent.indexOf("Konquerer") > -1) {
+var searchTextField = '';
+var no = 0;
+var noWords = 0;
+var partialSearch = "<font class=\"highlightText\">There is no page containing all the search terms.<br>Partial results:</font>";
+var warningMsg = '<div style="padding: 5px;margin-right:5px;;background-color:#FFFF00;">';
+warningMsg += '<b>Please note that due to security settings, Google Chrome does not highlight';
+warningMsg += ' the search results in the right frame.</b><br>';
+warningMsg += 'This happens only when the WebHelp files are loaded from the local file system.<br>';
+warningMsg += 'Workarounds:';
+warningMsg += '<ul>';
+warningMsg += '<li>Try using another web browser.</li>';
+warningMsg += '<li>Deploy the WebHelp files on a web server.</li>';
+warningMsg += '</div>';
+txt_filesfound = 'Results';
+txt_enter_at_least_1_char = "You must enter at least one character.";
+txt_enter_more_than_10_words = "Only first 10 words will be processed.";
+txt_browser_not_supported = "Your browser is not supported. Use of Mozilla Firefox is recommended.";
+txt_please_wait = "Please wait. Search in progress...";
+txt_results_for = "Results for: ";
- alert(txt_browser_not_supported);
- return;
- }
+/* This function verify the validity of search input by the user
+ Cette fonction verifie la validite de la recherche entrre par l utilisateur */
+function Verifie(searchForm) {
+ // Check browser compatibility
+ if (navigator.userAgent.indexOf("Konquerer") > -1) {
- var expressionInput = document.ditaSearch_Form.textToSearch.value;
- //Set a cookie to store the searched keywords
- $.cookie('textToSearch', expressionInput);
+ alert(txt_browser_not_supported);
+ return;
+ }
+ searchTextField = trim(document.searchForm.textToSearch.value);
+ searchTextField = searchTextField.replace(/['"]/g, '');
+ var expressionInput = searchTextField;
+ $.cookie('textToSearch', expressionInput);
- if (expressionInput.length < 1) {
+ if (expressionInput.length < 1) {
- // expression is invalid
- alert(txt_enter_at_least_1_char);
- // reactive la fenetre de search (utile car cadres)
- document.ditaSearch_Form.textToSearch.focus();
- }
- else {
+ // expression is invalid
+ alert(txt_enter_at_least_1_char);
+ // reactive la fenetre de search (utile car cadres)
- // Effectuer la recherche
- Effectuer_recherche(expressionInput);
-
- // reactive la fenetre de search (utile car cadres)
- document.ditaSearch_Form.textToSearch.focus();
+ document.searchForm.textToSearch.focus();
+ } else {
+ var splitSpace = searchTextField.split(" ");
+ var splitWords = [];
+ for (var i = 0; i < splitSpace.length; i++) {
+ var splitDot = splitSpace[i].split(".");
+ for (var i1 = 0; i1 < splitDot.length; i1++) {
+ var splitColon = splitDot[i1].split(":");
+ for (var i2 = 0; i2 < splitColon.length; i2++) {
+ var splitDash = splitColon[i2].split("-");
+ for (var i3 = 0; i3 < splitDash.length; i3++) {
+ if (splitDash[i3].split("").length > 0) {
+ splitWords.push(splitDash[i3]);
+ }
+ }
+ }
+ }
}
+ noWords = splitWords;
+ if (noWords.length > 9) {
+ // Allow to search maximum 10 words
+ alert(txt_enter_more_than_10_words);
+ expressionInput = '';
+ for (var x = 0; x < 10; x++) {
+ expressionInput = expressionInput + " " + noWords[x];
+ }
+ Effectuer_recherche(expressionInput);
+ document.searchForm.textToSearch.focus();
+ } else {
+ // Effectuer la recherche
+ expressionInput = '';
+ for (var x = 0; x < noWords.length; x++) {
+ expressionInput = expressionInput + " " + noWords[x];
+ }
+ Effectuer_recherche(expressionInput);
+ // reactive la fenetre de search (utile car cadres)
+ document.searchForm.textToSearch.focus();
+ }
+ }
}
-var stemQueryMap = new Array(); // A hashtable which maps stems to query words
+var stemQueryMap = new Array(); // A hashtable which maps stems to query words
/* This function parses the search expression, loads the indices and displays the results*/
function Effectuer_recherche(expressionInput) {
- /* Display a waiting message */
- //DisplayWaitingMessage();
+ /* Display a waiting message */
+ //DisplayWaitingMessage();
- /*data initialisation*/
- var searchFor = ""; // expression en lowercase et sans les caracte res speciaux
- //w = new Object(); // hashtable, key=word, value = list of the index of the html files
- scriptLetterTab = new Scriptfirstchar(); // Array containing the first letter of each word to look for
- var wordsList = new Array(); // Array with the words to look for
- var finalWordsList = new Array(); // Array with the words to look for after removing spaces
- var linkTab = new Array();
- var fileAndWordList = new Array();
- var txt_wordsnotfound = "";
+ /*data initialisation*/
+ var searchFor = ""; // expression en lowercase et sans les caracte res speciaux
+ //w = new Object(); // hashtable, key=word, value = list of the index of the html files
+ scriptLetterTab = new Scriptfirstchar(); // Array containing the first letter of each word to look for
+ var wordsList = new Array(); // Array with the words to look for
+ var finalWordsList = new Array(); // Array with the words to look for after removing spaces
+ var linkTab = new Array();
+ var fileAndWordList = new Array();
+ var txt_wordsnotfound = "";
- /*nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux*/
- searchFor = expressionInput.toLowerCase().replace(/<\//g, "_st_").replace(/\$_/g, "_di_").replace(/\.|%2C|%3B|%21|%3A|@|\/|\*/g, " ").replace(/(%20)+/g, " ").replace(/_st_/g, "</").replace(/_di_/g, "%24_");
+ // --------------------------------------
+ // Begin Thu's patch
+ /*nqu: expressionInput, la recherche est lower cased, plus remplacement des char speciaux*/
+ //The original replacement expression is:
+ //searchFor = expressionInput.toLowerCase().replace(/<\//g, "_st_").replace(/\$_/g, "_di_").replace(/\.|%2C|%3B|%21|%3A|@|\/|\*/g, " ").replace(/(%20)+/g, " ").replace(/_st_/g, "</").replace(/_di_/g, "%24_");
+ //The above expression was error prone because it did not deal with words that have a . as part of the word correctly, for example, document.txt
- searchFor = searchFor.replace(/ +/g, " ");
- searchFor = searchFor.replace(/ $/, "").replace(/^ /, "");
+ //Do not automatically replace a . with a space
+ searchFor = expressionInput.toLowerCase().replace(/<\//g, "_st_").replace(/\$_/g, "_di_").replace(/%2C|%3B|%21|%3A|@|\/|\*/g, " ").replace(/(%20)+/g, " ").replace(/_st_/g, "</").replace(/_di_/g, "%24_");
- wordsList = searchFor.split(" ");
- wordsList.sort();
+ //If it ends with a period, replace it with a space
+ searchFor = searchFor.replace(/[.]$/, "");
+ // End Thu's Patch
+ // ------------------------------------------
- //set the tokenizing method
- if(typeof indexerLanguage != "undefined" && (indexerLanguage=="zh" || indexerLanguage=="ja" ||indexerLanguage=="ko")){
- useCJKTokenizing=true;
+ searchFor = searchFor.replace(/ +/g, " ");
+ searchFor = searchFor.replace(/ $/, "").replace(/^ /, "");
+
+ wordsList = searchFor.split(" ");
+ wordsList.sort();
+
+ //set the tokenizing method
+ useCJKTokenizing = typeof indexerLanguage != "undefined" && (indexerLanguage == "zh" || indexerLanguage == "ja" || indexerLanguage == "ko");
+ //If Lucene CJKTokenizer was used as the indexer, then useCJKTokenizing will be true. Else, do normal tokenizing.
+ // 2-gram tokenizinghappens in CJKTokenizing,
+ //If doStem then make tokenize with Stemmer
+ var finalArray;
+ if (doStem) {
+ if (useCJKTokenizing) {
+ finalWordsList = cjkTokenize(wordsList);
+ finalArray = finalWordsList;
} else {
- useCJKTokenizing=false;
+ finalWordsList = tokenize(wordsList);
+ finalArray = finalWordsList;
}
- //If Lucene CJKTokenizer was used as the indexer, then useCJKTokenizing will be true. Else, do normal tokenizing.
- // 2-gram tokenizinghappens in CJKTokenizing,
- if(useCJKTokenizing){
- finalWordsList = cjkTokenize(wordsList);
- } else {
- finalWordsList = tokenize(wordsList);
- }
+ } else if (useCJKTokenizing) {
+ finalWordsList = cjkTokenize(wordsList);
+ finalArray = finalWordsList;
+ } else {
//load the scripts with the indices: the following lines do not work on the server. To be corrected
/*if (IEBrowser) {
@@ -96,203 +165,360 @@
* Compare with the indexed words (in the w[] array), and push words that are in it to tempTab.
*/
var tempTab = new Array();
- for (var t in finalWordsList) {
- if (w[finalWordsList[t].toString()] == undefined) {
- txt_wordsnotfound += finalWordsList[t] + " ";
- } else {
- tempTab.push(finalWordsList[t]);
- }
+
+ // ---------------------------------------
+ // Thu's patch
+ //Do not use associative array in for loop, for example:
+ //for(var t in finalWordsList)
+ //it causes errors when finalWordList contains
+ //stemmed words such as: kei from the stemmed word: key
+ for (var t = 0; t < finalWordsList.length; ++t) {
+ var aWord = finalWordsList[t];
+ //w is a Map like Object, use the current word in finalWordList as the key
+ if (w[aWord] == undefined) {
+ txt_wordsnotfound += aWord + " ";
+ } else {
+ tempTab.push(aWord);
+ }
}
finalWordsList = tempTab;
+ //Check all the inputs to see if the root words are in the finalWordsList, if not add them there
+ var inputs = expressionInput.split(' ');
+ // Thu's Patch
+ // -------------------------------------------
- if (finalWordsList.length) {
- //search 'and' and 'or' one time
- fileAndWordList = SortResults(finalWordsList);
+ txt_wordsnotfound = expressionInput;
+ finalWordsList = removeDuplicate(finalWordsList);
- var cpt = fileAndWordList.length;
- for (var i = cpt - 1; i >= 0; i--) {
- if (fileAndWordList[i] != undefined) {
- linkTab.push("<p>" + txt_results_for + " " + "<span class=\"searchExpression\">" + fileAndWordList[i][0].motslisteDisplay + "</span>" + "</p>");
+ }
+ if (finalWordsList.length) {
+ //search 'and' and 'or' one time
+ fileAndWordList = SortResults(finalWordsList);
- linkTab.push("<ul class='searchresult'>");
- for (t in fileAndWordList[i]) {
- //DEBUG: alert(": "+ fileAndWordList[i][t].filenb+" " +fileAndWordList[i][t].motsliste);
- //linkTab.push("<li><a href=\"../"+fl[fileAndWordList[i][t].filenb]+"\">"+fl[fileAndWordList[i][t].filenb]+"</a></li>");
- var tempInfo = fil[fileAndWordList[i][t].filenb];
- var pos1 = tempInfo.indexOf("@@@");
- var pos2 = tempInfo.lastIndexOf("@@@");
- var tempPath = tempInfo.substring(0, pos1);
- var tempTitle = tempInfo.substring(pos1 + 3, pos2);
- var tempShortdesc = tempInfo.substring(pos2 + 3, tempInfo.length);
+ if (fileAndWordList == undefined) {
+ var cpt = 0;
+ } else {
+ cpt = fileAndWordList.length;
+ var maxNumberOfWords = fileAndWordList[0][0].motsnb;
+ }
+ if (cpt > 0) {
+ var searchedWords = noWords.length;
+ var foundedWords = fileAndWordList[0][0].motslisteDisplay.split(",").length;
+ //console.info("search : " + noWords.length + " found : " + fileAndWordList[0][0].motslisteDisplay.split(",").length);
+ if (searchedWords != foundedWords) {
+ linkTab.push(partialSearch);
+ }
+ }
+
+ for (var i = 0; i < cpt; i++) {
+
+ var hundredProcent = fileAndWordList[i][0].scoring + 100 * fileAndWordList[i][0].motsnb;
+ var ttScore_first = fileAndWordList[i][0].scoring;
+ var numberOfWords = fileAndWordList[i][0].motsnb;
+
+ if (fileAndWordList[i] != undefined) {
+ linkTab.push("<p>" + txt_results_for + " " + "<span class=\"searchExpression\">" + fileAndWordList[i][0].motslisteDisplay + "</span>" + "</p>");
+
+ //mobile: linkTab.push("<ul class='searchresult'>");
+ linkTab.push("<ul data-role='listview' data-filter-theme='d' data-theme='d' data-divider-theme='b' data-inset='true' data-inset='true'>");
+ for (t in fileAndWordList[i]) {
+ //linkTab.push("<li><a href=\"../"+fl[fileAndWordList[i][t].filenb]+"\">"+fl[fileAndWordList[i][t].filenb]+"</a></li>");
+
+ var ttInfo = fileAndWordList[i][t].filenb;
+ // Get scoring
+ var ttScore = fileAndWordList[i][t].scoring;
+ var tempInfo = fil[ttInfo];
+
+ var pos1 = tempInfo.indexOf("@@@");
+ var pos2 = tempInfo.lastIndexOf("@@@");
+ var tempPath = tempInfo.substring(0, pos1);
+ var tempTitle = tempInfo.substring(pos1 + 3, pos2);
+ var tempShortdesc = tempInfo.substring(pos2 + 3, tempInfo.length);
+
+
+ // toc.html will not be displayed on search result
+ if (tempPath == 'toc.html') {
+ continue;
+ }
+ /*
//file:///home/kasun/docbook/WEBHELP/webhelp-draft-output-format-idea/src/main/resources/web/webhelp/installation.html
var linkString = "<li><a href=" + tempPath + ">" + tempTitle + "</a>";
// var linkString = "<li><a href=\"installation.html\">" + tempTitle + "</a>";
- if ((tempShortdesc != "null")) {
- linkString += "\n<div class=\"shortdesclink\">" + tempShortdesc + "</div>";
- }
- linkString += "</li>";
- linkTab.push(linkString);
- }
- linkTab.push("</ul>");
+ */
+ var split = fileAndWordList[i][t].motsliste.split(",");
+ // var splitedValues = expressionInput.split(" ");
+ // var finalArray = split.concat(splitedValues);
+
+ arrayString = 'Array(';
+ for (var x in finalArray) {
+ if (finalArray[x].length > 2 || useCJKTokenizing) {
+ arrayString += "'" + finalArray[x] + "',";
}
+ }
+ arrayString = arrayString.substring(0, arrayString.length - 1) + ")";
+ var idLink = 'foundLink' + no;
+ var linkString = '<li><a id="' + idLink + '" href="' + tempPath + '" class="">' + tempTitle + '</a>';
+ var starWidth = (ttScore * 100 / hundredProcent) / (ttScore_first / hundredProcent) * (numberOfWords / maxNumberOfWords);
+ starWidth = starWidth < 10 ? (starWidth + 5) : starWidth;
+ // Keep the 5 stars format
+ if (starWidth > 85) {
+ starWidth = 85;
+ }
+ /*
+ var noFullStars = Math.ceil(starWidth/17);
+ var fullStar = "curr";
+ var emptyStar = "";
+ if (starWidth % 17 == 0){
+ // am stea plina
+
+ } else {
+
+ }
+ console.info(noFullStars);
+ */
+ // Also check if we have a valid description
+ /*mobile: if ((tempShortdesc != "null" && tempShortdesc != '...')) {
+
+ linkString += "\n<div class=\"shortdesclink\">" + tempShortdesc + "</div>";
+ }*/
+ linkString += "</li>";
+
+ /*mobile:
+ // Add rating values for scoring at the list of matches
+ linkString += "<div id=\"rightDiv\">";
+ linkString += "<div id=\"star\">";
+ //linkString += "<div style=\"color: rgb(136, 136, 136);\" id=\"starUser0\" class=\"user\">"
+ // + ((ttScore * 100/ hundredProcent)/(ttScore_first/hundredProcent)) * 1 + "</div>";
+ linkString += "<ul id=\"star0\" class=\"star\">";
+ linkString += "<li id=\"starCur0\" class=\"curr\" style=\"width: " + starWidth + "px;\"></li>";
+ linkString += "</ul>";
+
+ linkString += "<br style=\"clear: both;\">";
+ linkString += "</div>";
+ linkString += "</div>";
+ //linkString += '<b>Rating: ' + ttScore + '</b>';
+*/
+ linkTab.push(linkString);
+ no++;
}
+ linkTab.push("</ul>");
+ }
}
+ }
- var results = "";
- if (linkTab.length > 0) {
- /*writeln ("<p>" + txt_results_for + " " + "<span class=\"searchExpression\">" + cleanwordsList + "</span>" + "<br/>"+"</p>");*/
- results = "<p>";
- //write("<ul class='searchresult'>");
- for (t in linkTab) {
- results += linkTab[t].toString();
- }
- results += "</p>";
- } else {
- results = "<p>" + "Your search returned no results for " + "<span class=\"searchExpression\">" + txt_wordsnotfound + "</span>" + "</p>";
+ var results = "";
+ if (linkTab.length > 0) {
+ /*writeln ("<p>" + txt_results_for + " " + "<span class=\"searchExpression\">" + cleanwordsList + "</span>" + "<br/>"+"</p>");*/
+ results = "<p>";
+ //write("<ul class='searchresult'>");
+ for (t in linkTab) {
+ results += linkTab[t].toString();
}
- //alert(results);
- document.getElementById('searchResults').innerHTML = results;
+ results += "</p>";
+ } else {
+ results = "<p>" + localeresource.search_no_results + " <span class=\"searchExpression\">" + txt_wordsnotfound + "</span>" + "</p>";
+ }
+
+
+ // Verify if the browser is Google Chrome and the WebHelp is used on a local machine
+ // If browser is Google Chrome and WebHelp is used on a local machine a warning message will appear
+ // Highlighting will not work in this conditions. There is 2 workarounds
+ if (verifyBrowser()) {
+ //mobile: document.getElementById('searchResults').innerHTML = results;
+ $.get('#searchResults',function(){
+ $('#searchResults').append(results).trigger('create');
+ },'html');
+ } else {
+ //mobile: document.getElementById('searchResults').innerHTML = warningMsg + results;
+ $.get('#searchResults',function(){
+ $('#searchResults').append(warningMsg + results).trigger('create');
+ }, 'html');
+ }
+
}
-function tokenize(wordsList){
- var stemmedWordsList = new Array(); // Array with the words to look for after removing spaces
- var cleanwordsList = new Array(); // Array with the words to look for
- for(var j in wordsList){
- var word = wordsList[j];
- if(typeof stemmer != "undefined" ){
- stemQueryMap[stemmer(word)] = word;
- } else {
- stemQueryMap[word] = word;
- }
- }
- //stemmedWordsList is the stemmed list of words separated by spaces.
- for (var t in wordsList) {
- wordsList[t] = wordsList[t].replace(/(%22)|^-/g, "");
- if (wordsList[t] != "%20") {
- scriptLetterTab.add(wordsList[t].charAt(0));
- cleanwordsList.push(wordsList[t]);
- }
+
+// Verify if the stemmed word is aproximately the same as the searched word
+function verifyWord(word, arr) {
+ for (var i = 0; i < arr.length; i++) {
+ if (word[0] == arr[i][0] && word[1] == arr[i][1]
+ //&& word[2] == arr[i][2]
+ ) {
+ return true;
}
+ }
+ return false;
+}
- if(typeof stemmer != "undefined" ){
- //Do the stemming using Porter's stemming algorithm
- for (var i = 0; i < cleanwordsList.length; i++) {
- var stemWord = stemmer(cleanwordsList[i]);
- stemmedWordsList.push(stemWord);
- }
+// Look for elements that start with searchedValue.
+function wordsStartsWith(searchedValue) {
+ var toReturn = '';
+ for (var sv in w) {
+ if (searchedValue.length < 3) {
+ continue;
} else {
- stemmedWordsList = cleanwordsList;
+ if (sv.toLowerCase().indexOf(searchedValue.toLowerCase()) == 0) {
+ toReturn += sv + ",";
+ }
}
- return stemmedWordsList;
+ }
+ return toReturn.length > 0 ? toReturn : undefined;
}
+
+function tokenize(wordsList) {
+ var stemmedWordsList = new Array(); // Array with the words to look for after removing spaces
+ var cleanwordsList = new Array(); // Array with the words to look for
+ // -------------------------------------------------
+ // Thu's patch
+ for (var j = 0; j < wordsList.length; ++j) {
+ var word = wordsList[j];
+ var originalWord = word;
+ if (typeof stemmer != "undefined") {
+ var stemmedWord = stemmer(word);
+ if (w[stemmedWord] != undefined) {
+ stemQueryMap[stemmer(word)] = word;
+ } else {
+ stemQueryMap[originalWord] = originalWord;
+ }
+ } else {
+ if (w[word] != undefined) {
+ stemQueryMap[word] = word;
+ } else {
+ stemQueryMap[originalWord] = originalWord;
+ }
+ }
+ }
+ //stemmedWordsList is the stemmed list of words separated by spaces.
+ for (var t = 0; t < wordsList.length; ++t) {
+ wordsList[t] = wordsList[t].replace(/(%22)|^-/g, "");
+ if (wordsList[t] != "%20") {
+ scriptLetterTab.add(wordsList[t].charAt(0));
+ cleanwordsList.push(wordsList[t]);
+ }
+ }
+
+ if (typeof stemmer != "undefined") {
+ //Do the stemming using Porter's stemming algorithm
+ for (var i = 0; i < cleanwordsList.length; i++) {
+ var stemWord = stemmer(cleanwordsList[i]);
+ if (w[stemWord] != undefined) {
+ stemmedWordsList.push(stemWord);
+ } else {
+ stemmedWordsList.push(cleanwordsList[i]);
+ }
+ }
+ // End Thu's patch
+ // -------------------------------------------
+ } else {
+ stemmedWordsList = cleanwordsList;
+ }
+ return stemmedWordsList;
+}
+
//Invoker of CJKTokenizer class methods.
-function cjkTokenize(wordsList){
- var allTokens= new Array();
- var notCJKTokens= new Array();
- var j=0;
- for(j=0;j<wordsList.length;j++){
- var word = wordsList[j];
- if(getAvgAsciiValue(word) < 127){
- notCJKTokens.push(word);
- } else {
- var tokenizer = new CJKTokenizer(word);
- var tokensTmp = tokenizer.getAllTokens();
- allTokens = allTokens.concat(tokensTmp);
- }
+function cjkTokenize(wordsList) {
+ var allTokens = new Array();
+ var notCJKTokens = new Array();
+ var j = 0;
+ for (j = 0; j < wordsList.length; j++) {
+ var word = wordsList[j];
+ if (getAvgAsciiValue(word) < 127) {
+ notCJKTokens.push(word);
+ } else {
+ var tokenizer = new CJKTokenizer(word);
+ var tokensTmp = tokenizer.getAllTokens();
+ allTokens = allTokens.concat(tokensTmp);
}
- allTokens = allTokens.concat(tokenize(notCJKTokens));
- return allTokens;
+ }
+ allTokens = allTokens.concat(tokenize(notCJKTokens));
+ return allTokens;
}
//A simple way to determine whether the query is in english or not.
-function getAvgAsciiValue(word){
- var tmp = 0;
- var num = word.length < 5 ? word.length:5;
- for(var i=0;i<num;i++){
- if(i==5) break;
- tmp += word.charCodeAt(i);
- }
- return tmp/num;
+function getAvgAsciiValue(word) {
+ var tmp = 0;
+ var num = word.length < 5 ? word.length : 5;
+ for (var i = 0; i < num; i++) {
+ if (i == 5) break;
+ tmp += word.charCodeAt(i);
+ }
+ return tmp / num;
}
//CJKTokenizer
-function CJKTokenizer(input){
- this.input = input;
- this.offset=-1;
- this.tokens = new Array();
- this.incrementToken = incrementToken;
- this.tokenize = tokenize;
- this.getAllTokens = getAllTokens;
- this.unique = unique;
+function CJKTokenizer(input) {
+ this.input = input;
+ this.offset = -1;
+ this.tokens = new Array();
+ this.incrementToken = incrementToken;
+ this.tokenize = tokenize;
+ this.getAllTokens = getAllTokens;
+ this.unique = unique;
- function incrementToken(){
- if(this.input.length - 2 <= this.offset){
- // console.log("false "+offset);
- return false;
- }
- else {
- this.offset+=1;
- return true;
- }
- }
+ function incrementToken() {
+ if (this.input.length - 2 <= this.offset) {
+ // console.log("false "+offset);
+ return false;
+ } else {
+ this.offset += 1;
+ return true;
+ }
+ }
- function tokenize(){
- //document.getElementById("content").innerHTML += x.substring(offset,offset+2)+"<br>";
- return this.input.substring(this.offset,this.offset+2);
- }
+ function tokenize() {
+ //document.getElementById("content").innerHTML += x.substring(offset,offset+2)+"<br>";
+ return this.input.substring(this.offset, this.offset + 2);
+ }
- function getAllTokens(){
- while(this.incrementToken()){
- var tmp = this.tokenize();
- this.tokens.push(tmp);
- }
- return this.unique(this.tokens);
-// document.getElementById("content").innerHTML += tokens+" ";
-// document.getElementById("content").innerHTML += "<br>dada"+sortedTokens+" ";
-// console.log(tokens.length+"dsdsds");
- /*for(i=0;i<tokens.length;i++){
+ function getAllTokens() {
+ while (this.incrementToken()) {
+ var tmp = this.tokenize();
+ this.tokens.push(tmp);
+ }
+ return this.unique(this.tokens);
+ // document.getElementById("content").innerHTML += tokens+" ";
+ // document.getElementById("content").innerHTML += "<br>dada"+sortedTokens+" ";
+ // console.log(tokens.length+"dsdsds");
+ /*for(i=0;i<tokens.length;i++){
console.log(tokens[i]);
var ss = tokens[i] == sortedTokens[i];
// document.getElementById("content").innerHTML += "<br>dada"+un[i]+"- "+stems[i]+" "+ ss;
document.getElementById("content").innerHTML += "<br>"+sortedTokens[i];
}*/
- }
+ }
- function unique(a)
- {
- var r = new Array();
- o:for(var i = 0, n = a.length; i < n; i++)
- {
- for(var x = 0, y = r.length; x < y; x++)
- {
- if(r[x]==a[i]) continue o;
- }
- r[r.length] = a[i];
- }
- return r;
- }
+ function unique(a) {
+ var r = new Array();
+ o: for (var i = 0, n = a.length; i < n; i++) {
+ for (var x = 0, y = r.length; x < y; x++) {
+ if (r[x] == a[i]) continue o;
+ }
+ r[r.length] = a[i];
+ }
+ return r;
+ }
}
/* Scriptfirstchar: to gather the first letter of index js files to upload */
function Scriptfirstchar() {
- this.strLetters = "";
- this.add = addLettre;
+ this.strLetters = "";
+ this.add = addLettre;
}
function addLettre(caract) {
- if (this.strLetters == 'undefined') {
- this.strLetters = caract;
- } else if (this.strLetters.indexOf(caract) < 0) {
- this.strLetters += caract;
- }
+ if (this.strLetters == 'undefined') {
+ this.strLetters = caract;
+ } else if (this.strLetters.indexOf(caract) < 0) {
+ this.strLetters += caract;
+ }
- return 0;
+ return 0;
}
/* end of scriptfirstchar */
@@ -300,78 +526,78 @@
/*tab contains the first letters of each word looked for*/
function loadTheIndexScripts(tab) {
- //alert (tab.strLetters);
- var scriptsarray = new Array();
+ //alert (tab.strLetters);
+ var scriptsarray = new Array();
- for (var i = 0; i < tab.strLetters.length; i++) {
+ for (var i = 0; i < tab.strLetters.length; i++) {
- scriptsarray[i] = "..\/search" + "\/" + tab.strLetters.charAt(i) + ".js";
- }
- // add the list of html files
- i++;
- scriptsarray[i] = "..\/search" + "\/" + htmlfileList;
+ scriptsarray[i] = "..\/search" + "\/" + tab.strLetters.charAt(i) + ".js";
+ }
+ // add the list of html files
+ i++;
+ scriptsarray[i] = "..\/search" + "\/" + htmlfileList;
- //debug
- for (var t in scriptsarray) {
- //alert (scriptsarray[t]);
- }
+ //debug
+ for (var t in scriptsarray) {
+ //alert (scriptsarray[t]);
+ }
- tab = new ScriptLoader();
- for (t in scriptsarray) {
- tab.add(scriptsarray[t]);
- }
- tab.load();
- //alert ("scripts loaded");
- return (scriptsarray);
+ tab = new ScriptLoader();
+ for (t in scriptsarray) {
+ tab.add(scriptsarray[t]);
+ }
+ tab.load();
+ //alert ("scripts loaded");
+ return (scriptsarray);
}
/* ScriptLoader: to load the scripts and wait that it's finished */
function ScriptLoader() {
- this.cpt = 0;
- this.scriptTab = new Array();
- this.add = addAScriptInTheList;
- this.load = loadTheScripts;
- this.onScriptLoaded = onScriptLoadedFunc;
+ this.cpt = 0;
+ this.scriptTab = new Array();
+ this.add = addAScriptInTheList;
+ this.load = loadTheScripts;
+ this.onScriptLoaded = onScriptLoadedFunc;
}
function addAScriptInTheList(scriptPath) {
- this.scriptTab.push(scriptPath);
+ this.scriptTab.push(scriptPath);
}
function loadTheScripts() {
- var script;
- var head;
+ var script;
+ var head;
- head = document.getElementsByTagName('head').item(0);
+ head = document.getElementsByTagName('head').item(0);
- //script = document.createElement('script');
+ //script = document.createElement('script');
- for (var el in this.scriptTab) {
- //alert (el+this.scriptTab[el]);
- script = document.createElement('script');
- script.src = this.scriptTab[el];
- script.type = 'text/javascript';
- script.defer = false;
+ for (var el in this.scriptTab) {
+ //alert (el+this.scriptTab[el]);
+ script = document.createElement('script');
+ script.src = this.scriptTab[el];
+ script.type = 'text/javascript';
+ script.defer = false;
- head.appendChild(script);
- }
+ head.appendChild(script);
+ }
}
function onScriptLoadedFunc(e) {
- e = e || window.event;
- var target = e.target || e.srcElement;
- var isComplete = true;
- if (typeof target.readyState != undefined) {
+ e = e || window.event;
+ var target = e.target || e.srcElement;
+ var isComplete = true;
+ if (typeof target.readyState != undefined) {
- isComplete = (target.readyState == "complete" || target.readyState == "loaded");
+ isComplete = (target.readyState == "complete" || target.readyState == "loaded");
+ }
+ if (isComplete) {
+ ScriptLoader.cpt++;
+ if (ScriptLoader.cpt == ScriptLoader.scripts.length) {
+ ScriptLoader.onLoadComplete();
}
- if (isComplete) {
- ScriptLoader.cpt++;
- if (ScriptLoader.cpt == ScriptLoader.scripts.length) {
- ScriptLoader.onLoadComplete();
- }
- }
+ }
}
/*
@@ -380,34 +606,34 @@
} */
/* End of scriptloader functions */
-
+
// Array.unique( strict ) - Remove duplicate values
function unique(tab) {
- var a = new Array();
- var i;
- var l = tab.length;
+ var a = new Array();
+ var i;
+ var l = tab.length;
- if (tab[0] != undefined) {
- a[0] = tab[0];
- }
- else {
- return -1
- }
+ if (tab[0] != undefined) {
+ a[0] = tab[0];
+ } else {
+ return -1;
+ }
- for (i = 1; i < l; i++) {
- if (indexof(a, tab[i], 0) < 0) {
- a.push(tab[i]);
- }
+ for (i = 1; i < l; i++) {
+ if (indexof(a, tab[i], 0) < 0) {
+ a.push(tab[i]);
}
- return a;
+ }
+ return a;
}
+
function indexof(tab, element, begin) {
- for (var i = begin; i < tab.length; i++) {
- if (tab[i] == element) {
- return i;
- }
+ for (var i = begin; i < tab.length; i++) {
+ if (tab[i] == element) {
+ return i;
}
- return -1;
+ }
+ return -1;
}
/* end of Array functions */
@@ -423,91 +649,227 @@
*/
function SortResults(mots) {
- var fileAndWordList = new Object();
- if (mots.length == 0) {
- return null;
- }
+ var fileAndWordList = new Object();
+ if (mots.length == 0 || mots[0].length == 0) {
+ return null;
+ }
- for (var t in mots) {
- // get the list of the indices of the files.
- var listNumerosDesFicStr = w[mots[t].toString()];
- //alert ("listNumerosDesFicStr "+listNumerosDesFicStr);
- var tab = listNumerosDesFicStr.split(",");
- //for each file (file's index):
- for (var t2 in tab) {
- var temp = tab[t2].toString();
- if (fileAndWordList[temp] == undefined) {
+ // In generated js file we add scoring at the end of the word
+ // Example word1*scoringForWord1,word2*scoringForWord2 and so on
+ // Split after * to obtain the right values
+ var scoringArr = Array();
+ for (var t in mots) {
+ // get the list of the indices of the files.
+ var listNumerosDesFicStr = w[mots[t].toString()];
- fileAndWordList[temp] = "" + mots[t];
- } else {
+ if (listNumerosDesFicStr != undefined) {
- fileAndWordList[temp] += "," + mots[t];
- }
+ //alert ("listNumerosDesFicStr "+listNumerosDesFicStr);
+ var tab = listNumerosDesFicStr.split(",");
+ //for each file (file's index):
+ for (var t2 in tab) {
+ var tmp = '';
+ var idx = '';
+ var temp = tab[t2].toString();
+ if (temp.indexOf('*') != -1) {
+ idx = temp.indexOf('*');
+ tmp = temp.substring(idx + 3, temp.length);
+ temp = temp.substring(0, idx);
}
+ scoringArr.push(tmp);
+ if (fileAndWordList[temp] == undefined) {
+ fileAndWordList[temp] = "" + mots[t];
+ } else {
+ fileAndWordList[temp] += "," + mots[t];
+ }
+ //console.info("fileAndWordList[" + temp + "]=" + fileAndWordList[temp] + " : " + tmp);
+ }
+
}
+ }
+ var fileAndWordListValuesOnly = new Array();
+ // sort results according to values
+ var temptab = new Array();
+ finalObj = new Array();
+ for (t in fileAndWordList) {
+ finalObj.push(new newObj(t, fileAndWordList[t]));
+ }
- var fileAndWordListValuesOnly = new Array();
+ if (finalObj.length == 0) { // None of the queried words are not in the index (stemmed or not)
+ return null;
+ }
+ finalObj = removeDerivates(finalObj);
+ for (t in finalObj) {
+ tab = finalObj[t].wordList.split(',');
+ var tempDisplay = new Array();
+ for (var x in tab) {
+ if (stemQueryMap[tab[x]] != undefined && doStem) {
+ tempDisplay.push(stemQueryMap[tab[x]]); //get the original word from the stem word.
+ } else {
+ tempDisplay.push(tab[x]); //no stem is available. (probably a CJK language)
+ }
+ }
+ var tempDispString = tempDisplay.join(", ");
+ var index;
+ for (x in fileAndWordList) {
+ if (x === finalObj[t].filesNo) {
+ index = x;
+ break;
+ }
+ }
+ var scoring = findRating(fileAndWordList[index], index);
+ temptab.push(new resultPerFile(finalObj[t].filesNo, finalObj[t].wordList, tab.length, tempDispString, scoring));
+ fileAndWordListValuesOnly.push(finalObj[t].wordList);
+ }
+ fileAndWordListValuesOnly = unique(fileAndWordListValuesOnly);
+ fileAndWordListValuesOnly = fileAndWordListValuesOnly.sort(compare_nbMots);
- // sort results according to values
- var temptab = new Array();
- for (t in fileAndWordList) {
- tab = fileAndWordList[t].split(',');
+ var listToOutput = new Array();
+ for (var fawlvoIdx in fileAndWordListValuesOnly) {
+ for (t in temptab) {
+ if (temptab[t].motsliste == fileAndWordListValuesOnly[fawlvoIdx]) {
+ if (listToOutput[fawlvoIdx] == undefined) {
+ listToOutput[fawlvoIdx] = new Array(temptab[t]);
+ } else {
+ listToOutput[fawlvoIdx].push(temptab[t]);
+ }
+ }
+ }
+ }
+ // Sort results by scoring, descending on the same group
+ for (var ltoIdx in listToOutput) {
+ listToOutput[ltoIdx].sort(function (a, b) {
+ return b.scoring - a.scoring;
+ });
+ }
+ // If we have groups with same number of words,
+ // will sort groups by higher scoring of each group
+ for (var i = 0; i < listToOutput.length - 1; i++) {
+ for (var j = i + 1; j < listToOutput.length; j++) {
+ if (listToOutput[i][0].motsnb < listToOutput[j][0].motsnb || (listToOutput[i][0].motsnb == listToOutput[j][0].motsnb && listToOutput[i][0].scoring < listToOutput[j][0].scoring)) {
+ var x = listToOutput[i];
+ listToOutput[i] = listToOutput[j];
+ listToOutput[j] = x;
+ }
+ }
+ }
- var tempDisplay = new Array();
- for (var x in tab) {
- if(stemQueryMap[tab[x]] != undefined){
- tempDisplay.push(stemQueryMap[tab[x]]); //get the original word from the stem word.
- } else {
- tempDisplay.push(tab[x]); //no stem is available. (probably a CJK language)
- }
+ return listToOutput;
+}
+
+// Remove derivates words from the list of words
+function removeDerivates(obj) {
+ var toResultObject = new Array();
+ for (i in obj) {
+ var filesNo = obj[i].filesNo;
+ var wordList = obj[i].wordList;
+ var wList = wordList.split(",");
+ var searchedWords = searchTextField.toLowerCase().split(" ");
+ for (var k = 0; k < searchedWords.length; k++) {
+ for (var j = 0; j < wList.length; j++) {
+ if (wList[j].startsWith(searchedWords[k])) {
+ wList[j] = searchedWords[k];
}
- var tempDispString = tempDisplay.join(", ");
-
- temptab.push(new resultPerFile(t, fileAndWordList[t], tab.length, tempDispString));
- fileAndWordListValuesOnly.push(fileAndWordList[t]);
+ }
}
+ wList = removeDuplicate(wList);
+ var recreateList = '';
+ for (var x in wList) {
+ recreateList += wList[x] + ",";
+ }
+ recreateList = recreateList.substr(0, recreateList.length - 1);
+ toResultObject.push(new newObj(filesNo, recreateList));
+ }
+ return toResultObject;
+}
+function newObj(filesNo, wordList) {
+ this.filesNo = filesNo;
+ this.wordList = wordList;
+}
- //alert("t"+fileAndWordListValuesOnly.toString());
+// Add a new parameter. Scoring.
+function resultPerFile(filenb, motsliste, motsnb, motslisteDisplay, scoring, group) {
+ //10 - spring,time - 2 - spring, time - 55 - 3
+ this.filenb = filenb;
+ this.motsliste = motsliste;
+ this.motsnb = motsnb;
+ this.motslisteDisplay = motslisteDisplay;
- fileAndWordListValuesOnly = unique(fileAndWordListValuesOnly);
- fileAndWordListValuesOnly = fileAndWordListValuesOnly.sort(compare_nbMots);
- //alert("t: "+fileAndWordListValuesOnly.join(';'));
+ this.scoring = scoring;
- var listToOutput = new Array();
+}
- for (var j in fileAndWordListValuesOnly) {
- for (t in temptab) {
- if (temptab[t].motsliste == fileAndWordListValuesOnly[j]) {
- if (listToOutput[j] == undefined) {
- listToOutput[j] = new Array(temptab[t]);
- } else {
- listToOutput[j].push(temptab[t]);
- }
- }
- }
+
+function findRating(words, nr) {
+ var sum = 0;
+ var xx = words.split(',');
+ for (jj = 0; jj < xx.length; jj++) {
+ var wrd = w[xx[jj]].split(',');
+ for (var ii = 0; ii < wrd.length; ii++) {
+ var wrdno = wrd[ii].split('*');
+ if (wrdno[0] == nr) {
+ sum += parseInt(wrdno[1]);
+ }
}
- return listToOutput;
+ }
+ return sum;
}
-function resultPerFile(filenb, motsliste, motsnb, motslisteDisplay) {
- this.filenb = filenb;
- this.motsliste = motsliste;
- this.motsnb = motsnb;
- this.motslisteDisplay= motslisteDisplay;
+function compare_nbMots(s1, s2) {
+ var t1 = s1.split(',');
+ var t2 = s2.split(',');
+ //alert ("s1:"+t1.length + " " +t2.length)
+ if (t1.length == t2.length) {
+ return 0;
+ } else if (t1.length > t2.length) {
+ return 1;
+ } else {
+ return -1;
+ }
+ //return t1.length - t2.length);
}
-function compare_nbMots(s1, s2) {
- var t1 = s1.split(',');
- var t2 = s2.split(',');
- //alert ("s1:"+t1.length + " " +t2.length)
- if (t1.length == t2.length) {
- return 0;
- } else if (t1.length > t2.length) {
- return 1;
- } else {
- return -1;
+// return false if browser is Google Chrome and WebHelp is used on a local machine, not a web server
+function verifyBrowser() {
+ var returnedValue = true;
+ var browser = BrowserDetect.browser;
+ var addressBar = window.location.href;
+ if (browser == 'Chrome' && addressBar.indexOf('file://') === 0) {
+ returnedValue = false;
+ }
+
+ return returnedValue;
+}
+
+// Remove duplicate values from an array
+function removeDuplicate(arr) {
+ var r = new Array();
+ o: for (var i = 0, n = arr.length; i < n; i++) {
+ for (var x = 0, y = r.length; x < y; x++) {
+ if (r[x] == arr[i]) continue o;
}
- //return t1.length - t2.length);
+ r[r.length] = arr[i];
+ }
+ return r;
+}
+
+// Create startsWith method
+String.prototype.startsWith = function (str) {
+ return (this.match("^" + str) == str);
+}
+
+function trim(str, chars) {
+ return ltrim(rtrim(str, chars), chars);
+}
+
+function ltrim(str, chars) {
+ chars = chars || "\\s";
+ return str.replace(new RegExp("^[" + chars + "]+", "g"), "");
+}
+
+function rtrim(str, chars) {
+ chars = chars || "\\s";
+ return str.replace(new RegExp("[" + chars + "]+$", "g"), "");
}
\ No newline at end of file
Modified: branches/mobile/xsl/mobile/template_mobile/js/jquery.cookie.min.js
===================================================================
--- branches/mobile/xsl/mobile/template_mobile/js/jquery.cookie.min.js 2012-08-01 09:03:21 UTC (rev 9515)
+++ branches/mobile/xsl/mobile/template_mobile/js/jquery.cookie.min.js 2012-08-02 20:19:29 UTC (rev 9516)
@@ -4,6 +4,51 @@
Dual licensed under the MIT or GPL Version 2 licenses.
http://www.opensource.org/licenses/mit-license.php
http://www.opensource.org/licenses/GPL-2.0 */
-var d=jQuery,i=document;function j(c){return c}function k(c){return decodeURIComponent(c.replace(l," "))}var l=/\+/g;
-d.cookie=function(c,b,a){if(1<arguments.length&&(!/Object/.test(Object.prototype.toString.call(b))||null==b)){a=d.extend({},d.cookie.b,a);null==b&&(a.a=-1);if("number"===typeof a.a){var f=a.a,e=a.a=new Date;e.setDate(e.getDate()+f)}b=String(b);return i.cookie=[encodeURIComponent(c),"=",a.c?b:encodeURIComponent(b),a.a?"; expires="+a.a.toUTCString():"",a.path?"; path="+a.path:"",a.domain?"; domain="+a.domain:"",a.d?"; secure":""].join("")}for(var a=b||d.cookie.b||{},f=a.c?j:k,e=i.cookie.split("; "),
-g=0,h;h=e[g]&&e[g].split("=");g++)if(f(h.shift())===c)return f(h.join("="));return null};d.cookie.b={};
+(function ($, document) {
+ var pluses = /\+/g;
+
+ function raw(s) {
+ return s;
+ }
+
+ function decoded(s) {
+ return decodeURIComponent(s.replace(pluses, ' '));
+ }
+ $.cookie = function (key, value, options) {
+ // key and at least value given, set cookie...
+ if (arguments.length > 1 &&
+ (!/Object/.test(Object.prototype.toString.call(value)) || value == null))
+{
+ options = $.extend({}, $.cookie.defaults, options);
+ if (value == null) {
+ options.expires = -1;
+ }
+ if (typeof options.expires === 'number') {
+ var days = options.expires,
+ t = options.expires = new Date();
+ t.setDate(t.getDate() + days);
+ }
+ value = String(value);
+ return (document.cookie = [
+ encodeURIComponent(key), '=', options.raw ? value :
+ encodeURIComponent(value),
+ options.expires ? '; expires=' + options.expires.toUTCString() : '',
+// use expires attribute, max-age is not supported by IE
+ options.path ? '; path=' + options.path : '',
+ options.domain ? '; domain=' + options.domain : '',
+ options.secure ? '; secure' : ''].join(''));
+ }
+ // key and possibly options given, get cookie...
+ options = value || $.cookie.defaults || {};
+ var decode = options.raw ? raw : decoded;
+ var cookies = document.cookie.split('; ');
+ for (var i = 0, parts;
+ (parts = cookies[i] && cookies[i].split('=')); i++) {
+ if (decode(parts.shift()) === key) {
+ return decode(parts.join('='));
+ }
+ }
+ return null;
+ };
+ $.cookie.defaults = {};
+})(jQuery, document);
Modified: branches/mobile/xsl/mobile/xsl/mobile.xsl
===================================================================
--- branches/mobile/xsl/mobile/xsl/mobile.xsl 2012-08-01 09:03:21 UTC (rev 9515)
+++ branches/mobile/xsl/mobile/xsl/mobile.xsl 2012-08-02 20:19:29 UTC (rev 9516)
@@ -140,34 +140,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
- <!-- <xsl:message> mobile.tree.cookie.id = <xsl:value-of select="$mobile.tree.cookie.id"/>
- +++ <xsl:value-of select="count(//node())"/> $mobile.indexer.language =
- <xsl:value-of select="$mobile.indexer.language"/> +++ <xsl:value-of select="count(//node())"/>
- </xsl:message> -->
-
- <script type="text/javascript">
- //The id for tree cookie
- var treeCookieId = "<xsl:value-of select="$mobile.tree.cookie.id"/>";
- var language = "<xsl:value-of select="$mobile.indexer.language"/>";
- var w = new Object();
- //Localization
- txt_filesfound = '<xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'txt_filesfound'"/>
- </xsl:call-template>';
- txt_enter_at_least_1_char = "<xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'txt_enter_at_least_1_char'"/>
- </xsl:call-template>";
- txt_browser_not_supported = "<xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'txt_browser_not_supported'"/>
- </xsl:call-template>";
- txt_please_wait = "<xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'txt_please_wait'"/>
- </xsl:call-template>";
- txt_results_for = "<xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'txt_results_for'"/>
- </xsl:call-template>";
- </script>
-
<link rel="stylesheet" type="text/css" href="../css/themes/default/jquery.mobile-1.1.0.min.css"/>
<!--<script type="text/javascript" charset="utf-8" src="../js/cordova-1.8.1.js">
@@ -186,42 +158,6 @@
<xsl:comment>
</xsl:comment>
</script>
-
- <!--Scripts/css stylesheets for Search -->
- <script type="text/javascript" src="search/htmlFileInfoList.js">
- <xsl:comment>
- </xsl:comment>
- </script>
- <script type="text/javascript" src="search/nwSearchFnt.js">
- <xsl:comment>
- </xsl:comment>
- </script>
-
- <!-- NOTE: Stemmer javascript files should be in format <language>_stemmer.js.
- For example, for English(en), source should be: "search/stemmers/en_stemmer.js"
- For country codes, see: http://www.uspto.gov/patft/help/helpctry.htm -->
- <!--<xsl:message><xsl:value-of select="concat('search/stemmers/',$mobile.indexer.language,'_stemmer.js')"/></xsl:message> -->
- <script type="text/javascript" src="{concat('search/stemmers/',$mobile.indexer.language,'_stemmer.js')}">
- <xsl:comment>
- //make this scalable to other languages as well.
- </xsl:comment>
- </script>
-
- <!--Index Files: Index is broken in to three equal sized(number of index
- items) files. This is to help parallel downloading of files to make it faster. -->
- <script type="text/javascript" src="search/index-1.js">
- <xsl:comment>
- </xsl:comment>
- </script>
- <script type="text/javascript" src="search/index-2.js">
- <xsl:comment>
- </xsl:comment>
- </script>
- <script type="text/javascript" src="search/index-3.js">
- <xsl:comment>
- </xsl:comment>
- </script>
- <!--End of index files -->
</xsl:template>
<!-- ============================================================ -->
@@ -357,6 +293,8 @@
<xsl:call-template name="settings.html"/>
<xsl:call-template name="menubar.html"/>
+
+ <xsl:call-template name="l10n.js"></xsl:call-template>
</xsl:template>
@@ -846,7 +784,13 @@
</head>
<body>
- <div data-role="page" id="current_page">
+ <!-- Set id for settings.html as its name -->
+ <xsl:variable name="id_settings"
+ select="translate(concat('id_',$mobile.setting.filename),'.','_')"/>
+ <div data-role="page">
+ <xsl:attribute name="id">
+ <xsl:value-of select="$id_settings"/>
+ </xsl:attribute>
<div data-role="header">
<script type="text/javascript">
@@ -1041,31 +985,93 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- <script type="text/javascript" charset="utf-8" src="../js/cordova-1.8.1.js">//cordova</script>-->
+ <!-- <script type="text/javascript" charset="utf-8" src="../js/cordova-1.8.1.js">//cordova</script>-->
+ <script type="text/javascript">
+ //The id for tree cookie
+ var treeCookieId = "treeview-1055";
+ var language = "en";
+ var w = new Object();
+ //Localization
+ txt_filesfound = 'Results';
+ txt_enter_at_least_1_char = "You must enter at least one character.";
+ txt_browser_not_supported = "JavaScript is disabled on your browser. Please enable JavaScript to enjoy all the features of this site.";
+ txt_please_wait = "Please wait. Search in progress...";
+ txt_results_for = "Results for: ";
+ </script>
<link rel="stylesheet" type="text/css"
href="../css/themes/default/jquery.mobile-1.1.0.min.css"/>
- <script type="text/javascript" src="../js/jquery.min.js">// jquery </script>
- <script type="text/javascript" src="../js/jquery.cookie.min.js">// cookies </script>
- <script type="text/javascript" src="../js/jquery.mobile-1.1.0.min.js">// jquery mobile </script>
- <script type="text/javascript" src="../js/swipeupdown.js">//swipe</script>
- <script type="text/javascript" src="../js/mobile-settings.js">//mobile-settings</script>
+ <style type="text/css">
+ a{
+ width:99%;
+ }
+ form.err div a span{
+ padding:0 0 !important;
+ }</style>
+ <!-- Adding js -->
+ <script type="text/javascript" src="../js/browserDetect.js"><xsl:comment>browserDetect</xsl:comment></script>
+ <script type="text/javascript" src="../js/jquery.min.js"><xsl:comment>jquery</xsl:comment></script>
+ <script type="text/javascript" src="../js/jquery.cookie.min.js"><xsl:comment>cookies</xsl:comment></script>
+ <script type="text/javascript" src="../js/jquery.mobile-1.1.0.min.js"><xsl:comment>jquerymobile</xsl:comment></script>
+ <script type="text/javascript" src="../js/swipeupdown.js"><xsl:comment>swipe</xsl:comment></script>
+ <script type="text/javascript" src="../js/mobile-settings.js"><xsl:comment>mobile-settings</xsl:comment></script>
+
+ <script type="text/javascript" src="search/l10n.js"><xsl:comment>l10n</xsl:comment></script>
+ <script type="text/javascript" src="search/htmlFileInfoList.js"><xsl:comment>htmlFileInfoList</xsl:comment></script>
+ <script type="text/javascript" src="search/nwSearchFnt.js"><xsl:comment>nwSearchFnt</xsl:comment></script>
+ <script type="text/javascript" src="{concat('search/stemmers/',$mobile.indexer.language,'_stemmer.js')}">
+ <xsl:comment>
+ //make this scalable to other languages as well.
+ </xsl:comment>
+ </script>
+ <!--Index Files: Index is broken in to three equal sized(number of index
+ items) files. This is to help parallel downloading of files to make it faster. -->
+ <script type="text/javascript" src="search/index-1.js"><xsl:comment>index-1</xsl:comment></script>
+ <script type="text/javascript" src="search/index-2.js"><xsl:comment>index-2</xsl:comment></script>
+ <script type="text/javascript" src="search/index-3.js"><xsl:comment>index-3</xsl:comment></script>
+ <!-- End of index js -->
</head>
<body>
- <div data-role="page" id="current_page">
+ <!-- Set id for menubar.html as its name -->
+ <xsl:variable name="id_menubar"
+ select="translate(concat('id_',$mobile.menubar.filename),'.','_')"/>
+ <div data-role="page">
+ <xsl:attribute name="id">
+ <xsl:value-of select="$id_menubar"/>
+ </xsl:attribute>
+
<div data-role="header">
<h1>Menu Bar</h1>
+ <script type="text/javascript">
+ function goBack(){
+ history.back();
+ return false;
+ }
+ $(function() {
+ $("#textToSearch").live('keyup', function(event) {
+ var searchTextField = trim(document.searchForm.textToSearch.value);
+ //searchTextField = searchTextField.replace(/['"]/g, '');
+
+ if (searchTextField.length != 0) {
+ if(searchTextField.indexOf(" ") == -1 ) {
+ $("#searchResults").empty();
+ $("#doSearch").click();
+ }
+ }
+ });
+ });
+ </script>
</div>
<div data-role="content">
-
+ <!-- First row -->
<div data-role="footer" data-theme="b" class="ui-bar ui-grid-b">
<div class="ui-block-a">
<div style="margin: 8px 0 0 10px;">
- <a href="index.html" data-role="button" data-icon="back" data-theme="a"
+ <a onclick="goBack()" data-role="button" data-icon="back" data-theme="a"
>Back</a>
</div>
</div>
<div class="ui-block-b">
- <input id="value" value="page no"/>
+ <input id="value" placeholder="page no..." data-theme="b"/>
</div>
<div class="ui-block-c">
<div style="margin: 8px 0 0 10px;">
@@ -1074,9 +1080,9 @@
</div>
</div>
</div>
+ <!-- Second row -->
<div data-role="footer" data-theme="b" class="ui-bar ui-grid-a">
<div class="ui-block-a">
-
<select name="select-choice-min" id="select-choice-1" data-theme="e"
data-native-menu="false">
<option value="8">Front size-8</option>
@@ -1086,10 +1092,25 @@
</select>
</div>
<div class="ui-block-b">
- <div style="margin: 5px 5px 5px 5px;">
- <input type="search" name="search" id="searc-basic"/>
- </div>
+ <select name="select-choice-min" id="select-choice-1" data-theme="e"
+ data-native-menu="false">
+ <option value="Arial">Font Arial</option>
+ <option value="Helvetica">Font Helvetica</option>
+ <option value="Sans-Serif">Font Sans-Serif</option>
+ </select>
+ </div>
+ </div>
+ <!-- Third row -->
+ <div id="searchDiv" data-theme="b">
+ <div data-role="header" data-theme="b">
+ <form name="searchForm" onsubmit="Verifie(searchForm);return false" class="err">
+ <input type="search" name="textToSearch" id="textToSearch" data-theme="b" placeholder="Search..."/>
+ <a id="doSearch" onclick="Verifie(searchForm)" data-theme="b"/>
+ </form>
</div>
+ <div id="searchResults">
+ <!-- Show the results -->
+ </div>
</div>
</div>
</div>
@@ -1134,7 +1155,12 @@
<script type="text/javascript" src="../js/mobile-settings.js">//mobile-settings</script>
</head>
<body>
- <div data-role="page" id="current_page">
+ <!-- Set id for toc.html as its name -->
+ <xsl:variable name="id_toc" select="translate(concat('id_',$mobile.toc.filename),'.','_')"/>
+ <div data-role="page" >
+ <xsl:attribute name="id">
+ <xsl:value-of select="$id_toc"/>
+ </xsl:attribute>
<div data-role="header">
<h1>Table of Content</h1>
</div>
@@ -1149,5 +1175,26 @@
</xsl:with-param>
</xsl:call-template>
</xsl:template>
+ <!-- ============================================================ -->
+ <!-- = l10n.js ...
[truncated message content] |