Skip to content

fix empty subcats and reharvest #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2024
Merged

fix empty subcats and reharvest #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ Untitled*
http_cache.sqlite
data-rocrate
subject-hierarchy.md
ro-crate-metadata.json.v1.0.0
6 changes: 3 additions & 3 deletions .zenodo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/GLAM-Workbench/trove-web-archives/tree/v1.0.0",
"identifier": "https://github.com/GLAM-Workbench/trove-web-archives/tree/v1.0.1",
"relation": "isDerivedFrom",
"resource_type": "software"
},
Expand All @@ -22,14 +22,14 @@
"resource_type": "other"
}
],
"version": "v1.0.0",
"version": "v1.0.1",
"upload_type": "software",
"keywords": [
"digital humanities",
"Jupyter",
"GLAM Workbench"
],
"publication_date": "2024-05-06",
"publication_date": "2024-05-07",
"creators": [
{
"name": "Sherratt, Tim",
Expand Down
86 changes: 12 additions & 74 deletions create-datasets.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "9362f044-66c3-44b4-b4b4-8566603bb11d",
"metadata": {
"editable": true,
Expand All @@ -73,18 +73,7 @@
},
"tags": []
},
"outputs": [
{
"data": {
"text/plain": [
"True"
]
},
"execution_count": 1,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"import os\n",
"from datetime import datetime\n",
Expand All @@ -102,7 +91,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"id": "1ab9af6c-01d7-459b-8595-31325aeb3558",
"metadata": {
"editable": true,
Expand Down Expand Up @@ -138,7 +127,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "cb8497ee-fae1-4252-bdb4-5fe1ab6fb12a",
"metadata": {
"editable": true,
Expand Down Expand Up @@ -212,7 +201,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"id": "a9895f20-1891-4c5e-8bfe-bb3ef54f023f",
"metadata": {
"editable": true,
Expand All @@ -223,23 +212,10 @@
"nbval-skip"
]
},
"outputs": [
{
"data": {
"text/html": [
"Download dataset: <a href='datasets/pandora-subject-3-business-economy.zip', download>datasets/pandora-subject-3-business-economy.zip</a>"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"outputs": [],
"source": [
"create_subject_dataset(\n",
" \"/subject/3\", include_subcategories=True, include_collections=True\n",
" \"/subject/5\", include_subcategories=True, include_collections=True\n",
")"
]
},
Expand All @@ -253,7 +229,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"id": "a1f8b140-1453-4b1f-ba7f-6bdb3e77b11f",
"metadata": {
"editable": true,
Expand Down Expand Up @@ -297,7 +273,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"id": "f9dff1c6-4305-4d87-976e-a11f72a914e2",
"metadata": {
"editable": true,
Expand All @@ -308,27 +284,14 @@
"nbval-skip"
]
},
"outputs": [
{
"data": {
"text/html": [
"Download dataset: <a href='datasets/pandora-col-21326-museums.zip', download>datasets/pandora-col-21326-museums.zip</a>"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"outputs": [],
"source": [
"create_collection_dataset(\"/col/21326\", include_subcollections=True)"
]
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": null,
"id": "ea3b5a17-9b47-4c48-a471-7b42c5948371",
"metadata": {
"editable": true,
Expand All @@ -340,32 +303,7 @@
},
"tags": []
},
"outputs": [
{
"data": {
"text/html": [
"Download dataset: <a href='datasets/pandora-subject-3-business-economy.zip', download>datasets/pandora-subject-3-business-economy.zip</a>"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
},
{
"data": {
"text/html": [
"Download dataset: <a href='datasets/pandora-col-21326-museums.zip', download>datasets/pandora-col-21326-museums.zip</a>"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"outputs": [],
"source": [
"# IGNORE CELL -- TESTING ONLY\n",
"\n",
Expand Down
3 changes: 2 additions & 1 deletion harvest-pandora-subject-collections.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
},
{
"cell_type": "code",
"execution_count": 29,
"execution_count": null,
"id": "1d6f6094-ce03-48d7-9ef2-7cdac14dba11",
"metadata": {
"editable": true,
Expand Down Expand Up @@ -177,6 +177,7 @@
" \"id\": subject_id,\n",
" \"collections\": collection_ids,\n",
" \"titles\": title_ids,\n",
" \"subcategories\": []\n",
" }\n",
" )\n",
" + \"\\n\"\n",
Expand Down
37 changes: 23 additions & 14 deletions ro-crate-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@id": "https://orcid.org/0000-0001-7956-4498"
}
],
"datePublished": "2024-05-06",
"datePublished": "2024-05-07",
"description": "This repository includes information on finding, understanding, and using Pandora's collections of archived web pages.\n\n[Pandora](http://pandora.nla.gov.au/) has been selecting web sites and online resources for preservation since 1996. It has assembled a collection of more than 80,000 titles, organised into subjects and collections. The archived websites are now part of the Australian Web Archive (AWA), which combines the selected titles with broader domain harvests, and is searchable through Trove. However, Pandora's curated collections offer a useful entry point for researchers trying to find web sites relating to particular topics or events.\n\nThe [Web Archives](https://glam-workbench.net/web-archives/) section of the GLAM Workbench provides documentation, tools, and examples to help you work with data from a range of web archives, including the Australian Web Archive. The title urls obtained through Pandora can be used to obtain additional data from the AWA for analysis.",
"hasPart": [
{
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"name": "trove-web-archives",
"url": "https://github.com/GLAM-Workbench/trove-web-archives/",
"version": "v1.0.0"
"version": "v1.0.1"
},
{
"@id": "ro-crate-metadata.json",
Expand Down Expand Up @@ -89,8 +89,8 @@
"File",
"Dataset"
],
"contentSize": 13200346,
"dateModified": "2024-05-03",
"contentSize": 13201943,
"dateModified": "2024-05-07",
"encodingFormat": "text/csv",
"isPartOf": {
"@id": "https://github.com/GLAM-Workbench/trove-web-archives-titles"
Expand All @@ -99,8 +99,8 @@
"@id": "https://creativecommons.org/publicdomain/zero/1.0/"
},
"name": "pandora-titles.csv",
"sdDatePublished": "2024-05-06",
"size": 87741,
"sdDatePublished": "2024-05-07",
"size": 87757,
"url": "https://github.com/GLAM-Workbench/trove-web-archives-titles/raw/main/pandora-titles.csv"
},
{
Expand All @@ -109,16 +109,16 @@
"File",
"Dataset"
],
"contentSize": 1901413,
"dateModified": "2024-05-02",
"contentSize": 1904644,
"dateModified": "2024-05-07",
"isPartOf": {
"@id": "https://github.com/GLAM-Workbench/trove-web-archives-collections"
},
"license": {
"@id": "https://creativecommons.org/publicdomain/zero/1.0/"
},
"name": "pandora-subjects.ndjson",
"sdDatePublished": "2024-05-06",
"sdDatePublished": "2024-05-07",
"size": 149,
"url": "https://github.com/GLAM-Workbench/trove-web-archives-collections/raw/main/pandora-subjects.ndjson"
},
Expand All @@ -128,16 +128,16 @@
"File",
"Dataset"
],
"contentSize": 844738,
"dateModified": "2024-05-02",
"contentSize": 844866,
"dateModified": "2024-05-07",
"isPartOf": {
"@id": "https://github.com/GLAM-Workbench/trove-web-archives-collections"
},
"license": {
"@id": "https://creativecommons.org/publicdomain/zero/1.0/"
},
"name": "pandora-collections.ndjson",
"sdDatePublished": "2024-05-06",
"sdDatePublished": "2024-05-07",
"size": 1920,
"url": "https://github.com/GLAM-Workbench/trove-web-archives-collections/raw/main/pandora-collections.ndjson"
},
Expand Down Expand Up @@ -307,7 +307,7 @@
"actionStatus": {
"@id": "http://schema.org/CompletedActionStatus"
},
"endDate": "2024-05-02",
"endDate": "2024-05-07",
"instrument": {
"@id": "harvest-pandora-subject-collections.ipynb"
},
Expand Down Expand Up @@ -356,7 +356,7 @@
"actionStatus": {
"@id": "http://schema.org/CompletedActionStatus"
},
"endDate": "2024-05-03",
"endDate": "2024-05-07",
"instrument": {
"@id": "harvest-pandora-titles.ipynb"
},
Expand All @@ -375,6 +375,15 @@
},
"endDate": "2024-05-06",
"name": "Create version v1.0.0"
},
{
"@id": "#create_version_v1_0_1",
"@type": "UpdateAction",
"actionStatus": {
"@id": "http://schema.org/CompletedActionStatus"
},
"endDate": "2024-05-07",
"name": "Create version v1.0.1"
}
]
}