Skip to content

Commit 845698c

Browse files
authored
Merge pull request #60 from CyberbuildLab/minimum-spreadsheet
This merge is reviewed and implemented to make the minimum-spreadsheet branch as the new baseline for BE-OLS. Conflicts between the main's and the minimum-spreadsheet's binary files were resolved by keeping the PR branch versions of the data artefacts (data/Ontologies_forRepo.xlsx and the derived data/Ontologies_forRepo.json), consistent with the intention of the the EC3 M&S committe that this PR becomes the new authoritative baseline for main from today on.
2 parents 5af1c3b + c2b1cad commit 845698c

23 files changed

+42294
-5108
lines changed

create_submission_excel.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44

55
# Desired column order
66
COLUMNS = [
7-
"Name",
8-
"Acronym",
7+
"Title",
8+
"Prefix",
99
"Version",
10-
"Year published",
11-
"Short Description",
12-
"URI/Namespace",
13-
"Reference",
10+
"Created",
11+
"License",
12+
"Conforms To Standard",
13+
"Description",
14+
"URI",
15+
"References",
1416
"Linked-to ontologies AECO",
15-
"Linked-to ontologies UPPER",
16-
"Linked other professional domain ontologies"
17+
"Linked-by ontologies UPPER",
18+
#"Linked other professional domain ontologies"
1719
]
1820

1921
def submission_to_excel(input_json, output_excel, sheet_name='Data'):

data/Ontologies_forRepo.json

Lines changed: 4224 additions & 4975 deletions
Large diffs are not rendered by default.

data/Ontologies_forRepo.xlsx

22.1 KB
Binary file not shown.

data/README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
This folder keeps the source data and is the entry point for automated Excel-to-JSON conversion.
44

55
## Files
6-
7-
* **Ontologies\_forRepo.xlsx** - the main Excel workbook where collaborators add or update data. It must contain a sheet named **Data**.
8-
* **Ontologies\_forRepo.json** - the live JSON file used by front-end and other code. It is regenerated automatically whenever the Excel file changes.
6+
* **Ontologies\_forRepo.xlsx** - the main Excel workbook containing the data used by front-end and other code. It must contain a sheet named **Data**.
7+
* **Ontologies\_forRepo.json** - the live JSON file used by front-end and other code. It is regenerated automatically whenever the corresponding Excel file changes.
98
* **Output folder** - contains timestamped JSON backups that are relevant to this conversion process. See `output/README.md` for details.
109

1110
* * **submissions folder** - the ontologies submitted by users to be added to the BE-OLS are first recorded here.
1211

12+
* * **source folder** - the ontologies submitted by users to be added to the BE-OLS are first recorded here. This contains:
13+
* **Ontologies.xlsx** - the main Excel workbook where collaborators enter core information for all ontologies in the database as well as manual information for ontology without URI.
14+
* **Ontology_characterisation.jpynb** - the Jupyter Notebook used to process `Ontologies.xlsx` to generate `Ontologies\_forRepo.xlsx` in the parent folder.
15+
16+
* * **Network Graph folder** - old content to be removed eventually.
17+
1318
## Automatic Conversion
1419

1520
A GitHub Actions workflow monitors this folder for modifications to `Ontologies_forRepo.xlsx`. Whenever changes are pushed:
@@ -31,7 +36,7 @@ If you need to run the workflow on demand:
3136

3237
* The JSON output file must be named exactly `Ontologies_forRepo.json` so that all downstream code can locate it.
3338
* Do not rename this file manually. Always update the Excel workbook and let the workflow regenerate the JSON under the correct name.
34-
* If you upload a new Excel file with a different base name, the converter will generate a JSON file with the same base name.
39+
* If you upload a new Excel file with a different base name, the converter will generate a JSON file with the same base name (this needs updated so that only the `Ontologies_forRepo.xlsx` is processed).
3540

3641

3742
## Important Points (and Troubleshooting)

data/source/ontologies_source.xlsx

77.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)