Getting rid of my local machine from default.db, fix minor notices, a=chris

Chris Pollett [2012-05-03 16:May:rd]
Getting rid of my local machine from default.db, fix minor notices, a=chris
Filename
README
controllers/admin_controller.php
data/default.db
lib/index_bundle_iterators/network_iterator.php
diff --git a/README b/README
index 276196168..684c89f55 100755
--- a/README
+++ b/README
@@ -23,23 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Summary
 -------
-The Yioop search engine consists of five main
+The Yioop search engine consists of three main
 scripts:

-fetcher.php - used to download batches of urls provided
+bin/fetcher.php - used to download batches of urls provided
     the queue_server.
-queue_server.php - maintains a queue of urls that are
+bin/queue_server.php - maintains a queue of urls that are
     going to be scheduled to be seen. It also keeps
     track of what has been seen and robots.txt info.
     Its last responsibility is to create the index_archive
     that is used by the search front end.

-arc_tool.php - an auxiliary script used to view the contents
-    of a web or index archive from the command line
-
-query_tool.php - an auxiliary script used to query an index
-    from the command line
-
 index.php -- a search engine web page. It is also used
     to handle message passing between the fetchers
     (multiple machines can act as fetchers) and the
@@ -61,8 +55,8 @@ Credits
 The source code is mainly due to Chris Pollett.
 Other contributors include: Ravi Dhillon, Priya Gangaraju,
 Nakul Natu, Vijaya Pamidi, Vijeth Patil, Tarun
-Pepira, and Shawn Tice. Several people helped with localization:
-My wife, Mary Pollett, Jonathan Ben-David,
+Pepira, Shawn Tice, Sandhya Vissapragada. Several people helped with
+localization: My wife, Mary Pollett, Jonathan Ben-David,
 Sujata Dongre, Animesh Dutta, Youn Kim, Akshat Kukreti,
 Chao-Hsin Shih and Sugi Widjaja.

diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php
index bb913feaa..a208c2f75 100755
--- a/controllers/admin_controller.php
+++ b/controllers/admin_controller.php
@@ -776,7 +776,8 @@ class AdminController extends Controller implements CrawlConstants
                         isset($seed_info['disallowed_sites']['url']) ?
                         $seed_info['disallowed_sites']['url'] : array();
                     $crawl_params[self::META_WORDS] =
-                        $seed_info['meta_words'];
+                        isset($seed_info['meta_words']) ?
+                        $seed_info['meta_words'] : array();
                     if(isset($seed_info['indexing_plugins']['plugins'])) {
                         $crawl_params[self::INDEXING_PLUGINS] =
                             $seed_info['indexing_plugins']['plugins'];
@@ -792,7 +793,6 @@ class AdminController extends Controller implements CrawlConstants
                         $description = tl('admin_controller_no_description');
                     }
                     $crawl_params['DESCRIPTION'] = $description;
-
                     $this->crawlModel->sendStartCrawlMessage($crawl_params,
                         $seed_info, $machine_urls);

diff --git a/data/default.db b/data/default.db
index a6c0f67a8..de00dd0a6 100644
Binary files a/data/default.db and b/data/default.db differ
diff --git a/lib/index_bundle_iterators/network_iterator.php b/lib/index_bundle_iterators/network_iterator.php
index 6ccee77d8..9625900f3 100644
--- a/lib/index_bundle_iterators/network_iterator.php
+++ b/lib/index_bundle_iterators/network_iterator.php
@@ -129,7 +129,7 @@ class NetworkIterator extends IndexBundleIterator
         $this->no_lookup = true;
         $this->results_per_block = ceil(self::MIN_FIND_RESULTS_PER_BLOCK);
         $this->base_query = "q=".urlencode($query).
-            "&f=serial&network=&raw=2&its=$timestamp";
+            "&f=serial&network=&raw=1&its=$timestamp";
         $this->queue_servers = $queue_servers;
         $this->limit = 0;
         $count = count($this->queue_servers);
ViewGit