ereuse/devicehub-django
8
0
Fork 0
Code Issues 6 Pull requests 6 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 +27 -10
rskthomas commented 2024-11-22 21:04:55 +00:00
Owner
Copy link

Mi intento de resolver ereuse/devicehub-django#19, cambiando los índices y agregando la fecha y el hid (y customer_id), para colapsar los resultados en xapian.

De los resultados que encuentra ahora agarra el más nuevo y sólo uno por match de hid.

Mis pruebas locales funcionaron bien, aunque solo tengo 2 dispositivos con el workscript anterior que anda en main.

Mi intento de resolver ereuse/devicehub-django#19, cambiando los índices y agregando la fecha y el hid (y customer_id), para colapsar los resultados en xapian. De los resultados que encuentra ahora agarra el más nuevo y sólo uno por match de hid. Mis pruebas locales funcionaron bien, aunque solo tengo 2 dispositivos con el workscript anterior que anda en main.
cayop was assigned by rskthomas 2024-11-22 21:04:55 +00:00
rskthomas added 3 commits 2024-11-22 21:04:56 +00:00
This pull request has changes conflicting with the target branch.
  • evidence/parse.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin issue_19:issue_19
git checkout issue_19

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff issue_19
git checkout main
git merge --ff-only issue_19
git checkout issue_19
git rebase main
git checkout main
git merge --no-ff issue_19
git checkout main
git merge --squash issue_19
git checkout main
git merge --ff-only issue_19
git checkout main
git merge issue_19
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
cayop
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ereuse/devicehub-django#34
No description provided.
Delete branch "issue_19"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?