From 6084cf0617d451ce5f064c0cecae9eebba654417 Mon Sep 17 00:00:00 2001 From: Matej Date: Sun, 10 Nov 2024 13:34:35 +0100 Subject: [PATCH] Adjust specific query to make better sense within sample data --- .../actual/politician_comparisonCS_result.txt | 8 +++--- .../politician_comparisonCS_result.txt | 8 +++--- .../inputs/politician_comparisonCS.json | 2 +- .../inputs/politician_comparisonLV.json | 26 ------------------- .../ParCzech.TEI.ana/ParCzech.ana.xml | 8 +++--- 5 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 test/API/examples/inputs/politician_comparisonLV.json diff --git a/test/API/examples/actual/politician_comparisonCS_result.txt b/test/API/examples/actual/politician_comparisonCS_result.txt index 4905e8c..7cc7c2e 100644 --- a/test/API/examples/actual/politician_comparisonCS_result.txt +++ b/test/API/examples/actual/politician_comparisonCS_result.txt @@ -1,10 +1,10 @@ -[{'person.person_id': 'AdamKalous.1979', 'persName.forename': 'Adam', 'persName.surname': 'Kalous', 'total_speeches': 0}, {'person.person_id': 'AdamRykala.1986', 'persName.forename': 'Adam', 'persName.surname': 'Rykala', 'total_speeches': 0}] +[{'person.person_id': 'AndrejBabis.1954', 'persName.forename': 'Andrej', 'persName.surname': 'Babiš', 'total_speeches': 59}, {'person.person_id': 'VeraJourova.1964', 'persName.forename': 'Věra', 'persName.surname': 'Jourová', 'total_speeches': 2}] -Running time 7.3037109375 ms +Running time 5.59716796875 ms +------------------+-------------------+------------------+----------------+ | person.person_id | persName.forename | persName.surname | total_speeches | +------------------+-------------------+------------------+----------------+ -| AdamKalous.1979 | Adam | Kalous | 0 | -| AdamRykala.1986 | Adam | Rykala | 0 | +| AndrejBabis.1954 | Andrej | Babiš | 59 | +| VeraJourova.1964 | Věra | Jourová | 2 | +------------------+-------------------+------------------+----------------+ diff --git a/test/API/examples/expected/politician_comparisonCS_result.txt b/test/API/examples/expected/politician_comparisonCS_result.txt index 8e508f4..85856f2 100644 --- a/test/API/examples/expected/politician_comparisonCS_result.txt +++ b/test/API/examples/expected/politician_comparisonCS_result.txt @@ -1,10 +1,10 @@ -[{'person.person_id': 'AdamKalous.1979', 'persName.forename': 'Adam', 'persName.surname': 'Kalous', 'total_speeches': 0}, {'person.person_id': 'AdamRykala.1986', 'persName.forename': 'Adam', 'persName.surname': 'Rykala', 'total_speeches': 0}] +[{'person.person_id': 'AndrejBabis.1954', 'persName.forename': 'Andrej', 'persName.surname': 'Babiš', 'total_speeches': 59}, {'person.person_id': 'VeraJourova.1964', 'persName.forename': 'Věra', 'persName.surname': 'Jourová', 'total_speeches': 2}] -Running time 8.216552734375 ms +Running time 6.149658203125 ms +------------------+-------------------+------------------+----------------+ | person.person_id | persName.forename | persName.surname | total_speeches | +------------------+-------------------+------------------+----------------+ -| AdamKalous.1979 | Adam | Kalous | 0 | -| AdamRykala.1986 | Adam | Rykala | 0 | +| AndrejBabis.1954 | Andrej | Babiš | 59 | +| VeraJourova.1964 | Věra | Jourová | 2 | +------------------+-------------------+------------------+----------------+ diff --git a/test/API/examples/inputs/politician_comparisonCS.json b/test/API/examples/inputs/politician_comparisonCS.json index 07e92c4..2b65449 100644 --- a/test/API/examples/inputs/politician_comparisonCS.json +++ b/test/API/examples/inputs/politician_comparisonCS.json @@ -15,7 +15,7 @@ { "column":"person.person_id", "operator":" IN ", - "value":"('AdamKalous.1979', 'AdamRykala.1986')" + "value":"('AndrejBabis.1954', 'VeraJourova.1964')" } ] }, diff --git a/test/API/examples/inputs/politician_comparisonLV.json b/test/API/examples/inputs/politician_comparisonLV.json deleted file mode 100644 index ad69f67..0000000 --- a/test/API/examples/inputs/politician_comparisonLV.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "target_databases":["databaseLV"], - "description":"Comparison of total speeches by Andris Kazinovskis and Inese Ikstena", - "steps":[ - { - "goal":"main", - "columns":["persName.forename","persName.surname", "person.person_id", "COUNT(speech.id) AS total_speeches"], - "aggregation": { - "group_by":["persName.forename", "persName.surname", - "person.person_id"], - "order_by":[] - }, - "filtering": { - "conditions": [ - { - "column":"person.person_id", - "operator": " IN ", - "value":"('KazinovskisAndris','IkstenaInese')" - } - ] - }, - "limit":"" - - } - ] -} diff --git a/test/sampleData/ParCzech.TEI.ana/ParCzech.ana.xml b/test/sampleData/ParCzech.TEI.ana/ParCzech.ana.xml index 320e90b..a105d0c 100644 --- a/test/sampleData/ParCzech.TEI.ana/ParCzech.ana.xml +++ b/test/sampleData/ParCzech.TEI.ana/ParCzech.ana.xml @@ -387,7 +387,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -427,8 +427,6 @@ - - @@ -637,7 +635,7 @@ - +