Merge branch 'develop' into INF-583-pub-med

The-Academic-Observatory · Jun 20, 2023 · ffcab9f · ffcab9f
2 parents 737c9c8 + 736f40f
commit ffcab9f
Show file tree

Hide file tree

Showing 43 changed files with 925 additions and 360 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ ChangeLog
 .DS_Store
 /observatory-dags/observatory/dags/workflows/oapen_cloud_function.zip
 docs/schemas
+.env
diff --git a/...c_observatory_workflows/database/schema/crossref_fundref/crossref_fundref_2014-03-01.json b/...c_observatory_workflows/database/schema/crossref_fundref/crossref_fundref_2014-03-01.json
@@ -8,9 +8,26 @@
               {
                 "fields": [
                   {
+                    "fields": [
+                      {
+                        "mode": "REPEATED",
+                        "name": "parent",
+                        "type": "STRING"
+                      },
+                      {
+                        "mode": "NULLABLE",
+                        "name": "name",
+                        "type": "STRING"
+                      },
+                      {
+                        "mode": "NULLABLE",
+                        "name": "funder",
+                        "type": "STRING"
+                      }
+                    ],
                     "mode": "REPEATED",
                     "name": "parent",
-                    "type": "STRING"
+                    "type": "RECORD"
                   },
                   {
                     "mode": "NULLABLE",
@@ -111,9 +128,26 @@
               {
                 "fields": [
                   {
+                    "fields": [
+                      {
+                        "mode": "REPEATED",
+                        "name": "children",
+                        "type": "STRING"
+                      },
+                      {
+                        "mode": "NULLABLE",
+                        "name": "name",
+                        "type": "STRING"
+                      },
+                      {
+                        "mode": "NULLABLE",
+                        "name": "funder",
+                        "type": "STRING"
+                      }
+                    ],
                     "mode": "REPEATED",
                     "name": "children",
-                    "type": "STRING"
+                    "type": "RECORD"
                   },
                   {
                     "mode": "NULLABLE",

diff --git a/academic_observatory_workflows/database/schema/openalex/authors.json b/academic_observatory_workflows/database/schema/openalex/authors.json
@@ -16,6 +16,12 @@
         "mode": "NULLABLE",
         "description": "The total number  Works that cite a work this author has created."
       },
+      {
+        "name": "oa_works_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
       {
         "name": "works_count",
         "type": "INTEGER",
@@ -154,23 +160,65 @@
     "type": "RECORD",
     "mode": "NULLABLE",
     "fields": [
+      {
+        "name": "2yr_cited_by_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "2yr_h_index",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "2yr_i10_index",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
       {
         "name": "2yr_mean_citedness",
         "type": "FLOAT",
         "mode": "NULLABLE",
-        "description": "The 2-year mean citedness for this author. Also known as impact factor."
+        "description": ""
+      },
+      {
+        "name": "2yr_works_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "cited_by_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
       },
       {
         "name": "h_index",
         "type": "INTEGER",
         "mode": "NULLABLE",
-        "description": "The h-index for this author."
+        "description": ""
       },
       {
         "name": "i10_index",
         "type": "INTEGER",
         "mode": "NULLABLE",
-        "description": "The i-10 index for this author."
+        "description": ""
+      },
+      {
+        "name": "oa_percent",
+        "type": "FLOAT",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "works_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
       }
     ],
     "description": "Citation metrics for this author."

diff --git a/academic_observatory_workflows/database/schema/openalex/concepts.json b/academic_observatory_workflows/database/schema/openalex/concepts.json
@@ -48,6 +48,12 @@
         "mode": "NULLABLE",
         "description": "The number citations to works that have been tagged with this concept. Or less formally: the number of citations to this concept. For example, if there are just two works tagged with this concept and one of them has been cited 10 times, and the other has been cited 1 time, cited_by_count for this concept would be 11."
       },
+      {
+        "name": "oa_works_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
       {
         "name": "works_count",
         "type": "INTEGER",
@@ -238,23 +244,65 @@
     "type": "RECORD",
     "mode": "NULLABLE",
     "fields": [
+      {
+        "name": "2yr_cited_by_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "2yr_h_index",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "2yr_i10_index",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
       {
         "name": "2yr_mean_citedness",
         "type": "FLOAT",
         "mode": "NULLABLE",
-        "description": "The 2-year mean citedness for this concept. Also known as impact factor."
+        "description": ""
+      },
+      {
+        "name": "2yr_works_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "cited_by_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
       },
       {
         "name": "h_index",
         "type": "INTEGER",
         "mode": "NULLABLE",
-        "description": "The h-index for this concept."
+        "description": ""
       },
       {
         "name": "i10_index",
         "type": "INTEGER",
         "mode": "NULLABLE",
-        "description": "The i-10 index for this concept."
+        "description": ""
+      },
+      {
+        "name": "oa_percent",
+        "type": "FLOAT",
+        "mode": "NULLABLE",
+        "description": ""
+      },
+      {
+        "name": "works_count",
+        "type": "INTEGER",
+        "mode": "NULLABLE",
+        "description": ""
       }
     ],
     "description": "Citation metrics for this concept."