Skip to content

Commit

Permalink
prep. for v0.0.10 release
Browse files Browse the repository at this point in the history
  • Loading branch information
R. S. Doiel committed Oct 30, 2024
1 parent 702a881 commit 13f5a6c
Show file tree
Hide file tree
Showing 22 changed files with 116 additions and 37 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ maintainers:
orcid: ""

repository-code: "https://github.com/caltechlibrary/cold"
version: 0.0.9
version: 0.0.10
license-url: "https://caltechlibrary.github.io/cold/LICENSE"
keywords: [ "metadata", "objects", "controlled vocabulary" ]
4 changes: 2 additions & 2 deletions about.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ authors:
orcid: "https://orcid.org/0000-0003-0900-6903"

repository-code: "https://github.com/caltechlibrary/cold"
version: 0.0.9
version: 0.0.10
license-url: "https://caltechlibrary.github.io/cold/LICENSE"
keywords: [ "metadata", "objects", "controlled vocabulary" ]

Expand All @@ -23,7 +23,7 @@ keywords: [ "metadata", "objects", "controlled vocabulary" ]
About this software
===================

## cold 0.0.9
## cold 0.0.10

### Authors

Expand Down
4 changes: 4 additions & 0 deletions clear_all_reports.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

sqlite3 reports.ds/collection.db 'delete from reports';
rm htdocs/rpt/*.csv
4 changes: 2 additions & 2 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"copyrightYear": 2024,
"isAccessibleForFree": true,
"dateCreated": "2023-12-12",
"dateModified": "2024-10-15",
"dateModified": "2024-10-30",
"releaseNotes": "cold is a work in progress, subject to change and not recommended for production.",
"version": "0.0.9",
"version": "0.0.10",
"developmentStatus": "wip",
"author": [
{
Expand Down
4 changes: 2 additions & 2 deletions cold_admin.1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%cold(1) user manual | 0.0.9 2024-10-29 c6fa389
%cold(1) user manual | 0.0.10 2024-10-30 702a881
% R. S.Doiel
% 2024-10-29 c6fa389
% 2024-10-30 702a881

# NAME

Expand Down
5 changes: 3 additions & 2 deletions deno.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"setup": "dataset init people.ds 'sqlite://collection.db' ; dataset init groups.ds 'sqlite://collection.db' ; dataset init funders.ds 'sqlite://collection.db' ; dataset init issn.ds 'sqlite://collection.db'; dataset init doi_prefix.ds 'sqlite://collection.db' ; dataset init subjects.ds 'sqlite://collection.db' ; dataset init test.ds 'sqlite://collection.db' ; dataset init reports.ds 'sqlite://collection.db'",
"cold_api": "datasetd cold_api.yaml",
"cold_api_debug": "datasetd --debug cold_api.yaml",
"cold": "deno run --allow-import --allow-read --allow-net --watch cold_admin.ts --htdocs=./htdocs",
"cold": "deno run --watch --allow-import --allow-read --allow-net --watch cold_admin.ts --htdocs=./htdocs",
"cold_reports": "deno run --watch --allow-all reports.ts",
"reset_data": "dsquery groups.ds 'delete from groups' ; dsquery people.ds 'delete from people' ; dsquery funders.ds 'delete from funders' ; dsquery issn.ds 'delete from issn'",
"load_data": "deno task import_groups_csv ; deno task import_people_csv ; deno task import_issn_journal_publisher_csv",
"reload_data": "deno task reset_data ; deno task load_data",
Expand All @@ -18,7 +19,7 @@
"import_people_csv": "deno run --allow-import --allow-read --allow-net ds_importer.ts people.ds people.csv",
"import_groups_csv": "deno run --allow-import --allow-read --allow-net ds_importer.ts groups.ds groups.csv",
"set_include_in_feeds": "deno run --allow-read --allow-net set_include_in_feeds.ts people.ds people_in_feeds.csv",
"import_issn_journal_publisher_csv": "deno run --allow-read --allow-net ds_importer.ts issn.ds issn_journal_publisher.csv",
"import_issn_journal_publisher_csv": "deno run --allow-import --allow-read --allow-net ds_importer.ts issn.ds issn_journal_publisher.csv",
"esm:add": "deno run -A https://esm.sh/v135 add",
"esm:update": "deno run -A https://esm.sh/v135 update",
"esm:remove": "deno run -A https://esm.sh/v135 remove"
Expand Down
4 changes: 2 additions & 2 deletions directory_sync.1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%directory_sync(1) user manual | 0.0.9 2024-10-29 c6fa389
%directory_sync(1) user manual | 0.0.10 2024-10-30 702a881
% R. S.Doiel
% 2024-10-29 c6fa389
% 2024-10-30 702a881

# NAME

Expand Down
2 changes: 1 addition & 1 deletion htdocs/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<section>

<h1>About this software</h1>
<h2>cold 0.0.9</h2>
<h2>cold 0.0.10</h2>
<h3>Authors</h3>
<ul>
<li>R. S. Doiel</li>
Expand Down
4 changes: 2 additions & 2 deletions htdocs/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ authors:
orcid: "https://orcid.org/0000-0003-0900-6903"

repository-code: "https://github.com/caltechlibrary/cold"
version: 0.0.9
version: 0.0.10
license-url: "https://caltechlibrary.github.io/cold/LICENSE"
keywords: [ "metadata", "objects", "controlled vocabulary" ]

Expand All @@ -23,7 +23,7 @@ keywords: [ "metadata", "objects", "controlled vocabulary" ]
About this software
===================

## cold 0.0.9
## cold 0.0.10

### Authors

Expand Down
2 changes: 1 addition & 1 deletion installer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Set the package name and version to install
#
$PACKAGE = "cold"
$VERSION = "0.0.9"
$VERSION = "0.0.10"
$GIT_GROUP = "caltechlibrary"
$RELEASE = "https://github.com/${GIT_GROUP}/${PACKAGE}/releases/tag/v${VERSION}"
$SYSTEM_TYPE = Get-ComputerInfo -Property CsSystemType
Expand Down
2 changes: 1 addition & 1 deletion installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Set the package name and version to install
#
PACKAGE="cold"
VERSION="0.0.9"
VERSION="0.0.10"
GIT_GROUP="caltechlibrary"
RELEASE="https://github.com/$GIT_GROUP/$PACKAGE/releases/tag/v$VERSION"

Expand Down
Binary file added pagefind/fragment/en-US_a374ee4.pf_fragment
Binary file not shown.
Binary file added pagefind/index/en-US_bfd7ebf.pf_index
Binary file not shown.
2 changes: 1 addition & 1 deletion pagefind/pagefind-entry.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"1.1.1","languages":{"en-US":{"hash":"en-US_7f93172229187","wasm":"en-US","page_count":13}}}
{"version":"1.1.1","languages":{"en-US":{"hash":"en-US_93c527e8577f4","wasm":"en-US","page_count":13}}}
Binary file added pagefind/pagefind.en-US_93c527e8577f4.pf_meta
Binary file not shown.
6 changes: 3 additions & 3 deletions people.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export class People implements PeopleInterface {
internal_notes: string = "";

migrateCsv(row: any): boolean {
// NOTE: Skipping the follow legacy columns: thesis_id,advisor_id,authors_id
// NOTE: Skipping the follow legacy columns: thesis_id,advisors_id,authors_id
// authors_count,thesis_count,data_count,advisor_count,editor_count
if (row.hasOwnProperty("cl_people_id")) {
this.clpid = row.cl_people_id;
Expand All @@ -101,8 +101,8 @@ export class People implements PeopleInterface {
if (row.hasOwnProperty("authors_id")) {
this.authors_id = row.authors_id;
}
if (row.hasOwnProperty("advisors_id")) {
this.advisors_id = row.advisors_id;
if (row.hasOwnProperty("advisor_id")) {
this.advisors_id = row.advisor_id;
}
if (row.hasOwnProperty("family_name")) {
this.family_name = row.family_name;
Expand Down
38 changes: 38 additions & 0 deletions people_rpt.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
select json_object(
'family_name', src->'family_name',
'given_name', src->'given_name',
'cl_people_id', ifnull(src->'clpid', ''),
'thesis_id', ifnull(src->'thesis_id', ''),
'advisor_id', ifnull(src->'advisors_id', ''),
'authors_id', ifnull(src->'authors_id', ''),
'archivesspace_id', ifnull(src->'archivesspace_id', ''),
'directory_id', ifnull(src->'directory_user_id', ''),
'viaf_id', src->'viaf',
'lcnaf', src->'lcnaf',
'isni', src->'isni',
'wikidata', src->'wikidata',
'snac', src->'snac',
'orcid', src->'orcid',
'image', '',
'educated_at', ifnull(src->'educated_at', ''),
'caltech', ifnull(src->'caltech', ''),
'jpl', ifnull(src->'jpl', ''),
'faculty', ifnull(src->'faculty', ''),
'staff', ifnull(src->'staff', ''),
'alumn', ifnull(src->'alumn', ''),
'status', ifnull(src->'status', ''),
'directory_person_type', ifnull(src->'directory_person_type', ''),
'title', ifnull(src->'title', ''),
'bio', ifnull(src->'bio', ''),
'division', ifnull(src->'division', ''),
'authors_count', '',
'thesis_count', '',
'data_count', '',
'advisor_count', '',
'editor_count', '',
'updated', src->'updated',
'include_in_feeds', ifnull(src->'include_in_feeds', '')
) as src
from people
order by src->'family_name', src->'given_name'

3 changes: 3 additions & 0 deletions report_design_choices.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
be sent out with the report name, final status and link if available or
error message if not</li>
</ul>
<p>Reports are programs or scripts (e.g. Bash, Python) that write their
results to standard output, the runner reads that and takes care of
saving the results and contacting the email addresses.</p>
<p>I’ve prototyped the report runner in TypeScript but am not happy with
it. I am deciding if I should write this in Go or give Python a try.</p>
<p>I’m thinking reports could be simple script written in any langauge
Expand Down
4 changes: 2 additions & 2 deletions reports.1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%directory_sync(1) user manual | 0.0.9 2024-10-29 c6fa389
%directory_sync(1) user manual | 0.0.10 2024-10-30 702a881
% R. S.Doiel
% 2024-10-29 c6fa389
% 2024-10-30 702a881

# NAME

Expand Down
11 changes: 0 additions & 11 deletions reports.yaml-example

This file was deleted.

46 changes: 45 additions & 1 deletion run_people_csv.bash
Original file line number Diff line number Diff line change
@@ -1,4 +1,48 @@
#!/bin/bash
#

dsquery -csv "family_name,given_name,cl_people_id,thesis_id,advisor_id,authors_id,archivesspace_id,directory_id,viaf_id,lcnaf,isni,wikidata,snac,orcid,image,educated_at,caltech,jpl,faculty,alumn,status,directory_person_type,title,bio,division,authors_count,thesis_count,data_count,advisor_count,editor_count,updated,include_in_feeds" people.ds "select json_object( 'family_name', src->'family_name', 'given_name', src->'given_name', 'cl_people_id', ifnull(src->'clpid', ''), 'thesis_id', ifnull(src->'thesis_id', ''), 'advisor_id', ifnull(src->'advisor_id', ''), 'authors_id', ifnull(src->'authors_id', ''), 'archivesspace_id', ifnull(src->'archivesspace_id', ''), 'directory_id', ifnull(src->'directory_user_id', ''), 'viaf_id', src->'viaf', 'lcnaf', src->'lcnaf', 'isni', src->'isni', 'wikidata', src->'wikidata', 'snac', src->'snac', 'orcid', src->'orcid', 'image', '', 'educated_at', ifnull(src->'educated_at', ''), 'caltech', ifnull(src->'caltech', ''), 'jpl', ifnull(src->'jpl', ''), 'faculty', ifnull(src->'faculty', ''), 'staff', ifnull(src->'staff', ''), 'alumn', ifnull(src->'alumn', ''), 'status', ifnull(src->'status', ''), 'directory_person_type', ifnull(src->'directory_person_type', ''), 'title', ifnull(src->'title', ''), 'bio', ifnull(src->'bio', ''), 'division', ifnull(src->'division', ''), 'authors_count', '', 'thesis_count', '', 'data_count', '', 'advisor_count', '', 'editor_count', '', 'updated', src->'updated', 'include_in_feeds', ifnull(src->'include_in_feeds', '')) as src from people order by src->'family_name', src->'given_name'"
### cat <<SQL>people_rpt.sql
### select json_object(
### 'family_name', src->'family_name',
### 'given_name', src->'given_name',
### 'cl_people_id', ifnull(src->'clpid', ''),
### 'thesis_id', ifnull(src->'thesis_id', ''),
### 'advisor_id', ifnull(src->'advisors_id', ''),
### 'authors_id', ifnull(src->'authors_id', ''),
### 'archivesspace_id', ifnull(src->'archivesspace_id', ''),
### 'directory_id', ifnull(src->'directory_user_id', ''),
### 'viaf_id', src->'viaf',
### 'lcnaf', src->'lcnaf',
### 'isni', src->'isni',
### 'wikidata', src->'wikidata',
### 'snac', src->'snac',
### 'orcid', src->'orcid',
### 'image', '',
### 'educated_at', ifnull(src->'educated_at', ''),
### 'caltech', ifnull(src->'caltech', ''),
### 'jpl', ifnull(src->'jpl', ''),
### 'faculty', ifnull(src->'faculty', ''),
### 'staff', ifnull(src->'staff', ''),
### 'alumn', ifnull(src->'alumn', ''),
### 'status', ifnull(src->'status', ''),
### 'directory_person_type',
### ifnull(src->'directory_person_type', ''),
### 'title', ifnull(src->'title', ''),
### 'bio', ifnull(src->'bio', ''),
### 'division', ifnull(src->'division', ''),
### 'authors_count', '',
### 'thesis_count', '',
### 'data_count', '',
### 'advisor_count', '',
### 'editor_count', '',
### 'updated', src->'updated',
### 'include_in_feeds', ifnull(src->'include_in_feeds', '')) as src
### from people
### order by src->'family_name', src->'given_name'";
###
### SQL

dsquery \
-csv "family_name,given_name,cl_people_id,thesis_id,advisor_id,authors_id,archivesspace_id,directory_id,viaf_id,lcnaf,isni,wikidata,snac,orcid,image,educated_at,caltech,jpl,faculty,alumn,status,directory_person_type,title,bio,division,authors_count,thesis_count,data_count,advisor_count,editor_count,updated,include_in_feeds" \
-sql people_rpt.sql \
people.ds
6 changes: 3 additions & 3 deletions version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export const appInfo: {[k: string]: string} = {
appName: "cold",

// Version number of release
version: "0.0.9",
version: "0.0.10",

// ReleaseDate, the date version.ts was generated
releaseDate: "2024-10-29",
releaseDate: "2024-10-30",

// ReleaseHash, the Git hash when version.go was generated
releaseHash: "c6fa389",
releaseHash: "702a881",

// licenseText holds a copy of the application license text.
licenseText: `
Expand Down

0 comments on commit 13f5a6c

Please sign in to comment.