From 2b2cb36cbfd61b2121dde0814ea3b77b3da4ea5e Mon Sep 17 00:00:00 2001 From: Dumitru Date: Tue, 14 Nov 2023 15:27:11 +0300 Subject: [PATCH] checking queries correctness --- notebooks/query_cellar_R.ipynb | 20 +++++++++----------- queries/SMEs_by_country.rq | 3 ++- queries/notices_by_buyers_country.rq | 3 ++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/notebooks/query_cellar_R.ipynb b/notebooks/query_cellar_R.ipynb index df2a329..f966f80 100644 --- a/notebooks/query_cellar_R.ipynb +++ b/notebooks/query_cellar_R.ipynb @@ -53,15 +53,14 @@ "?AwardedValueCurrency\n", "WHERE {\n", " VALUES ?NoticePublicationDate {\n", - " '20230921'\n", + " \"20230905\"\n", " }\n", " FILTER(LANG(?WinnerLegalName) = 'en')\n", - " ?NoticeId a epo:ResultNotice;\n", - " epo:hasPublicationDate ?NoticePublicationDate;\n", - " epo:refersToLot ?Lot.\n", - " ?Lot a epo:Lot.\n", - " ?LotAwardOutcome epo:describesLot ?Lot;\n", - " a epo:LotAwardOutcome;\n", + " ?Notice a epo:Notice;\n", + " epo:hasPublicationDate ?NoticePublicationDate ;\n", + " epo:refersToLot ?Lot .\n", + " ?LotAwardOutcome epo:describesLot ?Lot ;\n", + " epo:hasAwardedValue ?MonetaryValue ;\n", " epo:comprisesTenderAwardOutcome ?TenderAwardOutcome.\n", " ?TenderAwardOutcome a epo:TenderAwardOutcome;\n", " epo:indicatesAwardOfLotToWinner / epo:playedBy ?Winner.\n", @@ -70,10 +69,9 @@ " OPTIONAL {\n", " ?Winner cccev:registeredAddress / epo:hasCountryCode ?WinnerCountryCode.\n", " }\n", - " ?LotAwardOutcome epo:hasAwardedValue ?LotAwardedValue.\n", - " ?LotAwardedValue a epo:MonetaryValue;\n", - " epo:hasAmountValue ?AwardedValue;\n", - " epo:hasCurrency ?AwardedValueCurrency.\n", + " ?MonetaryValue a epo:MonetaryValue;\n", + " epo:hasAmountValue ?AwardedValue;\n", + " epo:hasCurrency ?AwardedValueCurrency .\n", "}\n", "\"" ] diff --git a/queries/SMEs_by_country.rq b/queries/SMEs_by_country.rq index ee21498..5b1ef90 100644 --- a/queries/SMEs_by_country.rq +++ b/queries/SMEs_by_country.rq @@ -12,7 +12,8 @@ WHERE { } ?Notice epo:hasPublicationDate ?NoticePublicationDate . ?Notice epo:announcesRole ?Buyer . - ?Buyer epo:playedBy ?Organization . + ?Buyer a epo:Winner ; + epo:playedBy ?Organization . ?Organization epo:hasBusinessSize ?BusinessSize . ?Organization cccev:registeredAddress / epo:hasCountryCode ?CountryCode . } diff --git a/queries/notices_by_buyers_country.rq b/queries/notices_by_buyers_country.rq index b4d9e47..1209dea 100644 --- a/queries/notices_by_buyers_country.rq +++ b/queries/notices_by_buyers_country.rq @@ -13,7 +13,8 @@ WHERE { } ?Notice epo:hasPublicationDate ?PublicationDate . ?Notice epo:announcesRole ?Buyer . - ?Buyer epo:playedBy ?Organization . + ?Buyer a epo:Buyer ; + epo:playedBy ?Organization . ?Organization cccev:registeredAddress / epo:hasCountryCode ?countryCode . ?Organization epo:hasLegalName ?LegalName . } \ No newline at end of file