Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
0bc0837a
Commit
0bc0837a
authored
Jul 06, 2017
by
Aria Givi
Browse files
Minisucher werden als String von gespeichert und von den Minisuchern entsprechend eingesetzt
parent
4e2f6701
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/MetaGer.php
View file @
0bc0837a
...
...
@@ -36,6 +36,7 @@ class MetaGer
protected
$addedHosts
=
[];
protected
$startCount
=
0
;
protected
$canCache
=
false
;
public
$subcollections
=
""
;
# Daten über die Abfrage
protected
$ip
;
protected
$language
;
...
...
@@ -534,7 +535,7 @@ class MetaGer
}
# Sonderregelung für alle Suchmaschinen, die zu den Minisuchern gehören. Diese können alle gemeinsam über einen Link abgefragt werden
$subcollections
=
[];
$
this
->
subcollections
=
[];
$tmp
=
[];
// Es gibt den Schalter "minism=on" Dieser soll bewirken, dass alle Minisucher angeschaltet werden.
...
...
@@ -544,7 +545,7 @@ class MetaGer
// Wir laden alle Minisucher
foreach
(
$sumas
as
$engine
)
{
if
(
isset
(
$engine
[
"minismCollection"
]))
{
$subcollections
[]
=
$engine
[
"minismCollection"
]
->
__toString
();
$
this
->
subcollections
[]
=
$engine
[
"minismCollection"
]
->
__toString
();
}
}
# Nur noch alle eventuell angeschalteten Minisucher deaktivieren
...
...
@@ -557,15 +558,15 @@ class MetaGer
// Wir schalten eine Teilmenge, oder aber gar keine an
foreach
(
$enabledSearchengines
as
$engine
)
{
if
(
isset
(
$engine
[
'minismCollection'
]))
{
$subcollections
[]
=
$engine
[
'minismCollection'
]
->
__toString
();
$
this
->
subcollections
[]
=
$engine
[
'minismCollection'
]
->
__toString
();
}
else
{
$tmp
[]
=
$engine
;
}
}
}
$enabledSearchengines
=
$tmp
;
if
(
sizeof
(
$subcollections
)
>
0
)
{
$enabledSearchengines
[]
=
$this
->
loadMiniSucher
(
$xml
,
$subcollections
);
if
(
sizeof
(
$
this
->
subcollections
)
>
0
)
{
$enabledSearchengines
[]
=
$this
->
loadMiniSucher
(
$xml
,
$
this
->
subcollections
);
}
if
(
$sumaCount
<=
0
)
{
$this
->
errors
[]
=
trans
(
'metaGer.settings.noneSelected'
);
...
...
@@ -584,14 +585,13 @@ class MetaGer
$engine
->
setResultHash
(
$this
->
getHashCode
());
}
}
else
{
$engines
=
$this
->
actuallyCreateSearchEngines
(
$enabledSearchengines
,
$siteSearchFailed
);
$engines
=
$this
->
actuallyCreateSearchEngines
(
$enabledSearchengines
,
$siteSearchFailed
,
$this
->
subcollections
);
}
# Wir starten alle Suchen
foreach
(
$engines
as
$engine
)
{
$engine
->
startSearch
(
$this
);
}
// Derzeit deaktiviert, da es die eigene Suche gibt
// $this->adjustFocus($sumas, $enabledSearchengines);
...
...
app/Models/Searchengine.php
View file @
0bc0837a
...
...
@@ -22,6 +22,7 @@ abstract class Searchengine
public
$products
=
[];
# Die geladenen Produkte
public
$loaded
=
false
;
# wahr, sobald die Ergebnisse geladen wurden
public
$cached
=
false
;
public
$subcollections
=
""
;
public
$ip
;
# Die IP aus der metager
public
$gefVon
;
# Der HTML-Code für die Verlinkung des Suchanbieters
...
...
@@ -51,6 +52,9 @@ abstract class Searchengine
$this
->
homepage
=
"https://metager.de"
;
}
# Minisucher speichern
$this
->
subcollections
=
$metager
->
subcollections
;
# Speichert die XML der Engine
$this
->
engine
=
$engine
->
asXML
();
...
...
app/Models/parserSkripte/Minisucher.php
View file @
0bc0837a
...
...
@@ -14,6 +14,7 @@ class Minisucher extends Searchengine
if
(
$metager
->
getFokus
()
===
"nachrichten"
){
$this
->
getString
.
=
"sort="
.
$this
->
urlencode
(
"documentDate desc"
);
}
}
public
function
loadResults
(
$content
)
...
...
@@ -55,23 +56,8 @@ class Minisucher extends Searchengine
$additionalInformation
=
[
'date'
=>
$dateVal
];
$provider
=
$result
->
xpath
(
'//doc/str[@name="subcollection"]'
)[
0
]
->
__toString
();
if
(
isset
(
$providerCounter
[
$provider
])
&&
$providerCounter
[
$provider
]
>
10
)
{
continue
;
}
else
{
if
(
!
isset
(
$providerCounter
[
$provider
]))
{
$providerCounter
[
$provider
]
=
0
;
}
$providerCounter
[
$provider
]
+=
1
;
}
if
(
isset
(
$provider
))
{
$gefVon
=
"<a href=
\"
https://metager.de
\"
target=
\"
_blank
\"
rel=
\"
noopener
\"
>Minisucher:
$provider
</a>"
;
}
else
{
$gefVon
=
$this
->
gefVon
;
}
$minism
=
implode
(
", "
,
$this
->
subcollections
);
$gefVon
=
"<a href=
\"
https://metager.de
\"
target=
\"
_blank
\"
rel=
\"
noopener
\"
>Minisucher:
$minism
</a>"
;
$this
->
results
[]
=
new
\
App\Models\Result
(
$this
->
engine
,
...
...
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