Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
solarium
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
solarium
Commits
566bb047
Commit
566bb047
authored
Feb 04, 2014
by
Bas de Nooijer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added remote file streaming support to extract request handler
parent
594c113c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
3 deletions
+22
-3
library/Solarium/QueryType/Extract/RequestBuilder.php
library/Solarium/QueryType/Extract/RequestBuilder.php
+10
-3
tests/Solarium/Tests/QueryType/Extract/RequestBuilderTest.php
...s/Solarium/Tests/QueryType/Extract/RequestBuilderTest.php
+12
-0
No files found.
library/Solarium/QueryType/Extract/RequestBuilder.php
View file @
566bb047
...
...
@@ -101,9 +101,16 @@ class RequestBuilder extends BaseRequestBuilder
}
// add file to request
$request
->
setFileUpload
(
$query
->
getFile
());
$request
->
addParam
(
'resource.name'
,
basename
(
$query
->
getFile
()));
$request
->
addHeader
(
'Content-Type: multipart/form-data'
);
$file
=
$query
->
getFile
();
if
(
preg_match
(
'/^(http|https):\/\/(.+)/i'
,
$file
))
{
$request
->
addParam
(
'stream.url'
,
$file
);
}
else
if
(
is_readable
(
$file
))
{
$request
->
setFileUpload
(
$file
);
$request
->
addParam
(
'resource.name'
,
basename
(
$query
->
getFile
()));
$request
->
addHeader
(
'Content-Type: multipart/form-data'
);
}
else
{
throw
new
RuntimeException
(
'Extract query file path/url invalid or not available'
);
}
return
$request
;
}
...
...
tests/Solarium/Tests/QueryType/Extract/RequestBuilderTest.php
View file @
566bb047
...
...
@@ -84,6 +84,18 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
);
}
public
function
testGetUriWithStreamUrl
()
{
$query
=
$this
->
query
;
$query
->
setFile
(
'http://solarium-project.org/'
);
$request
=
$this
->
builder
->
build
(
$query
);
$this
->
assertEquals
(
'update/extract?omitHeader=true¶m1=value1&wt=json&json.nl=flat&fmap.from-field=to-field'
.
'&stream.url=http%3A%2F%2Fsolarium-project.org%2F'
,
$request
->
getUri
()
);
}
public
function
testDocumentFieldAndBoostParams
()
{
$fields
=
array
(
'field1'
=>
'value1'
,
'field2'
=>
'value2'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment