ereuse
/
devicehub-django
8
0
Fork 0
Code Issues 5 Pull Requests 5 Packages Projects Releases Wiki Activity

Fixed Xapian search: issue #19 #34

Open
rskthomas wants to merge 3 commits from issue_19 into main
pull from: issue_19
merge into: ereuse:main
Conversation 0 Commits 3 Files Changed 4 +4 -8
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7d7b9041d - Show all commits

8
dashboard/views.py
View File

@ -70,14 +70,8 @@ class SearchView(InventaryMixin):
return self.search_hids(query, offset, limit) return self.search_hids(query, offset, limit)
devices = [] devices = []
dev_id = []
for x in matches: for x in matches:
# devices.append(self.get_annotations(x)) devices.append(self.get_annotations(x))
dev = self.get_annotations(x)
if dev.id not in dev_id:
devices.append(dev)
dev_id.append(dev.id)
count = matches.size() count = matches.size()
# TODO fix of pagination, the count is not correct # TODO fix of pagination, the count is not correct

4
evidence/parse.py
View File

@ -49,8 +49,10 @@ class Build:
self.create_annotations() self.create_annotations()
def index(self): def index(self):
timestamp = self.json['timestamp']
snap = json.dumps(self.json) snap = json.dumps(self.json)
index(self.user.institution, self.uuid, snap)
index(self.user.institution, self.get_hid(self.json) , self.uuid, timestamp, snap)
def generate_chids(self): def generate_chids(self):
self.algorithms = { self.algorithms = {