diff --git a/README.md b/README.md index 99f4cb8..8006304 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,18 @@ SciELO SUSHI API ## Instalation and Running _Build_ ```shell script -docker build --tag scielo-sushi-api:latest . +docker build . --tag scieloorg/scielo-sushi-api:0.5 ``` _Run_ ``` -docker run -d -p 6543:6543 --name scielo-sushi-api --env MARIADB_STRING_CONNECTION="mysql://user:pass@localhost:port/database" --env APPLICATION_URL="http://127.0.0.1:6543" scielo-sushi-api +docker run -d \ + -p 6543:6543 \ + --name scielo-sushi-api \ + --env MARIADB_STRING_CONNECTION="mysql://user:pass@localhost:port/database" \ + --env APPLICATION_URL="http://127.0.0.1:6543" \ + scieloorg/scielo-sushi-api \ + pserve /app/config.ini ``` ## Routes diff --git a/api/static/sql/procedures.sql b/api/static/sql/procedures.sql index 1544c4c..a0bf535 100644 --- a/api/static/sql/procedures.sql +++ b/api/static/sql/procedures.sql @@ -410,7 +410,10 @@ BEGIN ) AS T JOIN counter_journal cj ON cj.id = T.journalID JOIN counter_journal_collection cjc ON cj.id = cjc.idjournal_jc - WHERE cjc.collection = collection; + WHERE cjc.collection = collection + ORDER BY + journalID ASC, + beginDate ASC; END $$ DELIMITER ; @@ -452,7 +455,10 @@ BEGIN ) AS T JOIN counter_journal cj ON cj.id = T.journalID JOIN counter_journal_collection cjc ON cj.id = cjc.idjournal_jc - WHERE cjc.collection = collection; + WHERE cjc.collection = collection + ORDER BY + journalID ASC, + yearMonth ASC; END $$ DELIMITER ; @@ -490,7 +496,10 @@ BEGIN ) AS T JOIN counter_journal cj ON cj.id = T.journalID JOIN counter_journal_collection cjc ON cj.id = cjc.idjournal_jc - WHERE cjc.collection = collection; + WHERE cjc.collection = collection + ORDER BY + journalID ASC, + beginDate ASC; END $$ DELIMITER ; @@ -531,7 +540,10 @@ BEGIN ) AS T JOIN counter_journal cj ON cj.id = T.journalID JOIN counter_journal_collection cjc ON cj.id = cjc.idjournal_jc - WHERE cjc.collection = collection; + WHERE cjc.collection = collection + ORDER BY + journalID ASC, + yearMonth ASC; END $$ DELIMITER ; @@ -548,7 +560,9 @@ BEGIN WHERE (sjm.collection in (collection , collection_extra)) AND (year_month_day between beginDate AND endDate) AND - (cj.online_issn <> '' OR cj.print_issn <> ''); + (cj.online_issn <> '' OR cj.print_issn <> '') + ORDER BY + beginDate ASC; END $$ DELIMITER ; @@ -568,6 +582,8 @@ BEGIN (year_month_day between beginDate AND endDate) AND (online_issn <> '' OR print_issn <> '') GROUP BY - yearMonth; + yearMonth + ORDER BY + yearMonth ASC; END $$ DELIMITER ; diff --git a/setup.py b/setup.py index 3ec5665..675ca61 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup( name='scielo-sushiapi', - version='0.5', + version='0.5.1', packages=find_packages( exclude=["*.tests", "*.tests.*", "tests.*", "tests", "docs"] ),