Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
54
Issues
54
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
55b217e2
Commit
55b217e2
authored
Jul 10, 2017
by
Aria Givi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minisucher werden über XML-Object übergeben
parent
eeb68af1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
15 deletions
+9
-15
app/MetaGer.php
app/MetaGer.php
+8
-8
app/Models/Searchengine.php
app/Models/Searchengine.php
+0
-4
app/Models/parserSkripte/Minisucher.php
app/Models/parserSkripte/Minisucher.php
+1
-3
No files found.
app/MetaGer.php
View file @
55b217e2
...
...
@@ -36,8 +36,7 @@ class MetaGer
protected
$addedHosts
=
[];
protected
$startCount
=
0
;
protected
$canCache
=
false
;
public
$subcollections
=
""
;
# Daten über die Abfrage
# Daten über die Abfrage$
protected
$ip
;
protected
$language
;
protected
$agent
;
...
...
@@ -535,7 +534,7 @@ class MetaGer
}
# Sonderregelung für alle Suchmaschinen, die zu den Minisuchern gehören. Diese können alle gemeinsam über einen Link abgefragt werden
$
this
->
subcollections
=
[];
$subcollections
=
[];
$tmp
=
[];
// Es gibt den Schalter "minism=on" Dieser soll bewirken, dass alle Minisucher angeschaltet werden.
...
...
@@ -545,7 +544,7 @@ class MetaGer
// Wir laden alle Minisucher
foreach
(
$sumas
as
$engine
)
{
if
(
isset
(
$engine
[
"minismCollection"
]))
{
$
this
->
subcollections
[]
=
$engine
[
"minismCollection"
]
->
__toString
();
$subcollections
[]
=
$engine
[
"minismCollection"
]
->
__toString
();
}
}
# Nur noch alle eventuell angeschalteten Minisucher deaktivieren
...
...
@@ -558,15 +557,15 @@ class MetaGer
// Wir schalten eine Teilmenge, oder aber gar keine an
foreach
(
$enabledSearchengines
as
$engine
)
{
if
(
isset
(
$engine
[
'minismCollection'
]))
{
$
this
->
subcollections
[]
=
$engine
[
'minismCollection'
]
->
__toString
();
$subcollections
[]
=
$engine
[
'minismCollection'
]
->
__toString
();
}
else
{
$tmp
[]
=
$engine
;
}
}
}
$enabledSearchengines
=
$tmp
;
if
(
sizeof
(
$
this
->
subcollections
)
>
0
)
{
$enabledSearchengines
[]
=
$this
->
loadMiniSucher
(
$xml
,
$
this
->
subcollections
);
if
(
sizeof
(
$subcollections
)
>
0
)
{
$enabledSearchengines
[]
=
$this
->
loadMiniSucher
(
$xml
,
$subcollections
);
}
if
(
$sumaCount
<=
0
)
{
$this
->
errors
[]
=
trans
(
'metaGer.settings.noneSelected'
);
...
...
@@ -585,7 +584,7 @@ class MetaGer
$engine
->
setResultHash
(
$this
->
getHashCode
());
}
}
else
{
$engines
=
$this
->
actuallyCreateSearchEngines
(
$enabledSearchengines
,
$siteSearchFailed
,
$this
->
subcollections
);
$engines
=
$this
->
actuallyCreateSearchEngines
(
$enabledSearchengines
,
$siteSearchFailed
);
}
# Wir starten alle Suchen
...
...
@@ -746,6 +745,7 @@ class MetaGer
public
function
loadMiniSucher
(
$xml
,
$subcollections
)
{
$minisucherEngine
=
$xml
->
xpath
(
'suma[@name="minism"]'
)[
0
];
$minisucherEngine
[
"subcollections"
]
=
implode
(
", "
,
$subcollections
);
$subcollections
=
urlencode
(
"("
.
implode
(
" OR "
,
$subcollections
)
.
")"
);
$minisucherEngine
[
"formData"
]
=
str_replace
(
"<<SUBCOLLECTIONS>>"
,
$subcollections
,
$minisucherEngine
[
"formData"
]);
$minisucherEngine
[
"formData"
]
=
str_replace
(
"<<COUNT>>"
,
sizeof
(
$subcollections
)
*
10
,
$minisucherEngine
[
"formData"
]);
...
...
app/Models/Searchengine.php
View file @
55b217e2
...
...
@@ -22,7 +22,6 @@ 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
...
...
@@ -52,9 +51,6 @@ 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 @
55b217e2
...
...
@@ -6,7 +6,6 @@ use App\Models\Searchengine;
class
Minisucher
extends
Searchengine
{
public
function
__construct
(
\
SimpleXMLElement
$engine
,
\
App\MetaGer
$metager
)
{
parent
::
__construct
(
$engine
,
$metager
);
...
...
@@ -14,7 +13,6 @@ class Minisucher extends Searchengine
if
(
$metager
->
getFokus
()
===
"nachrichten"
){
$this
->
getString
.
=
"sort="
.
$this
->
urlencode
(
"documentDate desc"
);
}
}
public
function
loadResults
(
$content
)
...
...
@@ -56,7 +54,7 @@ class Minisucher extends Searchengine
$additionalInformation
=
[
'date'
=>
$dateVal
];
$minism
=
implode
(
", "
,
$this
->
subcollections
)
;
$minism
=
simplexml_load_string
(
$this
->
engine
)[
"subcollections"
]
;
$gefVon
=
"<a href=
\"
https://metager.de
\"
target=
\"
_blank
\"
rel=
\"
noopener
\"
>Minisucher:
$minism
</a>"
;
$this
->
results
[]
=
new
\
App\Models\Result
(
...
...
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