Move query from Response to SearchRetrieveResponse, and make version check generic

Author: danmichaelo

src/Response.php

@@ -22,9 +22,6 @@ class Response implements ResponseInterface {
     /** @var string SRU protocol version */
     public $version;
 
-    /** @var string The CQL query used to generate the response */
-    public $query;
-
     /**
      * Create a new response
      *
@@ -40,23 +37,17 @@ public function __construct($text, &$client = null)
 
         $this->client = $client;
 
-        $doc->registerXPathNamespaces(array(
+        $this->response->registerXPathNamespaces(array(
             'srw' => 'http://www.loc.gov/zing/srw/',
             'd' => 'http://www.loc.gov/zing/srw/diagnostic/'
         ));
 
-        $this->version = $doc->text('/srw:searchRetrieveResponse/srw:version');
+        $this->version = $this->response->text('/srw:*/srw:version');
 
-        $e = $doc->first('/srw:searchRetrieveResponse/srw:diagnostics');
+        $e = $this->response->first('/srw:*/srw:diagnostics');
         if ($e) {
             $this->error = $e->text('d:diagnostic/d:message') . '. ' . $e->text('d:diagnostic/d:details'); 
         }
-
-        // The server may echo the request back to the client along with the response
-        $this->query = $doc->text('/srw:searchRetrieveResponse/srw:echoedSearchRetrieveRequest/srw:query') ?: null;
-
-        $this->response = $doc;
-
     }
 
     /**

src/SearchRetrieveResponse.php

@@ -16,6 +16,9 @@ class SearchRetrieveResponse extends Response implements ResponseInterface {
     /** @var int Position of next record in the result set, or null if no such record exist */
     public $nextRecordPosition;
 
+    /** @var string The CQL query used to generate the response */
+    public $query;
+
     /**
      * Create a new searchRetrieve response
      *
@@ -29,6 +32,9 @@ public function __construct($text, &$client = null)
         $this->numberOfRecords = (int) $this->response->text('/srw:searchRetrieveResponse/srw:numberOfRecords');
         $this->nextRecordPosition = (int) $this->response->text('/srw:searchRetrieveResponse/srw:nextRecordPosition') ?: null;
 
+        // The server may echo the request back to the client along with the response
+        $this->query = $this->response->text('/srw:searchRetrieveResponse/srw:echoedSearchRetrieveRequest/srw:query') ?: null;
+
         $this->records = array();
         foreach ($this->response->xpath('/srw:searchRetrieveResponse/srw:records/srw:record') as $record) {
             $this->records[] = new Record($record);