Author: rande
Date: 2010-04-27 23:55:54 +0200 (Tue, 27 Apr 2010)
New Revision: 29272
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
plugins/sfSolrPlugin/branches/sf1.2/test/data/configTest/project.yml
plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/autoload.yml
plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/search.yml
Log:
[sfSolrPlugin] update exception to match change in solr-php-client lib
Modified: plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
2010-04-27 15:16:08 UTC (rev 29271)
+++ plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
2010-04-27 21:55:54 UTC (rev 29272)
@@ -89,13 +89,18 @@
stream_context_set_option($this->_getContext, 'http', 'timeout',
$this->_defaultTimeout);
}
- //$http_response_header is set by file_get_contents
+ // $http_response_header will be updated by the call to file_get_contents
later
+ // see http://us.php.net/manual/en/wrappers.http.php for documentation
+ // Unfortunately, it will still create a notice in analyzers if we don't
set it here
+ $http_response_header = null;
+
$class = $this->response_class;
+
$response = new $class(@file_get_contents($url, false,
$this->_getContext), $http_response_header, $this->_createDocuments,
$this->_collapseSingleValueArrays);
if ($response->getHttpStatus() != 200)
{
- throw new Apache_Solr_HttpTransportException('"' .
$response->getHttpStatus() . '" Status: ' . $response->getHttpStatusMessage(),
$response->getHttpStatus());
+ throw new Apache_Solr_HttpTransportException($response);
}
return $response;
@@ -141,14 +146,18 @@
stream_context_set_option($this->_postContext, 'http', 'timeout',
$timeout);
}
- //$http_response_header is set by file_get_contents
+ // $http_response_header will be updated by the call to file_get_contents
later
+ // see http://us.php.net/manual/en/wrappers.http.php for documentation
+ // Unfortunately, it will still create a notice in analyzers if we don't
set it here
+ $http_response_header = null;
+
$class = $this->response_class;
$response = new $class(@file_get_contents($url, false,
$this->_postContext), $http_response_header, $this->_createDocuments,
$this->_collapseSingleValueArrays);
if ($response->getHttpStatus() != 200)
{
- throw new Apache_Solr_HttpTransportException('"' .
$response->getHttpStatus() . '" Status: ' . $response->getHttpStatusMessage(),
$response->getHttpStatus());
+ throw new Apache_Solr_HttpTransportException($response);
}
return $response;
Modified: plugins/sfSolrPlugin/branches/sf1.2/test/data/configTest/project.yml
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/test/data/configTest/project.yml
2010-04-27 15:16:08 UTC (rev 29271)
+++ plugins/sfSolrPlugin/branches/sf1.2/test/data/configTest/project.yml
2010-04-27 21:55:54 UTC (rev 29272)
@@ -25,8 +25,8 @@
mb_string: true
interface:
- categories: on
- advanced: on
+ categories: true
+ advanced: true
barLucene:
models:
Modified: plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/autoload.yml
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/autoload.yml
2010-04-27 15:16:08 UTC (rev 29271)
+++ plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/autoload.yml
2010-04-27 21:55:54 UTC (rev 29272)
@@ -3,22 +3,22 @@
project:
name: project
path: %SF_LIB_DIR%
- recursive: on
+ recursive: true
exclude: [model, symfony]
project_model:
name: project model
path: %SF_LIB_DIR%/model
- recursive: on
+ recursive: true
# application
application:
name: application
path: %SF_APP_LIB_DIR%
- recursive: on
+ recursive: true
modules:
name: module
path: %SF_APP_DIR%/modules/*/lib
prefix: 1
- recursive: on
\ No newline at end of file
+ recursive: true
\ No newline at end of file
Modified: plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/search.yml
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/search.yml
2010-04-27 15:16:08 UTC (rev 29271)
+++ plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/search.yml
2010-04-27 21:55:54 UTC (rev 29272)
@@ -29,8 +29,8 @@
mb_string: true
interface:
- categories: on
- advanced: on
+ categories: true
+ advanced: true
fooLucene:
index:
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
