Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
0dfd3fc4
Commit
0dfd3fc4
authored
9 months ago
by
Dominik Hebeler
Browse files
Options
Downloads
Patches
Plain Diff
merge searchengine settings the other way around
parent
5d47205d
No related branches found
Branches containing commit
No related tags found
1 merge request
!2229
Development
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
metager/app/Models/SearchengineConfiguration.php
+2
-2
2 additions, 2 deletions
metager/app/Models/SearchengineConfiguration.php
metager/app/Models/parserSkripte/BraveNews.php
+1
-1
1 addition, 1 deletion
metager/app/Models/parserSkripte/BraveNews.php
with
3 additions
and
3 deletions
metager/app/Models/SearchengineConfiguration.php
+
2
−
2
View file @
0dfd3fc4
...
@@ -177,7 +177,7 @@ class SearchengineConfiguration
...
@@ -177,7 +177,7 @@ class SearchengineConfiguration
if
(
$this
->
requestHeader
===
null
)
{
if
(
$this
->
requestHeader
===
null
)
{
$this
->
requestHeader
=
new
\stdClass
;
$this
->
requestHeader
=
new
\stdClass
;
}
}
$this
->
requestHeader
=
(
object
)
array_merge
((
array
)
$
this
->
requestHeader
,
(
array
)
$requestHeader
);
$this
->
requestHeader
=
(
object
)
array_merge
((
array
)
$requestHeader
,
(
array
)
$
this
->
requestHeader
);
}
}
public
function
addQueryParameters
(
object
|
array
$queryParameters
)
public
function
addQueryParameters
(
object
|
array
$queryParameters
)
...
@@ -188,7 +188,7 @@ class SearchengineConfiguration
...
@@ -188,7 +188,7 @@ class SearchengineConfiguration
if
(
$this
->
getParameter
===
null
)
{
if
(
$this
->
getParameter
===
null
)
{
$this
->
getParameter
=
new
\stdClass
;
$this
->
getParameter
=
new
\stdClass
;
}
}
$this
->
getParameter
=
(
object
)
array_merge
((
array
)
$
this
->
get
Parameter
,
(
array
)
$
query
Parameter
s
);
$this
->
getParameter
=
(
object
)
array_merge
((
array
)
$
query
Parameter
s
,
(
array
)
$
this
->
get
Parameter
);
}
}
public
function
applyQuery
(
string
$query
)
public
function
applyQuery
(
string
$query
)
...
...
This diff is collapsed.
Click to expand it.
metager/app/Models/parserSkripte/BraveNews.php
+
1
−
1
View file @
0dfd3fc4
...
@@ -145,7 +145,7 @@ class BraveNews extends Searchengine
...
@@ -145,7 +145,7 @@ class BraveNews extends Searchengine
try
{
try
{
$results
=
json_decode
(
$result
);
$results
=
json_decode
(
$result
);
if
(
!
$results
->
query
->
more_results_available
)
{
if
(
sizeof
(
$results
->
results
)
===
0
)
{
return
;
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment