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
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
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
2cab70c7
Commit
2cab70c7
authored
Jan 23, 2020
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed resultloader
parent
03e5fe7a
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
17 deletions
+27
-17
app/Http/Controllers/MetaGerSearch.php
app/Http/Controllers/MetaGerSearch.php
+23
-14
app/MetaGer.php
app/MetaGer.php
+1
-0
app/Models/Searchengine.php
app/Models/Searchengine.php
+2
-2
resources/js/scriptResultPage.js
resources/js/scriptResultPage.js
+1
-1
No files found.
app/Http/Controllers/MetaGerSearch.php
View file @
2cab70c7
...
...
@@ -63,7 +63,15 @@ class MetaGerSearch extends Controller
# Ergebnisse der Suchmaschinen kombinieren:
$metager
->
prepareResults
();
\
App\CacheHelper
::
put
(
$metager
->
getSearchUid
(),
$metager
->
getEngines
(),
1
*
60
);
$finished
=
true
;
foreach
(
$metager
->
getEngines
()
as
$engine
)
{
if
(
$engine
->
loaded
)
{
$engine
->
setNew
(
false
);
$engine
->
markNew
();
}
}
\
App\CacheHelper
::
put
(
"loader_"
.
$metager
->
getSearchUid
(),
$metager
->
getEngines
(),
60
*
60
);
# Die Ausgabe erstellen:
$resultpage
=
$metager
->
createView
(
$quicktipResults
);
...
...
@@ -112,18 +120,7 @@ class MetaGerSearch extends Controller
return
response
()
->
json
([
'finished'
=>
true
]);
}
// Mark all engines that are already loaded
$finished
=
true
;
foreach
(
$engines
as
$engine
)
{
if
(
$engine
->
loaded
)
{
$engine
->
setNew
(
false
);
}
else
{
$finished
=
false
;
$engine
->
setNew
(
true
);
}
}
$metager
=
new
MetaGer
(
$hash
);
$metager
=
new
MetaGer
(
substr
(
$hash
,
strpos
(
$hash
,
"loader_"
)
+
7
));
$metager
->
parseFormData
(
$request
);
# Nach Spezialsuchen überprüfen:
...
...
@@ -156,8 +153,20 @@ class MetaGerSearch extends Controller
}
}
$finished
=
true
;
foreach
(
$engines
as
$engine
)
{
if
(
!
$engine
->
loaded
)
{
$finished
=
false
;
}
else
{
$engine
->
setNew
(
false
);
$engine
->
markNew
();
}
}
$result
[
"finished"
]
=
$finished
;
// Update new Engines
\
App\CacheHelper
::
put
(
$metager
->
getSearchUid
(),
$metager
->
getEngines
(),
1
*
60
);
\
App\CacheHelper
::
put
(
"loader_"
.
$metager
->
getSearchUid
(),
$metager
->
getEngines
(),
1
*
60
);
return
response
()
->
json
(
$result
);
}
...
...
app/MetaGer.php
View file @
2cab70c7
...
...
@@ -71,6 +71,7 @@ class MetaGer
protected
$verificationCount
;
protected
$searchUid
;
protected
$redisResultWaitingKey
,
$redisResultEngineList
,
$redisEngineResult
,
$redisCurrentResultList
;
public
$starttime
;
public
function
__construct
(
$hash
=
""
)
{
...
...
app/Models/Searchengine.php
View file @
2cab70c7
...
...
@@ -51,7 +51,7 @@ abstract class Searchengine
$this
->
useragent
=
$metager
->
getUserAgent
();
$this
->
ip
=
$metager
->
getIp
();
$this
->
startTime
=
microtime
();
$this
->
startTime
=
microtime
(
true
);
# check for http Auth
if
(
!
empty
(
$this
->
engine
->
{
"http-auth-credentials"
}
->
username
)
&&
!
empty
(
$this
->
engine
->
{
"http-auth-credentials"
}
->
password
))
{
$this
->
username
=
$this
->
engine
->
{
"http-auth-credentials"
}
->
username
;
...
...
@@ -192,7 +192,7 @@ abstract class Searchengine
}
}
p
rotected
function
markNew
()
p
ublic
function
markNew
()
{
foreach
(
$this
->
results
as
$result
)
{
$result
->
new
=
$this
->
new
;
...
...
resources/js/scriptResultPage.js
View file @
2cab70c7
...
...
@@ -55,7 +55,7 @@ function enableFormResetter() {
function
loadMoreResults
()
{
var
searchKey
=
$
(
"
meta[name=searchkey]
"
).
attr
(
"
content
"
);
var
updateUrl
=
document
.
location
.
href
;
updateUrl
+=
"
&loadMore=
"
+
searchKey
+
"
&script=yes
"
;
updateUrl
+=
"
&loadMore=
loader_
"
+
searchKey
+
"
&script=yes
"
;
updateUrl
=
updateUrl
.
replace
(
"
/meta.ger3
"
,
"
/loadMore
"
);
...
...
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