diff --git a/en-US/configure.ini b/en-US/configure.ini index cea68cb..1b6a0af 100755 --- a/en-US/configure.ini +++ b/en-US/configure.ini @@ -1,4 +1,4 @@ -; ***** BEGIN LICENSE BLOCK ***** +; ***** BEGIN LICENSE BLOCK ***** ; SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer ; Copyright (C) 2009, 2010, 2011 Chris Pollett chris@pollett.org ; @@ -14,9 +14,9 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see <http://www.gnu.org/licenses/>. -; ***** END LICENSE BLOCK ***** +; ***** END LICENSE BLOCK ***** ; -; configure.ini +; configure.ini ; ; en-US configuration file ; @@ -26,7 +26,7 @@ ; [strings] ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//controllers +; /Applications/MAMP/htdocs/git/seek_quarry//controllers ; ; admin_controller.php line: 105 admin_controller_login_successful = "Login Successful!!" @@ -172,15 +172,69 @@ admin_controller_describe_robot = "Please Describe Your Robot" ; main_controller.php line: 92 search_controller_logout_successful = "Logout Successful!!" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views +; main_controller.php line: 136 +main_controller_download = "Download Form" ; -; admin_view.php line: 76 +; main_controller.php line: 153 +main_controller_missing_fields = "Missing Fields! Form not processed!" +; +; main_controller.php line: 182 +main_controller_email_sent = "Download Email Sent!" +; +; main_controller.php line: 196 +main_controller_yioop_download = "Yioop Download Information" +; +; main_controller.php line: 197 +main_controller_click_download = "Use the link below to download Yioop software:" +; +; main_controller.php line: 208 +main_controller_url_error = "URL Format Error!" +; +; main_controller.php line: 217 +main_controller_expired_url = "Expire Url. Please fill out the form again to download!" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views +; +; admin_view.php line: 77 admin_view_admin = "Admin" ; -; admin_view.php line: 95 +; admin_view.php line: 97 adminview_auto_logout_one_minute = "Auto-logout in One Minute!!" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/elements +; download_view.php line: 62 +download_view_form = "Download Form" +; +; download_view.php line: 73 +download_view_thank_you = "Thank you for your interest in Yioop Search Engine Software. To obtain an email with a download link please fill out the form below. We use the information collected to better understand our users and to connect our users with services available for our software." +; +; download_view.php line: 76 +download_view_full_name = "Full Name" +; +; download_view.php line: 82 +download_view_email = "Email" +; +; download_view.php line: 87 +download_view_business = "Organization" +; +; download_view.php line: 93 +download_view_interest = "Briefly Describe your Interest in Yioop Software:" +; +; download_view.php line: 100 +download_view_get_email = "Send Download Email" +; +; download_view.php line: 106 +download_view_return_main = "Return" +; +; download_view.php line: 120 +download_view_required_fields = "Please Fill-in the Required Fields!" +; +; download_view.php line: 125 +download_view_name_required = "Full Name Required!" +; +; download_view.php line: 130 +download_view_valid_email = "Please Enter a Valid Email!" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views/elements ; ; activity_element.php line: 57 activity_element_activities = "Activities" @@ -389,37 +443,46 @@ signin_element_admin = "Admin" ; signin_element.php line: 67 signin_element_signout = "Sign Out" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/layouts +; /Applications/MAMP/htdocs/git/seek_quarry//views/layouts +; +; web_layout.php line: 66 +web_layout_open_seekquarry = "Open Source Search Engine Software - Seekquarry" ; -; web_layout.php line: 72 +; web_layout.php line: 73 web_layout_description = "SeekQuarry provides open source search technologies" ; -; web_layout.php line: 92 +; web_layout.php line: 94 +web_layout_open_source = "Open Source Search Engine Software" +; +; web_layout.php line: 96 +web_layout_about_sq = "About Seekquarry" +; +; web_layout.php line: 102 web_layout_query_statistics = "Query Statistics" ; -; web_layout.php line: 93 +; web_layout.php line: 103 web_layout_total_elapsed_time = "Total Elapsed Time for Queries: %s seconds." ; -; web_layout.php line: 98 +; web_layout.php line: 108 web_layout_query_time = "Time: %s seconds." ; -; main_view.php line: 70 -main_view_home = "Home" -; ; main_view.php line: 71 -main_view_demo = "Demo" +main_view_home = "Home" ; ; main_view.php line: 73 -main_view_downloads = "Downloads" +main_view_demo = "Demo" ; ; main_view.php line: 75 -main_view_documentation = "Documentation" +main_view_downloads = "Downloads" ; ; main_view.php line: 77 -main_view_resources = "Resources" +main_view_documentation = "Documentation" ; ; main_view.php line: 79 -main_view_about = "About" +main_view_discussion = "Discussion" +; +; main_view.php line: 81 +main_view_resources = "Resources" ; ; signin_view.php line: 62 signin_view_signin = "Signin" diff --git a/en-US/pages/about.thtml b/en-US/pages/about.thtml index aa8d553..c3a54cc 100755 --- a/en-US/pages/about.thtml +++ b/en-US/pages/about.thtml @@ -57,6 +57,15 @@ href="http://www.informatik.uni-leipzig.de/~duc/software/misc/wordlist.html"> Vietnamese Word List</a> obtained with permision from <a href="http://www.informatik.uni-leipzig.de/~duc/">Ho Ngoc Duc</a>. </p> +<p>The English part-of-speech tagging algorithm +in Yioop was originally coded by Shailesh Padave using with permission +the article on <a href="http://phpir.com/part-of-speech-tagging ">Brill +tagging</a> by Ian Barber. This kind of tagging in turn makes use of +the <a href="https://en.wikipedia.org/wiki/Brown_Corpus">Brown Corpus</a>. +Part-of-Speech tagging is used in Yioop only if thesaurus lookup is +being used in final result reordering. In this case, to generate the +thesaurus, <a href="http://wordnet.princeton.edu/wordnet/">WordNet</a> is used. +</p> <h1>Additional Credits</h1> <p> @@ -65,44 +74,13 @@ with localization: Mary Pollett, Jonathan Ben-David, Ismail.B, Andrea Brunetti, Thanh Bui, Sujata Dongre, Animesh Dutta, Aida Khosroshahi, Youn Kim, Akshat Kukreti, Vijeth Patil, Chao-Hsin Shih, -Ahmed Kamel Taha, and Sugi Widjaja. Thanks to Ravi Dhillon, Akshat Kukreti, -Tanmayee Potluri, Shawn Tice, and Sandhya Vissapragada for -creating patches for Yioop issues. Several of my master's students have done -projects related to Yioop: Amith Chandranna, Priya Gangaraju, -Akshat Kukreti, Vijaya Pamidi, Vijeth Patil, Vijaya Sinha, Tarun Pepira, -Tanmayee Potluri, Shawn Tice, and Sandhya Vissapragada. Amith's code related to an -Online version of the HITs algorithm. It is not currently in the main branch of -Yioop, but it is obtainable from -<a href="http://www.cs.sjsu.edu/faculty/pollett/masters/Semesters/ -Spring10/amith/index.shtml">Amith Chandranna's student page</a>. -Vijaya Pamidi developed a Firefox web traffic extension for Yioop. -Her code is also obtainable from <a href="http://www.cs.sjsu.edu/faculty/ -pollett/masters/Semesters/Fall10/vijaya/index.shtml">Vijaya Pamidi's -master's pages</a>. Her project was later extended by -<a href="http://www.cs.sjsu.edu/faculty/pollett/masters/Semesters/Fall11/tarun/ -index.shtml?Bio.shtml#top">Tarun Ramaswamy</a>. Neither of these projects -is currently in the main Yioop repository. <a href="http://www.cs.sjsu.edu/ -faculty/pollett/ -masters/Semesters/Fall11/vijeth/index.shtml">Vijeth Patil's Project</a> -involved adding support for Twitter and RSS feeds to add additional real-time -search results to the standard search results. This is not currently in main -repository. <a href="http://www.cs.sjsu.edu/faculty/pollett/masters/Semesters/ -Fall11/tanmayee/index.shtml">Tanmayee Potluri's Project</a> added -log and database archive iterators for Yioop. It is currently not in the main -branch. <a href="http://www.cs.sjsu.edu/faculty/pollett/ -masters/Semesters/Spring11/amith/index.shtml">Vijaya Sinha's Project</a> -concerned using Open Street Map data in Yioop. This code is also not currently -in the main branch. Priya Gangaraju's code served as the -basis for the plugin feature currently in Yioop. Shawn Tice's CS288 -project served as the basis of a rewrite of the archive crawl feature of Yioop -for the multi-queue server setting. His CS298 project served as the basis -for classifier feature within Yioop. Sandhya Vissapragada's Master project -served as the basis for the autosuggest and spell checking functionality in -Yioop. The following other students have created text processors for Yioop: -Nakul Natu (pptx), Vijeth Patil (epub), and Tarun Ramaswamy (xslx). -Akshat Kukreti created the Italian language stemmer based on the Snowball -version at <a href="http://tartarus.org/">http://tartarus.org/</a>. His CS298 -project served as the basis for the cache history feature and the as the basis -etags support while crawling in Yioop. - +Ahmed Kamel Taha, and Sugi Widjaja. Several of my former students +have contributed code which appear in the Yioop repository. They are: +Mangesh Dahale, Ravi Dhillon, Priya Gangaraju, +Akshat Kukreti, Sreenidhi Pundi Muralidharan, Nakul Natu, Shailesh Padave, +Vijaya Pamidi, Snigdha Parvatneni, Akash Patel, Vijeth Patil, Mallika Perepa, +Tarun Pepira, Eswara Rajesh Pinapala, Tamayee Potluri, Shawn Tice, +Sandhya Vissapragada. In addition, several of my students have created projects +based on Yioop. Information about these project can be found on their +<a href="http://www.cs.sjsu.edu/faculty/pollett/masters/">student pages</a>. </p> diff --git a/en-US/pages/coding.thtml b/en-US/pages/coding.thtml index 1324f8e..fae7410 100755 --- a/en-US/pages/coding.thtml +++ b/en-US/pages/coding.thtml @@ -13,6 +13,8 @@ <li><a href="#organization">Code-base Organization</a></li> <li><a href="#patches">Issue Tracking/Making Patches/Commit Messages</a></li> + <li><a href="#checklist">New Version Quality Assurance Checklist</a> + </li> </ul> <h2 id="intro">Introduction</h2> @@ -292,7 +294,7 @@ class MyClass using the keywords: public, protected, private. At this point, Yioop classes are <b>not</b> written with this feature.</li> <li>Except for loop variables where $i, $j, $k may be used, preference - should be given to variable names which are full words. $queue rather + should be given to variable names which are full words. $queue rather than $q, for example. Some common abbreviations are permissible $dir (for directory), $db (for database), $str (for string), but should be avoided. </li> @@ -457,6 +459,13 @@ $data['SCRIPT'] .= </li> <li>External Javascript files (.js files) should not contain any PHP code. </li> + <li>External Javascript files should be included using the + $data['INCLUDE_SCRIPTS'] array. For example, + <pre> + $data['INCLUDE_SCRIPTS'] = array("script1", "script2"); + </pre> + would include script1.js and script2.js from the Yioop script folder. + </li> </ol> <p><a href="#toc">Return to table of contents</a>.</p> @@ -671,11 +680,11 @@ master's pages</a> variable of any subclass of Model.</li> <li>SQL should not appear in Yioop in any functions or classes other than subclasses of Model.</li> - <li>SQL code should be in uppercase. An example PHP string of SQL + <li>SQL code should be in uppercase. An example PHP string of SQL code might look like: <pre> $sql = "SELECT LOCALE_NAME, WRITING_MODE ". - " FROM LOCALE WHERE LOCALE_TAG ='$locale_tag'"; + " FROM LOCALE WHERE LOCALE_TAG = ?"; </pre> </li> <li>New tables names and field names created for Yioop should also be @@ -687,9 +696,35 @@ master's pages</a> >BCNF normalization</a>. <a href="http://en.wikipedia.org/wiki/Denormalization">Denormalization</a> should be avoided.</li> - <li>When inserting into a Yioop table, strings should be properly + <li> + Yioop's DatasourceManager class does have a facility for prepared + statements. Using prepared statements should be preferred over escaping + query parameters. Below is exampled of prepared statements in + Yioop called from a model: + <pre> + $sql = "INSERT INTO CRAWL_MIXES VALUES (?, ?, ?, ?)"; + $this->db->execute($sql, array($timestamp, $mix['NAME'], + $mix['OWNER_ID'], $mix['PARENT'])); + </pre> + Notice how the values that are to be filled in for the ? are listed in + order in the array. execute caches the last statement it has seen, so + internally if you call $db->execute twice with the same statement it doesn't + do the lower level prepare call to the database the second time. You can + also use named parameters, as in the following example: + <pre> + $sql = "UPDATE VISITOR SET DELAY=:delay, END_TIME=:end_time, + FORGET_AGE=:forget_age, ACCESS_COUNT=:account_count + WHERE ADDRESS=:ip_address AND PAGE_NAME=:page_name"; + $this->db->execute($sql, array( + ":delay"=>$delay, ":end_time" => $end_time, + ":forget_age" => $forget_age, + ":account_count" => $access_count, + ":ip_address" => $ip_address, ":page_name" => $page_name)); + </pre> + </li> + <li>In the rare case where a non-prepared statement + is used, strings should be properly escaped using DatasourceManager::escape_string. For example, - the following SQL code string appears in locale_model.php. <pre> $sql = "INSERT INTO LOCALE". "(LOCALE_NAME, LOCALE_TAG, WRITING_MODE) VALUES". @@ -698,12 +733,7 @@ master's pages</a> "', '".$this->db->escapeString($writing_mode)."')"; </pre> </li> - <li> - Yioop's DatasourceManager class does not have a facility for prepared - statements at this point, but might have such a facility in the future, - in which case prepared statements should be slightly preferred over - non-prepared variants. - </li> + </ol> <p><a href="#toc">Return to table of contents</a>.</p> <h2 id="localization">Localization</h2> @@ -874,10 +904,11 @@ master's pages</a> >clickjacking</a>. </li> <li>The Yioop web app has the following kinds of files: - models, controllers, views, element, helpers, and layouts. These - should be put respectively into the folders: models, controllers, - views, views/elements, views/helpers, views/layouts. Filenames - should for these files should end with its type: i.e., a view + controllers, models, views, (these three are main three); and + components, element, helpers, and layouts (lesser). + These should be put respectively into the folders: controllers, models, + views, controllers/components, views/elements, views/helpers, views/layouts. + Filenames should for these files should end with its type: i.e., a view should end with _view.php, for example, my_view.php .</li> <li>A view roughly corresponds to one web page, a layout is used to render common page headers and footers for several views, @@ -890,7 +921,10 @@ master's pages</a> PHP in these classes should be restricted to simple conditionals and echos of $data variable fields.</li> <li>Control logic involving conditionals, loops, etc. should - be put in controllers.</li> + be put in controllers or components. Components are collections of + related methods which might be used by several controllers (a little + like PHP 5.4 traits). A component and a $parent field that allows access + to the controller it currently lives on.</li> <li>In the web app, only models should access the file system or a database.</li> <li>Variables whose values come from a web client should be @@ -1408,3 +1442,28 @@ machinelog_element, a=chris <p><a href="#toc">Return to table of contents</a>.</p> </div> +<h2 id="checklist">New Version Quality Assurance Checklist</h2> +<p>The following should be check before creating a new release of Yioop: +</p> +<ol> +<li>All unit tests pass.</li> +<li>Included sqlite database default.db is up-to-date.</li> +<li>Install guides are up to date and installation can be performed +as described for each of the major platforms (Linux variants, MAC OSX, Windows, +HipHop).</li> +<li>Upgrade functions successfully upgrade Yioop from last version. Upgrade +functions need only be written from the last official release to the +current official release.</li> +<li>Yioop can perform a regular and archive crawl on each of the platforms +for which an install guide has been made.</li> +<li>Each kind of archive iterator has been tested on the development platform +to be still working.</li> +<li>Multi-queue server crawls should be tested. Mirror and Newsupater processes +should be tested.</li> +<li>Documentation reflects changes since last version of Yioop, screenshots +have been updated.</li> +<li>Each admin panel activity and each setting within each activity works +as described.</li> +<li>Web app still appears correctly for major browsers: Firefox, Chrome, +Internet Explorer, Safari released in the last two years.</li> +</ol> diff --git a/en-US/pages/documentation.thtml b/en-US/pages/documentation.thtml index 81bada5..abb5564 100755 --- a/en-US/pages/documentation.thtml +++ b/en-US/pages/documentation.thtml @@ -1,5 +1,5 @@ <div class="docs"> -<h1>Yioop Documentation v 0.98</h1> +<h1>Yioop Documentation v 1.0</h1> <h2 id='toc'>Table of Contents</h2> <ul> <li><a href="#overview"><b>Overview</b></a> @@ -13,6 +13,8 @@ <ul> <li><a href="#requirements">Requirements</a></li> <li><a href="#installation">Installation and Configuration</a></li> + <li><a href="#optional">Optional Server and Security + Configurations</a></li <li><a href="#upgrade">Upgrading Yioop</a></li> <li><a href="#files">Summary of Files and Folders</a></li> </ul> @@ -725,40 +727,20 @@ in the examples folder at the file search_api.php to see an example of how to use it. <b>If you intend to use Yioop in a configuration with multiple queue servers (not fetchers), then the RSS checkbox needs to be checked.</b></p> -<p>The <b>Database Set-up</b> fieldset is used to specify what database -management system should be used, how it should be connected to, and what -user name and password should be used for the connection. At present -<a href="http://www.php.net/manual/en/intro.pdo.php">PDO</a> -(PHP's generic DBMS interface), sqlite2 -(called just sqlite), sqlite3, and Mysql databases are supported. The -database is used to store information about what users are allowed to -use the admin panel and what activities and roles these users have. Unlike -many database systems, if -an sqlite or sqlite3 database is being used then the connection is always -a file on the current filesystem and there is no notion of login -and password, so in this case only the name of the database is asked for. -For sqlite, the database is stored in WORK_DIRECTORY/data.</p> -<p>If you would like to use a different DBMS the Sqlite or Mysql, then -the easiest way is to select PDO as the Database System and for the -Hostname given use the DSN with the appropriate DBMS driver. -For example, for Postgres one might have something like:</p> -<pre> -pgsql:host=localhost;port=5432;dbname=testdb;user=bruce;password=mypass -</pre> -<p>You can put the username and password either in the DSN or in the Username -and Password fields.</p> -<p>When switching -database information, Yioop checks first if a usable database with the user -supplied data exists. If it does, then it uses it; otherwise, it tries to -create a new database. Yioop comes with a small sqlite demo database in the -data directory and this is used to populate the installation database in this -case. This database has one account root with no password -which has privileges on all activities. Since different databases associated -with a Yioop installation might have different user accounts set-up after -changing database information you might have to sign in again. -</p> - +<h3 id='optional'>Optional Server and Security Configurations</h3> +<p>The configuration activity just described suffices to set up +Yioop for a single server crawl. If that is what you are interested in +you may want to skip ahead to the section on the +<a href="#interface">Yioop Search Interface</a> to learn about +the different search features available in Yioop or you may want to +skip ahead to <a href="#crawls">Performing and Managing Crawl</a> to +learn about how to perform a crawl. In this section, we describe the +Server Settings and Security activities which might be useful +in a multi-machine, multi-user setting and which might also be useful +for crawling hidden websites or crawling through proxies.</p> +<p>The Server Settings activity looks like:</p> +<img src='resources/ServerSettings.png' alt='The Server Settings Activity'/> <p>The <b>Name Server Set-up</b> fieldset is used to tell Yioop which machine is going to act as a name server during a crawl and what secret string to use to make sure that communication is being done between @@ -787,19 +769,62 @@ data is involved. i.e., if a redirect happens, it does not send posted data to the redirected site. For this reason, Yioop insists on a trailing slash on your queue server url. Beneath the Queue Server Url field, is a Memcached checkbox and a Filecache checkbox. Only one of these -can be checked at a time. Checking the Memcached checkbox allows you to specify +can be checked at a time. The Memcached check box only shows if you +have <a href="http://php.net/manual/en/book.memcache.php">PHP Memcache</a> +installed. Checking the Memcached checkbox allows you to specify memcached servers that, if specified, will be used to cache in memory search query results as well as index pages that have been accessed. Checking the Filecache box, tells Yioop to cache search query results in temporary files. -Memcached probably gives a better performance boost than Filecaching, but -not all hosting environments have Memcached available. +Memcache probably gives a better performance boost than Filecaching, but +not all hosting environments have Memcache available. </p> +<p>The <b>Database Set-up</b> fieldset is used to specify what database +management system should be used, how it should be connected to, and what +user name and password should be used for the connection. At present +<a href="http://www.php.net/manual/en/intro.pdo.php">PDO</a> +(PHP's generic DBMS interface), sqlite3, and Mysql databases are supported. The +database is used to store information about what users are allowed to +use the admin panel and what activities and roles these users have. Unlike +many database systems, if +an sqlite3 database is being used then the connection is always +a file on the current filesystem and there is no notion of login +and password, so in this case only the name of the database is asked for. +For sqlite, the database is stored in WORK_DIRECTORY/data. For single +user settings with a limited number of news feeds, sqlite is probably +the most convenient database system to use with Yioop. If you think +you are going to make use of Yioop's social functionality and have +many users, feeds, and crawl mixes, using a system like Mysql or Postgres +might be more appropriate.</p> +<p>If you would like to use a different DBMS than Sqlite or Mysql, then +the easiest way is to select PDO as the Database System and for the +Hostname given use the DSN with the appropriate DBMS driver. +For example, for Postgres one might have something like:</p> +<pre> +pgsql:host=localhost;port=5432;dbname=test;user=bruce;password=mypass +</pre> +<p>You can put the username and password either in the DSN or in the Username +and Password fields. The database name field must be filled in with +the name of the database you want to connect to. It is also include +needs to be included in the dsn, as in the above. PDO and Yioop has been +tested to work with Postgres and sqlite, for other DBMS's it might +take some tinkering to get things to work.</p> - -<p> -After filling in all the fieldsets and submitting the form, -the installation is complete. +<p>When switching +database information, Yioop checks first if a usable database with the user +supplied data exists. If it does, then it uses it; otherwise, it tries to +create a new database. Yioop comes with a small sqlite demo database in the +data directory and this is used to populate the installation database in this +case. This database has one account root with no password +which has privileges on all activities. Since different databases associated +with a Yioop installation might have different user accounts set-up after +changing database information you might have to sign in again. </p> + +<p>The <b>Account Registration</b> fieldset </p> + + +<p>The Security activity looks like:</p> +<img src='resources/Security.png' alt='The Security Activity'/> <p><a href="#toc">Return to table of contents</a>.</p> <h3 id='upgrade'>Upgrading Yioop</h3> @@ -1111,13 +1136,17 @@ Admin control panel you clicked on more statistics for the crawl. This link goes to a page showing many global statistics about the web crawl. Beneath this link are the Blog and Privacy links (as well as a link back to the SeekQuarry site). These two links are to static pages which can be customized -through the Manage Locale activity. A typical search results might look like: +through the Manage Locale activity. Typical search results might look like: </p> <img src='resources/SearchResults.png' alt='Example Search Results' -width="70%"/> -<p>Hovering over the Score of a search results reveals its component scores. +width="50%"/> +<p>Thesaurus results might appear to one side and suggest alternative queries +based on a thesaurus look up (for English, this is based on Wordnet). +The terms next Words: are a word cloud of important terms in the document. +These are created if the indexer user the centroid summarizer. +Hovering over the Score of a search result reveals its component scores. These might include: Rank, Relevance, Proximity, as well as any Use to Rank -Classifier scores.</p> +Classifier scores and Word Net scores (if installed).</p> <img src='resources/ScoreToolTip.png' alt='Example Score Components Tool Tip'/> <p>If one slightly mistypes a query term, Yioop can sometimes suggest @@ -1486,6 +1515,10 @@ Yioop from a mobile device. this activity just lets user's change their password using the form pictured below. The intention is as Yioop development continues additional features might be configured in this activity.</p> +<img src='resources/ManageAccount.png' alt='Manage Account Page'/><br /> +<img style="vertical-align:top;" + src='resources/ChangeAccountInfo.png' alt='Change Account Information + Form'/> <img src='resources/ChangePassword.png' alt='Change Password Form'/> <p><a href="#toc">Return to table of contents</a>.</p> @@ -1499,7 +1532,9 @@ Yioop from a mobile device. they have been directly assigned and by which groups they belong to. The Manage User activity looks like:</p> -<img src='resources/ManageUser.png' alt='The Manage User form'/> +<img src='resources/AddUser.png' alt='The Add User form'/><br /> +<img src='resources/EditUser.png' alt='The Edit User form'/><br /> +<img src='resources/SearchUser.png' alt='The Search User form'/> <p>As one can see this activity has three forms associated with it: The first form can be used to add a new user with a given password to the Yioop system. The second form allows existing users to be deleted. @@ -1510,7 +1545,8 @@ Yioop from a mobile device. in the role.</p> <p>Roles are managed through the Manage Role activity, which looks like:</p> -<img src='resources/ManageRole.png' alt='The Manage Role form'/> +<img src='resources/AddRole.png' alt='The Add Role form'/><br /> +<img src='resources/EditRole.png' alt='The Edit Role form'/> <p> The three forms on this activity allow you to create a new role, delete an existing role, and finally choose an existing role and add or delete @@ -1518,7 +1554,10 @@ Yioop from a mobile device. </p> <p>Groups are collections of users that have access to a set of roles. Groups are managed through the Manage Groups activity which looks like:</p> -<img src='resources/ManageGroups.png' alt='The Manage Group form'/> +<img src='resources/ManageGroups.png' alt='The Manage Group form'/><br /> +<img src='resources/BrowseGroups.png' alt='The Browse Group form'/><br /> +<img src='resources/EditGroup.png' alt='The Edit Group form'/><br /> +<img src='resources/TransferGroup.png' alt='The Transfer Group form'/> <p>The first two forms in this activity allow one to create an empty group and to delete a group. Selecting a group in the View Groups drop down displays two more drop downs: Add User, which allows one to @@ -1908,7 +1947,32 @@ sql = "SELECT MYCOL1, MYCOL2 FROM MYTABLE1 M1, MYTABLE2 M2 WHERE M1.FOO=M2.BAR"; field_value_separator = '|'; column_separator = '##'; </pre> - <p>Possible values for <i>dbms</i> are pdo, mysql, sqlite, sqlite3. + <p>Here is a specific example that gets the rows out of the TRANSLATION + table of Yioop where the database was stored in a Postgres DBMS. + In the comments I indicate how to alter it for other DBMS's. + </p> + <pre> +arc_type = 'DatabaseBundle'; +description = 'DB Records'; +;sqlite3 specific +;dbms ="sqlite3"; +;mysql specific +;dbms = "mysql"; +;db_host = "localhost"; +;db_user = "root"; +;db_password = ""; +dbms = "pdo"; +;below is for postgres; similar if want db2 or oracle +db_host = "pgsql:host=localhost;port=5432;dbname=seek_quarry" +db_name = "seek_quarry"; +db_user = "cpollett"; +db_password = ""; +encoding = "UTF-8"; +sql = "SELECT * from TRANSLATION"; +field_value_separator = '|'; +column_separator = '##'; + </pre> + <p>Possible values for <i>dbms</i> are pdo, mysql, sqlite3. If pdo is chosen, then db_host should be a <a href="http://www.php.net/manual/en/pdo.connections.php">PHP DSN</a> specifying which DBMS driver to use. db_name is the name of the database @@ -2126,8 +2190,8 @@ define('HHVM_PATH', '/usr/local/bin'); the text box and hitting the Create button initializes a new classifier, which will then show up in the table.</p> - <img src="resources/ClassifiersManage.png" - alt="The Classifiers manage page" /> + <img src="resources/ManageClassifiers.png" + alt="The Manage Classifiers page" /> <p>Once you have a fresh classifier, the natural thing to do is edit it by clicking on the Edit action link. If you made a mistake, however, or no @@ -3075,7 +3139,7 @@ xmlns:atom="http://www.w3.org/2005/Atom" Site using Yioop as a Framework</a> section, then the localization tools described in this section can also be used to localize your custom site. Clicking the Manage Locales activity one sees a page like:</p> -<img src='resources/ManagingLocales.png' alt='The Manage Locales form'/> +<img src='resources/ManageLocales.png' alt='The Manage Locales form'/> <p> The first form on this activity allows you to create a new locale -- an object representing a language and a region. The first field @@ -3102,7 +3166,7 @@ xmlns:atom="http://www.w3.org/2005/Atom" the percentage of strings ids that have already been translated for the locale. To translate string ids for a locale click on its link. This should display the following form:</p> -<img src='resources/EditingLocaleStrings.png' alt='The Edit Locales form'/> +<img src='resources/EditLocaleStrings.png' alt='The Edit Locales form'/> <p>In the above case, the link for English was clicked. The Back link in the corner can be used to written to the previous form. The Static Pages download has a list of all the static pages (.thtml files) @@ -3804,13 +3868,13 @@ pp.280-290. 2003. </dd> <dt id="B1970">[B1970]</dt> <dd>Bloom, Burton H. -<a href="http://dx.doi.org/10.1145%2F362686.362692" +<a href="http://www.lsi.upc.edu/~diaz/p422-bloom.pdf" >Space/time trade-offs in hash coding with allowable errors</a>. Communications of the ACM Volume 13 Issue 7. pp. 422–426. 1970. <dd> <dt id="BSV2004">[BSV2004]</dt> <dd>Paolo Boldi and Massimo Santini and Sebastiano Vigna. -<a href="http://vigna.dsi.unimi.it/ftp/papers/ParadoxicalPageRank.pdf" +<a href="http://vigna.di.unimi.it/ftp/papers/ParadoxicalPageRank.pdf" >Do Your Worst to Make the Best: Paradoxical Effects in PageRank Incremental Computations</a>. Algorithms and Models for the Web-Graph. pp. 168–180. 2004. </dd> @@ -3839,7 +3903,7 @@ OSDI'04: Sixth Symposium on Operating System Design and Implementation. 2004<dd> <dd> A. Genkin, D. Lewis, and D. Madigan. <a href="http://www.stat.columbia.edu/~madigan/PAPERS/techno.pdf" ->Large-scale bayesian logistic regressionfor text categorization</a>. +>Large-scale bayesian logistic regression for text categorization</a>. Technometrics. Volume 49. Issue 3. pp. 291--304, 2007. </dd> <dt id='H2002'>[H2002]</dt> @@ -3850,7 +3914,7 @@ http://infolab.stanford.edu/~taherh/papers/topic-sensitive-pagerank.pdf" World Wide Web Conference (Honolulu, Hawaii). 2002.</dd> <dt id="KSV2010">[KSV2010]</dt> <dd>Howard Karloff, Siddharth Suri, and Sergei Vassilvitskii. -<a href="http://www.siam.org/proceedings/soda/2010/SODA10_076_karloffh.pdf" +<a href="http://theory.stanford.edu/~sergei/papers/soda10-mrc.pdf" >A Model of Computation for MapReduce</a>. Proceedings of the ACM Symposium on Discrete Algorithms. 2010. pp. 938-948.</dd> <dt id="KC2004">[KC2004]</dt><dd>Rohit Khare and Doug Cutting. @@ -3881,8 +3945,8 @@ Cambridge University Press. 2008.</dd> <dt id="PTSHVC2011">[PTSHVC2011]</dt> <dd>Manish Patil, Sharma V. Thankachan, Rahul Shah, Wing-Kai Hon, Jeffrey Scott Vitter, Sabrina Chandrasekaran. -<a href="http://www.cs.nthu.edu.tw/~wkhon/papers/PTSHVC11.pdf">Inverted indexes -for phrases and strings</a>. Proceedings of the +<a href="http://www.ittc.ku.edu/~jsv/Papers/PTS11.InvertedIndexSIGIR.pdf" +>Inverted indexes for phrases and strings</a>. Proceedings of the 34nth Annual International ACM SIGIR Conference on Research and Development in Information Retrieval. pp 555--564. 2011. </dd> diff --git a/en-US/pages/downloads.thtml b/en-US/pages/downloads.thtml index ac8857d..fdb3b7d 100755 --- a/en-US/pages/downloads.thtml +++ b/en-US/pages/downloads.thtml @@ -1,25 +1,25 @@ -<div> <h1>Downloads</h1> <h2>Yioop Releases</h2> <p>The two most recent versions of Yioop are:</p> <ul> -<li><a href="http://www.seekquarry.com/viewgit/?a=archive& -p=yioop&h=bf48e34ffa1fc707b13107a4981e4ef9c6952048& -hb=f5fe1a90318da6cf242484f15bb3661b02d64fca&t=zip" - >Version 0.98-ZIP</a></li> -<li><a href="http://www.seekquarry.com/viewgit/?a=archive& -p=yioop&h=71864bbd75c0a877c10e97840e9b628a6c7ad416& -hb=f32456c48a7f9d2f03374ae37f695fd9492191a5&t=zip" - >Version 0.961-ZIP</a></li> +<li><a href="?c=main&a=download&version=1.00">Version 1.00</a></li> +<li><a href="?c=main&a=download&version=0.98">Version 0.98</a></li> </ul> -<h2 id='contribute'>Show Your Support</h2> +<h2 id='consulting'>Support Services / Support Yioop</h2> +<p>Too busy to set up and host a Yioop search engine yourself? +<a href="http://www.crunchindex.com/">CrunchIndex.com</a> +provides a variety of Yioop services. Besides hosting +Yioop indexes, these can involve +help with regard to installing, customizing, upgrading, or tuning Yioop. They can also +involve paying for new features to be added to the next iteration of Yioop +or for customizations not to be included in the main code base.</p> <p>Seekquarry, LLC is a company owned by Chris Pollett, the principal developer of Yioop. If you like Yioop and would like to show support for this project, please consider making a contribution.</p> -<div> -<form action="https://www.paypal.com/cgi-bin/webscr" method="post" -target="_top" style="float:left; margin-left:1.5in; margin-right:1.5in;"> +<div class="center"> +<form action="https://www.paypal.com/cgi-bin/webscr" method="post" +target="_top" > <div class="center">Paypal</div> <input type="hidden" name="cmd" value="_s-xclick" /> <input type="hidden" name="hosted_button_id" value="3B94XKR9GTPNG" /> @@ -28,16 +28,7 @@ target="_top" style="float:left; margin-left:1.5in; margin-right:1.5in;"> style="border:0" name="submit" alt="PayPal - The safer, easier way to pay online!" /> </form> -<div> -<p style="text-indent:0.2in">Flattr</p> -<p style="position:relative;top:-0.1in"><a -href="http://flattr.com/thing/1671104/SeekQuarryYioop" -target="_blank"><img src="resources/flattr-badge-large.png" -alt="Flattr this" title="Flattr this" border="0" /></a></p> -</div> - </div> - <h2>Installation</h2> <p>The <a href="?c=main&p=install">Install Guides</a> explain how to get Yioop to work in some common settings. @@ -54,16 +45,6 @@ your old Yioop Installation. See the Installation section above for links to instructions on this, if you have forgotten how you did this. Knowing the old Work Directory location, should allow Yioop to complete the upgrade process.</p> -<h2 id='consulting'>Consulting Services</h2> -<p> -Consulting services are available for Yioop. These can involve -help with regard to installing, upgrading, or tuning Yioop. They can also -involve paying for new features to be added to the next iteration of Yioop -or for customizations not to be included in the main code base.</p> -<p>Please -<a href="mailto:chris@pollett.org">contact us for a quote</a> with a -brief description of the services you need. -</p> <h2>Git Repository / Contributing Code</h2> <p>The Yioop git repository allows anonymous read-only access. If you would diff --git a/en-US/pages/home.thtml b/en-US/pages/home.thtml index 76f4152..834b01e 100755 --- a/en-US/pages/home.thtml +++ b/en-US/pages/home.thtml @@ -1,39 +1,43 @@ <h1>Open Source Search Engine Software!</h1> <p>SeekQuarry is the parent site for <a href="http://www.yioop.com/">Yioop</a>. Yioop is a <a href="http://gplv3.fsf.org/">GPLv3</a>, open source, PHP search -engine. +engine. </p> -<h2>Goals</h2> -<p>Yioop was designed with the following goals in mind:</p> +<h2>What can Yioop do?</h2> +<p>Yioop software provides many of the same features of larger +search portals:</p> <ul> -<li><b>Make it easier to obtain personal crawls of the web.</b> Only a web -server such as Apache and PHP 5.3 or better is needed. Configuration can be -done using a GUI interface. Yioop can be configured as either a general purpose -search engine for the whole web or it can be configured to provide search -results for a set of urls or domains. It can crawl a variety of -file formats, and can be used as a news feed crawler.</li> -<li><b>Support distributed crawling of the web, if desired.</b> To download -many web pages quickly, it is useful to have more than one machine when crawling -the web. If you have several machines at home, simply install the software -on all the machines you would like to use in a web crawl. In the configuration -interface give the URL of the machine you would like to serve search results -from. Start at least one queue server and as many fetchers as desired on -the other machines.</li> -<li><b>Be fast and online.</b> Yioop is "online" in -that it creates a word index and document ranking as it crawls rather -than ranking as a separate step. This keeps the processing done by any -machine as low as possible so you can still use them for what you bought them -for. Nevertheless, it is reasonably fast: A test set-up consisting of three -Mac Mini's each with 8GB RAM, a queue_server, and five fetchers adds a -100 million pages to its index every four weeks. +<li><b>Search Results</b>. Yioop comes with a crawler which can be used +to crawl the open web or a selection of URLs of your choice. It +also can index popular archive formats like Wikipedia XML-dumps, arc, warc, +Open Directory Project-RDF, as well as dumps of emails or databases. +Once you have created Yioop indexes of your desired data sources, Yioop +can serve as a search engine for your data. It supports "crawl mixes" +of different data sources. Yioop also provides tools to classify and sculpt your +data before being used in search results. </li> -<li><b>Make it easy to archive crawls.</b> Crawls are stored in timestamped -folders that can be moved around zipped, etc. Through the admin interface you -can select amongst crawls which exist in a crawl folder as to which crawl you -want to serve from.</li> -<li><b>Make it easy to crawl archives.</b> There are many sources of -raw web data available today such as files that use the Internet Archive's -arc and warc formats, Open Directory Project RDF data, Wikipedia xml dumps, etc. -Yioop can index these formats directly, allowing one to get an index for these -high-value sites without needing to do an exhaustive crawl.</li> +<li><b>News Service</b>. News is best when it is still fresh. Yioop has +a news updater process that can be used to re-index RSS and Atom feeds on +an hourly basis. This more timely information can then be incorporated into +Yioop search results.</li> +<li><b>Social Groups, Blogs, and Wikis</b>. Yioop can be configured +to allow user's to create discussion groups, blogs, and wikis. If Yioop is +configured to allow multiple users, +then users can share mixes of crawls they create. Blogs and discussion group +can be made public or private. Public ones have public RSS feeds and the better +amongst these can be chosen for incorporation in what Yioop's news service +indexes.</li> +<li><b>Web Sites</b>. Yioop provides a <a +href="http://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93adapter" +>Model View Adapter</a> framework which can be easily extended to build +customized search portal websites. Yioop can also be integrated into +existing sites to provide search functionality either through an API, +Open Search RSS, or JSON services.</li> </ul> +<h2>Requirements</h2> +<p>The software and hardware requirements for Yioop are relatively low. +At a minimum, you only need a web server such as Apache and PHP 5.3 or better. +A test set-up consisting of three 2011 +Mac Mini's each with 8GB RAM, a single name server, +and five fetchers can add a 100 million pages to its index every four weeks. +</p> diff --git a/en-US/pages/install.thtml b/en-US/pages/install.thtml index 457aedc..dccd03b 100755 --- a/en-US/pages/install.thtml +++ b/en-US/pages/install.thtml @@ -179,7 +179,8 @@ able to search using this index. </ol> <h2 id="osx">Mac OSX / Mac OSX Server</h2> -<p>The instructions given here are for OSX Mountain Lion, Apple changes +<p>The instructions given here are for OSX Mountain Lion (10.8) and +OSX Mavericks (10.9), Apple changes the positions with which files can be found slightly between versions, so you might have to do a little exploration to find things for earlier OSX versions. </p> @@ -299,6 +300,8 @@ able to search using this index. </ol> <h2 id="ubuntu">Ubuntu Linux / Debian (with Suhosin Hardening Patch)</h2> +<p>The instructions described here have been tested on +Ubuntu 12.04 LTS and Ubuntu 14.04 LTS.</p> <ol> <li>Get PHP and Apache set-up by running the following commands as needed (you might have already done some): @@ -880,8 +883,9 @@ fields needed for what follows.</li> <li> Continuing down on the Configure element for each instance, make sure under the Search Access fieldset Web, RSS, and API are checked.</li> -<li>Next make sure the name server and server key are the same for both -instances. I.e., In the Name Server Set-up fieldset, one might set: +<li>Next click on Server Settings. Make sure the name server and server key +are the same for both instances. I.e., In the Name Server Set-up fieldset, +one might set: <pre> Server Key:123 Name Server URL:http://localhost/git/yioop1/ diff --git a/en-US/pages/ranking.thtml b/en-US/pages/ranking.thtml index 72ce53f..a699649 100644 --- a/en-US/pages/ranking.thtml +++ b/en-US/pages/ranking.thtml @@ -9,10 +9,17 @@ <li><a href="#fetchers">Fetchers and their Effect on Search Ranking</a></li> <li><a href="#queue-servers">Queue Servers and their Effect on - Search Ranking</a></li> + Search Ranking</a> + </li> + </ul> + </li> + <li><a href="#search">Search Time Ranking Factors</a> + <ul> + <li><a href="#lookup">Looking up Initial Links</a></li> + <li><a href="#reordering">Final Reordering</a> + </li> </ul> </li> - <li><a href="#search">Search Time Ranking Factors</a></li> <li><a href="#references">References</a></li> </ul> <h2 id='intro'>Introduction</h2> @@ -248,16 +255,28 @@ frac{1}{59 + mbox(Rank)_(mbox(Rel))(d)} + frac{1}{59 + <dt>Description</dt><dd>The description is used when search results are displayed to generate the snippets beneath the result link. Besides title, it has the remainder on the page words that are - used to identify a document. To obtain a description, the HTML processor + used to identify a document. The HTML processor can obtain a description + using one of two algorithms that can be set in page options. When using + the basic summarizer, it first takes the value of the content attribute of any <meta> tag whose name attribute is some case invariant of "description". To this it concatenates the non-tag contents of the first four <p> and <div> tags, followed by the content of <td>, <li>, <dt>, <dd>, and <a> tags until it reaches - a maximum of HtmlProcessor::MAX_DESCRIPTION_LEN (2000) characters. + a maximum of HtmlProcessor::MAX_DESCRIPTION_LEN (2000) characters. These items are added from the one - with the most characters to the one with the least.</dd> + with the most characters to the one with the least. + The HTML processor can also obtain a description using a centroid + summarizer. Here it removes all tags from the documents and splits the + document into sentences. Ignoring common words (stop words), an average + sentence vector is calculated. The components of this vector are terms + and the value for a component represents the likelihood that a sentence + in this document has that term. Then the distance between each sentence + and this centroid is calculated and the closest sentences are added to + the summary one by one until + HtmlProcessor::MAX_DESCRIPTION_LEN (2000) characters has been reached. + </dd> <dt>Links</dt><dd>Links are used by Yioop to obtain new pages to download. They are also treated by Yioop as "mini-documents". The url of such a mini-document is the target website of the @@ -728,6 +747,7 @@ only approximately correct, we rely on query time manipulations to try to improve the accuracy.</p> <p><a href="#toc">Return to table of contents</a>.</p> <h2 id='search'>Search Time Ranking Factors</h2> +<h3 id='lookup'>Looking up Initial Links</h3> <p>We are at last in a position to describe how Yioop calculates the three scores Doc Rank, Relevance, and Proximity at query time. When a query comes into Yioop it goes through the following stages before an actual @@ -945,12 +965,10 @@ which we give now: \sum_{j=0}^{|[u]_h|}\frac{1}{2^j}wt(([u]_h)_j) \cdot \mbox{Rel}(q, ([u]_h)_j).\\ \mbox{DR}(q, [u]) &=& \sum_{h \in H([u])} \sum_{j=0}^{|[u]_h|}\frac{1}{2^j}wt(([u]_h)_j) \cdot \mbox{DR}(q, ([u]_h)_j). - \end{eqnarray} </p> -<p></p> <p>Now that we have described how Doc Rank, Relevance, and Proximity -are calculated for groups, we have completed our description of the Yioop +are calculated for groups, we have almost completed our description of the Yioop scoring mechanism in the conjunctive query case. After performing pre-processing steps on the query, Yioop retrieves the first `n` results from its index. Here `n` defaults to 200. It then groups the @@ -959,7 +977,37 @@ for Doc Rank, Relevance, and Proximity. It then uses reciprocal rank fusion to combine these three scores into a single score, sorts the results by this score and returns to the user the top 10 of these results.</p> - +<h3 id='reordering'>Final Reordering</h3> +<p>The top 10 results produced in the last section are what is presented +in a basic configuration of Yioop. It is possible to configure Yioop +to make use of a thesaurus to reorder these 10 results before final +presentation. When this is done, these 10 results are retrieved as described +above. Yioop then does part of speech tagging on the original query. +This is done with a simplified +<a href="https://en.wikipedia.org/wiki/Brill_tagger">Brill tagger</a> +(<a href="#B1992">B1992</a>). Using the tagged version of the query, +it looks up each term for its part of speech in a thesaurus for the +current language. This is currently only implemented for English and +the thesaurus used is <a href="http://wordnet.princeton.edu/">WordNet</a>. +Possible synonyms for a term in Wordnet often have example sentences. If so, +cosine or intersection rank scores of these sentences versus the original +query are computed and the highest scoring synonym is selected. If there +are no example sentences, then the first is selected. To calculate a cosine +score we view the original query and the sentence as binary vectors where the +coordinates of the vectors are labeled by terms. So, for example, the +"the" coordinate of the original query would be 1 if the original query +contained the word "the". The dot product of these two vectors +divided by their lengths, then gives the cosine of the angle between them, +the cosine score. This scoring is done for each +term. Then for each term in the original query, the query is modified by +swapping it for its synonym. The number of documents for the modified query +as a whole phrase is looked up in the index dictionary for the current index. +The three phrases which occur most often in the dictionary are then selected. +For each of the top 10 documents for the query, the sum of the cosine +similarities of these three phrases with a documents summary is computed +to get a thesaurus score. The ten documents are then sorted by this score +and displayed. +</p> <p><a href="#toc">Return to table of contents</a>.</p> <h2 id="references">References</h2> <dl> @@ -978,7 +1026,12 @@ pp. 280-290. 2003. Information Processing and Management. Vol. 44. Iss. 2. pp. 877--892. March, 2008. </dd> - +<dt id='B1992'>[B1992]</dt> +<dd>Eric Brill. 1992. <a href="http://anthology.aclweb.org//A/A92/A92-1021.pdf" +>A simple rule-based part of speech tagger</a>. +In Proceedings of the third conference on Applied natural language processing +(ANLC '92). Association for Computational Linguistics. Stroudsburg, PA, USA. +pp. 152--155.</dd> <dt id='BP1998'>[BP1998]</dt> <dd>Brin, S. and Page, L. <a href="http://infolab.stanford.edu/~backrub/google.html" @@ -1024,8 +1077,8 @@ pp 114--118. 2001. <dt id="PTSHVC2011">[PTSHVC2011]</dt> <dd>Manish Patil, Sharma V. Thankachan, Rahul Shah, Wing-Kai Hon, Jeffrey Scott Vitter, Sabrina Chandrasekaran. -<a href="http://www.cs.nthu.edu.tw/~wkhon/papers/PTSHVC11.pdf">Inverted indexes -for phrases and strings</a>. Proceedings of the +<a href="http://www.ittc.ku.edu/~jsv/Papers/PTS11.InvertedIndexSIGIR.pdf" +>Inverted indexes for phrases and strings</a>. Proceedings of the 34nth Annual International ACM SIGIR Conference on Research and Development in Information Retrieval. pp 555--564. 2011. </dd> diff --git a/en-US/statistics.txt b/en-US/statistics.txt index 5a165df..eedae9b 100755 --- a/en-US/statistics.txt +++ b/en-US/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:98; \ No newline at end of file diff --git a/fr-FR/configure.ini b/fr-FR/configure.ini index 6975dad..a3ab13a 100755 --- a/fr-FR/configure.ini +++ b/fr-FR/configure.ini @@ -1,4 +1,4 @@ -; ***** BEGIN LICENSE BLOCK ***** +; ***** BEGIN LICENSE BLOCK ***** ; SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer ; Copyright (C) 2009, 2010, 2011 Chris Pollett chris@pollett.org ; @@ -14,9 +14,9 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see <http://www.gnu.org/licenses/>. -; ***** END LICENSE BLOCK ***** +; ***** END LICENSE BLOCK ***** ; -; configure.ini +; configure.ini ; ; fr-FR configuration file ; @@ -26,7 +26,7 @@ ; [strings] ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//controllers +; /Applications/MAMP/htdocs/git/seek_quarry//controllers ; ; admin_controller.php line: 105 admin_controller_login_successful = "" @@ -172,15 +172,69 @@ admin_controller_describe_robot = "" ; main_controller.php line: 92 search_controller_logout_successful = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views +; main_controller.php line: 136 +main_controller_download = "" ; -; admin_view.php line: 76 +; main_controller.php line: 153 +main_controller_missing_fields = "" +; +; main_controller.php line: 182 +main_controller_email_sent = "" +; +; main_controller.php line: 196 +main_controller_yioop_download = "" +; +; main_controller.php line: 197 +main_controller_click_download = "" +; +; main_controller.php line: 208 +main_controller_url_error = "" +; +; main_controller.php line: 217 +main_controller_expired_url = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views +; +; admin_view.php line: 77 admin_view_admin = "" ; -; admin_view.php line: 95 +; admin_view.php line: 97 adminview_auto_logout_one_minute = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/elements +; download_view.php line: 62 +download_view_form = "" +; +; download_view.php line: 73 +download_view_thank_you = "" +; +; download_view.php line: 76 +download_view_full_name = "" +; +; download_view.php line: 82 +download_view_email = "" +; +; download_view.php line: 87 +download_view_business = "" +; +; download_view.php line: 93 +download_view_interest = "" +; +; download_view.php line: 100 +download_view_get_email = "" +; +; download_view.php line: 106 +download_view_return_main = "" +; +; download_view.php line: 120 +download_view_required_fields = "" +; +; download_view.php line: 125 +download_view_name_required = "" +; +; download_view.php line: 130 +download_view_valid_email = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views/elements ; ; activity_element.php line: 57 activity_element_activities = "" @@ -389,37 +443,46 @@ signin_element_admin = "" ; signin_element.php line: 67 signin_element_signout = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/layouts +; /Applications/MAMP/htdocs/git/seek_quarry//views/layouts +; +; web_layout.php line: 66 +web_layout_open_seekquarry = "" ; -; web_layout.php line: 72 +; web_layout.php line: 73 web_layout_description = "Trouvez ce que vous cherchez" ; -; web_layout.php line: 92 +; web_layout.php line: 94 +web_layout_open_source = "" +; +; web_layout.php line: 96 +web_layout_about_sq = "" +; +; web_layout.php line: 102 web_layout_query_statistics = "" ; -; web_layout.php line: 93 +; web_layout.php line: 103 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 98 +; web_layout.php line: 108 web_layout_query_time = "" ; -; main_view.php line: 70 -main_view_home = "" -; ; main_view.php line: 71 -main_view_demo = "" +main_view_home = "" ; ; main_view.php line: 73 -main_view_downloads = "" +main_view_demo = "" ; ; main_view.php line: 75 -main_view_documentation = "" +main_view_downloads = "" ; ; main_view.php line: 77 -main_view_resources = "" +main_view_documentation = "" ; ; main_view.php line: 79 -main_view_about = "" +main_view_discussion = "" +; +; main_view.php line: 81 +main_view_resources = "" ; ; signin_view.php line: 62 signin_view_signin = "" diff --git a/ko/configure.ini b/ko/configure.ini index 064a2e5..95f9f3c 100755 --- a/ko/configure.ini +++ b/ko/configure.ini @@ -1,4 +1,4 @@ -; ***** BEGIN LICENSE BLOCK ***** +; ***** BEGIN LICENSE BLOCK ***** ; SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer ; Copyright (C) 2009, 2010, 2011 Chris Pollett chris@pollett.org ; @@ -14,9 +14,9 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see <http://www.gnu.org/licenses/>. -; ***** END LICENSE BLOCK ***** +; ***** END LICENSE BLOCK ***** ; -; configure.ini +; configure.ini ; ; ko configuration file ; @@ -26,7 +26,7 @@ ; [strings] ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//controllers +; /Applications/MAMP/htdocs/git/seek_quarry//controllers ; ; admin_controller.php line: 105 admin_controller_login_successful = "" @@ -172,15 +172,69 @@ admin_controller_describe_robot = "" ; main_controller.php line: 92 search_controller_logout_successful = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views +; main_controller.php line: 136 +main_controller_download = "" ; -; admin_view.php line: 76 +; main_controller.php line: 153 +main_controller_missing_fields = "" +; +; main_controller.php line: 182 +main_controller_email_sent = "" +; +; main_controller.php line: 196 +main_controller_yioop_download = "" +; +; main_controller.php line: 197 +main_controller_click_download = "" +; +; main_controller.php line: 208 +main_controller_url_error = "" +; +; main_controller.php line: 217 +main_controller_expired_url = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views +; +; admin_view.php line: 77 admin_view_admin = "" ; -; admin_view.php line: 95 +; admin_view.php line: 97 adminview_auto_logout_one_minute = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/elements +; download_view.php line: 62 +download_view_form = "" +; +; download_view.php line: 73 +download_view_thank_you = "" +; +; download_view.php line: 76 +download_view_full_name = "" +; +; download_view.php line: 82 +download_view_email = "" +; +; download_view.php line: 87 +download_view_business = "" +; +; download_view.php line: 93 +download_view_interest = "" +; +; download_view.php line: 100 +download_view_get_email = "" +; +; download_view.php line: 106 +download_view_return_main = "" +; +; download_view.php line: 120 +download_view_required_fields = "" +; +; download_view.php line: 125 +download_view_name_required = "" +; +; download_view.php line: 130 +download_view_valid_email = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views/elements ; ; activity_element.php line: 57 activity_element_activities = "" @@ -389,37 +443,46 @@ signin_element_admin = "" ; signin_element.php line: 67 signin_element_signout = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/layouts +; /Applications/MAMP/htdocs/git/seek_quarry//views/layouts +; +; web_layout.php line: 66 +web_layout_open_seekquarry = "" ; -; web_layout.php line: 72 +; web_layout.php line: 73 web_layout_description = "" ; -; web_layout.php line: 92 +; web_layout.php line: 94 +web_layout_open_source = "" +; +; web_layout.php line: 96 +web_layout_about_sq = "" +; +; web_layout.php line: 102 web_layout_query_statistics = "" ; -; web_layout.php line: 93 +; web_layout.php line: 103 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 98 +; web_layout.php line: 108 web_layout_query_time = "" ; -; main_view.php line: 70 -main_view_home = "" -; ; main_view.php line: 71 -main_view_demo = "" +main_view_home = "" ; ; main_view.php line: 73 -main_view_downloads = "" +main_view_demo = "" ; ; main_view.php line: 75 -main_view_documentation = "" +main_view_downloads = "" ; ; main_view.php line: 77 -main_view_resources = "" +main_view_documentation = "" ; ; main_view.php line: 79 -main_view_about = "" +main_view_discussion = "" +; +; main_view.php line: 81 +main_view_resources = "" ; ; signin_view.php line: 62 signin_view_signin = "" diff --git a/rn-US/configure.ini b/rn-US/configure.ini index 4607dce..5dc2782 100755 --- a/rn-US/configure.ini +++ b/rn-US/configure.ini @@ -1,4 +1,4 @@ -; ***** BEGIN LICENSE BLOCK ***** +; ***** BEGIN LICENSE BLOCK ***** ; SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer ; Copyright (C) 2009, 2010, 2011 Chris Pollett chris@pollett.org ; @@ -14,9 +14,9 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see <http://www.gnu.org/licenses/>. -; ***** END LICENSE BLOCK ***** +; ***** END LICENSE BLOCK ***** ; -; configure.ini +; configure.ini ; ; rn-US configuration file ; @@ -26,7 +26,7 @@ ; [strings] ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//controllers +; /Applications/MAMP/htdocs/git/seek_quarry//controllers ; ; admin_controller.php line: 105 admin_controller_login_successful = "" @@ -172,15 +172,69 @@ admin_controller_describe_robot = "" ; main_controller.php line: 92 search_controller_logout_successful = "Logout Successful!" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views +; main_controller.php line: 136 +main_controller_download = "" ; -; admin_view.php line: 76 +; main_controller.php line: 153 +main_controller_missing_fields = "" +; +; main_controller.php line: 182 +main_controller_email_sent = "" +; +; main_controller.php line: 196 +main_controller_yioop_download = "" +; +; main_controller.php line: 197 +main_controller_click_download = "" +; +; main_controller.php line: 208 +main_controller_url_error = "" +; +; main_controller.php line: 217 +main_controller_expired_url = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views +; +; admin_view.php line: 77 admin_view_admin = "" ; -; admin_view.php line: 95 +; admin_view.php line: 97 adminview_auto_logout_one_minute = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/elements +; download_view.php line: 62 +download_view_form = "" +; +; download_view.php line: 73 +download_view_thank_you = "" +; +; download_view.php line: 76 +download_view_full_name = "" +; +; download_view.php line: 82 +download_view_email = "" +; +; download_view.php line: 87 +download_view_business = "" +; +; download_view.php line: 93 +download_view_interest = "" +; +; download_view.php line: 100 +download_view_get_email = "" +; +; download_view.php line: 106 +download_view_return_main = "" +; +; download_view.php line: 120 +download_view_required_fields = "" +; +; download_view.php line: 125 +download_view_name_required = "" +; +; download_view.php line: 130 +download_view_valid_email = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views/elements ; ; activity_element.php line: 57 activity_element_activities = "" @@ -389,37 +443,46 @@ signin_element_admin = "" ; signin_element.php line: 67 signin_element_signout = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/layouts +; /Applications/MAMP/htdocs/git/seek_quarry//views/layouts +; +; web_layout.php line: 66 +web_layout_open_seekquarry = "" ; -; web_layout.php line: 72 +; web_layout.php line: 73 web_layout_description = "" ; -; web_layout.php line: 92 +; web_layout.php line: 94 +web_layout_open_source = "" +; +; web_layout.php line: 96 +web_layout_about_sq = "" +; +; web_layout.php line: 102 web_layout_query_statistics = "" ; -; web_layout.php line: 93 +; web_layout.php line: 103 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 98 +; web_layout.php line: 108 web_layout_query_time = "" ; -; main_view.php line: 70 -main_view_home = "" -; ; main_view.php line: 71 -main_view_demo = "" +main_view_home = "" ; ; main_view.php line: 73 -main_view_downloads = "" +main_view_demo = "" ; ; main_view.php line: 75 -main_view_documentation = "" +main_view_downloads = "" ; ; main_view.php line: 77 -main_view_resources = "" +main_view_documentation = "" ; ; main_view.php line: 79 -main_view_about = "" +main_view_discussion = "" +; +; main_view.php line: 81 +main_view_resources = "" ; ; signin_view.php line: 62 signin_view_signin = "" diff --git a/vi-VN/configure.ini b/vi-VN/configure.ini index abab1b5..c4a392c 100755 --- a/vi-VN/configure.ini +++ b/vi-VN/configure.ini @@ -1,4 +1,4 @@ -; ***** BEGIN LICENSE BLOCK ***** +; ***** BEGIN LICENSE BLOCK ***** ; SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer ; Copyright (C) 2009, 2010, 2011 Chris Pollett chris@pollett.org ; @@ -14,9 +14,9 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see <http://www.gnu.org/licenses/>. -; ***** END LICENSE BLOCK ***** +; ***** END LICENSE BLOCK ***** ; -; configure.ini +; configure.ini ; ; vi-VN configuration file ; @@ -26,7 +26,7 @@ ; [strings] ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//controllers +; /Applications/MAMP/htdocs/git/seek_quarry//controllers ; ; admin_controller.php line: 105 admin_controller_login_successful = "" @@ -172,15 +172,69 @@ admin_controller_describe_robot = "" ; main_controller.php line: 92 search_controller_logout_successful = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views +; main_controller.php line: 136 +main_controller_download = "" ; -; admin_view.php line: 76 +; main_controller.php line: 153 +main_controller_missing_fields = "" +; +; main_controller.php line: 182 +main_controller_email_sent = "" +; +; main_controller.php line: 196 +main_controller_yioop_download = "" +; +; main_controller.php line: 197 +main_controller_click_download = "" +; +; main_controller.php line: 208 +main_controller_url_error = "" +; +; main_controller.php line: 217 +main_controller_expired_url = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views +; +; admin_view.php line: 77 admin_view_admin = "" ; -; admin_view.php line: 95 +; admin_view.php line: 97 adminview_auto_logout_one_minute = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/elements +; download_view.php line: 62 +download_view_form = "" +; +; download_view.php line: 73 +download_view_thank_you = "" +; +; download_view.php line: 76 +download_view_full_name = "" +; +; download_view.php line: 82 +download_view_email = "" +; +; download_view.php line: 87 +download_view_business = "" +; +; download_view.php line: 93 +download_view_interest = "" +; +; download_view.php line: 100 +download_view_get_email = "" +; +; download_view.php line: 106 +download_view_return_main = "" +; +; download_view.php line: 120 +download_view_required_fields = "" +; +; download_view.php line: 125 +download_view_name_required = "" +; +; download_view.php line: 130 +download_view_valid_email = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views/elements ; ; activity_element.php line: 57 activity_element_activities = "" @@ -389,37 +443,46 @@ signin_element_admin = "" ; signin_element.php line: 67 signin_element_signout = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/layouts +; /Applications/MAMP/htdocs/git/seek_quarry//views/layouts +; +; web_layout.php line: 66 +web_layout_open_seekquarry = "" ; -; web_layout.php line: 72 +; web_layout.php line: 73 web_layout_description = "Giúp tìm caí mà bạn muốn tìm kiếm" ; -; web_layout.php line: 92 +; web_layout.php line: 94 +web_layout_open_source = "" +; +; web_layout.php line: 96 +web_layout_about_sq = "" +; +; web_layout.php line: 102 web_layout_query_statistics = "" ; -; web_layout.php line: 93 +; web_layout.php line: 103 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 98 +; web_layout.php line: 108 web_layout_query_time = "" ; -; main_view.php line: 70 -main_view_home = "" -; ; main_view.php line: 71 -main_view_demo = "" +main_view_home = "" ; ; main_view.php line: 73 -main_view_downloads = "" +main_view_demo = "" ; ; main_view.php line: 75 -main_view_documentation = "" +main_view_downloads = "" ; ; main_view.php line: 77 -main_view_resources = "" +main_view_documentation = "" ; ; main_view.php line: 79 -main_view_about = "" +main_view_discussion = "" +; +; main_view.php line: 81 +main_view_resources = "" ; ; signin_view.php line: 62 signin_view_signin = "Đăng nhâp" diff --git a/vi-VN/statistics.txt b/vi-VN/statistics.txt index d956eb0..d6e1ed4 100755 --- a/vi-VN/statistics.txt +++ b/vi-VN/statistics.txt @@ -1 +1 @@ -d:4; \ No newline at end of file +d:3; \ No newline at end of file diff --git a/vn-US/configure.ini b/vn-US/configure.ini index bc93e0c..6c20c60 100755 --- a/vn-US/configure.ini +++ b/vn-US/configure.ini @@ -1,4 +1,4 @@ -; ***** BEGIN LICENSE BLOCK ***** +; ***** BEGIN LICENSE BLOCK ***** ; SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer ; Copyright (C) 2009, 2010, 2011 Chris Pollett chris@pollett.org ; @@ -14,9 +14,9 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see <http://www.gnu.org/licenses/>. -; ***** END LICENSE BLOCK ***** +; ***** END LICENSE BLOCK ***** ; -; configure.ini +; configure.ini ; ; vn-US configuration file ; @@ -26,7 +26,7 @@ ; [strings] ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//controllers +; /Applications/MAMP/htdocs/git/seek_quarry//controllers ; ; admin_controller.php line: 105 admin_controller_login_successful = "" @@ -172,15 +172,69 @@ admin_controller_describe_robot = "" ; main_controller.php line: 92 search_controller_logout_successful = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views +; main_controller.php line: 136 +main_controller_download = "" ; -; admin_view.php line: 76 +; main_controller.php line: 153 +main_controller_missing_fields = "" +; +; main_controller.php line: 182 +main_controller_email_sent = "" +; +; main_controller.php line: 196 +main_controller_yioop_download = "" +; +; main_controller.php line: 197 +main_controller_click_download = "" +; +; main_controller.php line: 208 +main_controller_url_error = "" +; +; main_controller.php line: 217 +main_controller_expired_url = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views +; +; admin_view.php line: 77 admin_view_admin = "" ; -; admin_view.php line: 95 +; admin_view.php line: 97 adminview_auto_logout_one_minute = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/elements +; download_view.php line: 62 +download_view_form = "" +; +; download_view.php line: 73 +download_view_thank_you = "" +; +; download_view.php line: 76 +download_view_full_name = "" +; +; download_view.php line: 82 +download_view_email = "" +; +; download_view.php line: 87 +download_view_business = "" +; +; download_view.php line: 93 +download_view_interest = "" +; +; download_view.php line: 100 +download_view_get_email = "" +; +; download_view.php line: 106 +download_view_return_main = "" +; +; download_view.php line: 120 +download_view_required_fields = "" +; +; download_view.php line: 125 +download_view_name_required = "" +; +; download_view.php line: 130 +download_view_valid_email = "" +; +; /Applications/MAMP/htdocs/git/seek_quarry//views/elements ; ; activity_element.php line: 57 activity_element_activities = "" @@ -389,37 +443,46 @@ signin_element_admin = "" ; signin_element.php line: 67 signin_element_signout = "" ; -; /Applications/XAMPP/xamppfiles/htdocs/git/seek_quarry//views/layouts +; /Applications/MAMP/htdocs/git/seek_quarry//views/layouts +; +; web_layout.php line: 66 +web_layout_open_seekquarry = "" ; -; web_layout.php line: 72 +; web_layout.php line: 73 web_layout_description = "" ; -; web_layout.php line: 92 +; web_layout.php line: 94 +web_layout_open_source = "" +; +; web_layout.php line: 96 +web_layout_about_sq = "" +; +; web_layout.php line: 102 web_layout_query_statistics = "" ; -; web_layout.php line: 93 +; web_layout.php line: 103 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 98 +; web_layout.php line: 108 web_layout_query_time = "" ; -; main_view.php line: 70 -main_view_home = "" -; ; main_view.php line: 71 -main_view_demo = "" +main_view_home = "" ; ; main_view.php line: 73 -main_view_downloads = "" +main_view_demo = "" ; ; main_view.php line: 75 -main_view_documentation = "" +main_view_downloads = "" ; ; main_view.php line: 77 -main_view_resources = "" +main_view_documentation = "" ; ; main_view.php line: 79 -main_view_about = "" +main_view_discussion = "" +; +; main_view.php line: 81 +main_view_resources = "" ; ; signin_view.php line: 62 signin_view_signin = ""