Updated examples for the reorganized library files. Most examples now work,...

Updated examples for the reorganized library files. Most examples now work, but some might still need some work.

examples/1.1-check-solarium-and-ping.php

@@ -4,10 +4,10 @@ require('init.php');
 htmlHeader();
 
 // check solarium version available
-echo 'Solarium library version: ' . Solarium\Version::VERSION . ' - ';
+echo 'Solarium library version: ' . Solarium\Client::VERSION . ' - ';
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // create a ping query
 $ping = $client->createPing();

examples/1.2-basic-select.php

@@ -4,13 +4,13 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
-$query = $client->createSelect();
+$query = $client->createQuery($client::QUERY_SELECT);
 
 // this executes the query and returns the result
-$resultset = $client->select($query);
+$resultset = $client->execute($query);
 
 // display the total number of documents found by solr
 echo 'NumFound: '.$resultset->getNumFound();

examples/1.3-basic-update.php

@@ -7,7 +7,7 @@ if ($_POST) {
     // if data is posted add it to solr
 
     // create a client instance
-    $client = new Solarium\Client\Client($config);
+    $client = new Solarium\Client($config);
 
     // get an update query instance
     $update = $client->createUpdate();

examples/2.1.1-query-params.php

 <?php
 
 require('init.php');
-use Solarium\QueryType\Select\Query\Query as Select;
+use Solarium\Query\Select\Query\Query as Select;
 
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.2-custom-result-document.php

@@ -5,7 +5,7 @@ htmlHeader();
 
 
 // this is the custom result document class
-class myDoc extends Solarium\Document\ReadOnly{
+class myDoc extends Solarium\Query\Select\Result\Document{
 
     public function getSpecialPrice()
     {
@@ -16,7 +16,7 @@ class myDoc extends Solarium\Document\ReadOnly{
 
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.3-filterquery.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.1-facet-field.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.2-facet-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.3-facet-multiquery.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.4-facet-range.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.10-stats.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.11-debug.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.2-morelikethis.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.3-highlighting.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.3.1-per-field-highlighting.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.4-dismax.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.5-edismax.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.6-grouping-by-field.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.7-grouping-by-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.8-distributed-search.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.9-spellcheck.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.6-helper-functions.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance and a query helper instance
 $query = $client->createSelect();

examples/2.1.7-query-reuse.php

 <?php
 
 require('init.php');
-use Solarium\Client\Client;
-use Solarium\QueryType\Select\Query\Query as Select;
+use Solarium\Client;
+use Solarium\Query\Select\Query\Query as Select;
 
 htmlHeader();
 

examples/2.2.1-add-docs.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.2-delete-by-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.3-delete-by-id.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.4-optimize.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.5-rollback.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.3.1-mlt-query.php

 <?php
 
 require('init.php');
-use Solarium\Client\Client;
+use Solarium\Client;
 
 htmlHeader();
 

examples/2.3.2-mlt-stream.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a morelikethis query instance
 $query = $client->createMoreLikeThis();

examples/2.4.1-analysis-document.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an analysis document query
 $query = $client->createAnalysisDocument();

examples/2.4.2-analysis-field.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get an analysis document query
 $query = $client->createAnalysisField();

examples/2.5-terms-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a terms query instance
 $query = $client->createTerms();

examples/2.6-suggester-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a suggester query instance
 $query = $client->createSuggester();

examples/4.1-api-usage.php

 <?php
 
 require('init.php');
-use Solarium\QueryType\Select\Query\Query as Select;
+use Solarium\Query\Select\Query\Query as Select;
 
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/4.2-configuration-usage.php

@@ -29,7 +29,7 @@ $select = array(
 );
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance based on the config
 $query = $client->createSelect($select);

examples/4.3-extending-usage.php

 <?php
 
 require('init.php');
-use Solarium\Client\Client;
-use Solarium\QueryType\Select\Query\Query as Select;
+use Solarium\Client;
+use Solarium\Query\Select\Query\Query as Select;
 
 htmlHeader();
 

examples/5.1-partial-usage.php

@@ -10,7 +10,7 @@ htmlHeader();
 
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // create a select query instance
 $query = $client->createSelect();

examples/5.2-extending.php

 <?php
 
 require('init.php');
-use Solarium\Client\Client;
-use Solarium\QueryType\Select\Query\Query as Select;
+use Solarium\Client;
+use Solarium\Query\Select\Query\Query as Select;
 
 htmlHeader();
 
@@ -21,10 +21,10 @@ class MyClient extends Client
      * Querytype mappings
      */
     protected $_queryTypes = array(
-        self::QUERYTYPE_SELECT => array(
+        self::QUERY_SELECT => array(
             'query'          => 'MyQuery',
-            'requestbuilder' => 'Solarium\QueryType\Select\RequestBuilder\RequestBuilder',
-            'responseparser' => 'Solarium\QueryType\Select\ResponseParser\ResponseParser'
+            'requestbuilder' => 'Solarium\Query\Select\RequestBuilder\RequestBuilder',
+            'responseparser' => 'Solarium\Query\Select\ResponseParser\ResponseParser'
         ),
     );
 }

examples/5.3.1-plugin-event-hooks.php

@@ -3,84 +3,84 @@ require('init.php');
 
 
 // this very simple plugin shows a timing for each event and display some request debug info
-class basicDebug extends Solarium\Plugin\AbstractPlugin
+class basicDebug extends Solarium\Core\Plugin
 {
 
-    protected $_start;
-    protected $_output = array();
+    protected $start;
+    protected $output = array();
 
-    public function _initPlugin()
+    public function initPlugin()
     {
-        $this->_start = microtime(true);
+        $this->start = microtime(true);
     }
 
-    protected function _timer($event)
+    protected function timer($event)
     {
-        $time = round(microtime(true) - $this->_start, 5);
-        $this->_output[] = '['.$time.'] ' . $event;
+        $time = round(microtime(true) - $this->start, 5);
+        $this->output[] = '['.$time.'] ' . $event;
 
     }
 
     public function display()
     {
-        echo implode('<br/>', $this->_output);
+        echo implode('<br/>', $this->output);
     }
 
     public function preCreateRequest()
     {
-        $this->_timer('preCreateRequest');
+        $this->timer('preCreateRequest');
     }
 
     public function postCreateRequest()
     {
-        $this->_timer('postCreateRequest');
+        $this->timer('postCreateRequest');
     }
 
     // This method uses the aviable param(s) (see plugin abstract class)
     // You can access or modify data this way
     public function preExecuteRequest($request)
     {
-        $this->_timer('preExecuteRequest');
+        $this->timer('preExecuteRequest');
 
         // this dummy param will be visible in the debug output but will also be used in the actual Solr request
         $request->addParam('dummyparam', 'dummyvalue');
 
-        $this->_output[] = 'Request URI: ' . $request->getUri();
+        $this->output[] = 'Request URI: ' . $request->getUri();
     }
 
     public function postExecuteRequest()
     {
-        $this->_timer('postExecuteRequest');
+        $this->timer('postExecuteRequest');
     }
 
     public function preCreateResult()
     {
-        $this->_timer('preCreateResult');
+        $this->timer('preCreateResult');
     }
 
     public function postCreateResult()
     {
-        $this->_timer('postCreateResult');
+        $this->timer('postCreateResult');
     }
 
     public function preExecute()
     {
-        $this->_timer('preExecute');
+        $this->timer('preExecute');
     }
 
     public function postExecute()
     {
-        $this->_timer('postExecute');
+        $this->timer('postExecute');
     }
 
     public function preCreateQuery()
     {
-        $this->_timer('preCreateResult');
+        $this->timer('preCreateResult');
     }
 
     public function postCreateQuery()
     {
-        $this->_timer('postCreateResult');
+        $this->timer('postCreateResult');
     }
 
 }
@@ -90,7 +90,7 @@ htmlHeader();
 
 // create a client instance and register the plugin
 $plugin = new basicDebug();
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 $client->registerPlugin('debugger', $plugin);
 
 // execute a select query and display the results

examples/5.3.2-plugin-solarium-presets.php

 <?php
 require('init.php');
-use Solarium\Client\Client;
+use Solarium\Client;
 use Solarium\Plugin\AbstractPlugin;
-use Solarium\QueryType\Select\Query\Query as Select;
+use Solarium\Query\Select\Query\Query as Select;
 
 // This is a custom query class that could have some customized logic
 class MyQuery extends Select
@@ -17,10 +17,10 @@ class queryCustomizer extends AbstractPlugin
     protected function _initPlugin()
     {
         $this->_client->registerQueryType(
-            Client::QUERYTYPE_SELECT,
+            Client::QUERY_SELECT,
             'MyQuery',
-            'Solarium\QueryType\Select\RequestBuilder\RequestBuilder',
-            'Solarium\QueryType\Select\ResponseParser\ResponseParser'
+            'Solarium\Query\Select\RequestBuilder\RequestBuilder',
+            'Solarium\Query\Select\ResponseParser\ResponseParser'
         );
     }
 

examples/6.1.1-zend-http-adapter.php

@@ -7,7 +7,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // set the adapter to zendhttp and get a zendhttp client instance reference
 $client->setAdapter('Solarium\Client\Adapter\ZendHttp');

examples/6.1.2-pecl-http-adapter.php

@@ -7,7 +7,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // set the adapter to peclhttp
 $client->setAdapter('Solarium\Client\Adapter\PeclHttp');

examples/6.1.3-curl-adapter.php

@@ -7,7 +7,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // set the adapter to curl
 $client->setAdapter('Solarium\Client\Adapter\Curl');

examples/6.2-escaping.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/6.3-placeholder-syntax.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/6.4-dereferenced-params.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and get a select query instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 
 

examples/7.1-plugin-loadbalancer.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and get loadbalancer plugin instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 $loadbalancer = $client->getPlugin('loadbalancer');
 
 // apply loadbalancer settings
@@ -39,7 +39,7 @@ echo 'Loadbalanced ping query, should display a loadbalancing server:<br/>';
 echo 'Ping server: ' . $loadbalancer->getLastServerKey() .'<hr/>';
 
 // exclude ping query from loadbalancing
-$loadbalancer->addBlockedQueryType(Solarium\Client\Client::QUERYTYPE_PING);
+$loadbalancer->addBlockedQueryType(Solarium\Client::QUERY_PING);
 $client->ping($query);
 echo 'Non-loadbalanced ping query, should not display a loadbalancing server:<br/>';
 echo 'Ping server: ' . $loadbalancer->getLastServerKey() .'<hr/>';

examples/7.2-plugin-postbigrequest.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and autoload the postbigrequest plugin
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 $client->getPlugin('postbigrequest');
 
 // create a basic query to execute

examples/7.3-plugin-customizerequest.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and autoload the customize request plugin
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 $customizer = $client->getPlugin('customizerequest');
 
 // add a persistent HTTP header (using array input values)

examples/7.4-plugin-parallelexecution.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and autoload the customize request plugin
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 $parallel = $client->getPlugin('parallelexecution');
 
 // Add a delay param to better show the effect, as an example Solr install with

examples/7.5-plugin-bufferedadd.php

@@ -19,7 +19,7 @@ class simpleDebug extends \Solarium\Plugin\AbstractPlugin
 htmlHeader();
 
 // create a client instance and autoload the buffered add plugin
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 $buffer = $client->getPlugin('bufferedadd');
 $buffer->setBufferSize(10); // this is quite low, in most cases you can use a much higher value
 

examples/7.6-plugin-prefetchiterator.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client\Client($config);
+$client = new Solarium\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();