Merge branch 'civil' into feature/nightly-action

Makefile

@@ -1,32 +1,30 @@
-DB=cases.db
-
 .PHONY: all
 all: upload
 
 .PHONY: clean
 clean:
  rm *.csv *.jl *.json
 
-cases.zip : $(DB)
+cases.zip : cases.db
  - rm -rf cases_csv
  mkdir cases_csv
- echo "select * from court_case" | sqlite3 -csv -header $(DB) > cases_csv/court_case.csv
- echo "select * from plaintiff" | sqlite3 -csv -header $(DB) > cases_csv/plaintiff.csv
- echo "select * from defendant" | sqlite3 -csv -header $(DB) > cases_csv/defendant.csv
- echo "select * from attorney" | sqlite3 -csv -header $(DB) > cases_csv/attorney.csv
- echo "select * from event" | sqlite3 -csv -header $(DB) > cases_csv/event.csv
+ echo "select * from court_case" | sqlite3 -csv -header cases.db > cases_csv/court_case.csv
+ echo "select * from plaintiff" | sqlite3 -csv -header cases.db > cases_csv/plaintiff.csv
+ echo "select * from defendant" | sqlite3 -csv -header cases.db > cases_csv/defendant.csv
+ echo "select * from attorney" | sqlite3 -csv -header cases.db > cases_csv/attorney.csv
+ echo "select * from event" | sqlite3 -csv -header cases.db > cases_csv/event.csv
  zip -r $@ cases_csv
 
 .PHONY: get_new_records
 get_new_records: import_new_cases import_new_attorneys import_new_events import_new_plaintiffs import_new_defendants set_subdivisions
 
 .PHONY: set_subdivisions
-set_subdivisions: $(DB)
- sqlite3 $(DB) < scripts/subdivision.sql
+set_subdivisions: cases.db
+ sqlite3 cases.db < scripts/subdivision.sql
 
 .PHONY: import_new_%
-import_new_%: new_%.csv $(DB)
- cat $< | sqlite3 $(DB) -init scripts/new_$*.sql -bail
+import_new_%: new_%.csv cases.db
+ cat $< | sqlite3 cases.db -init scripts/new_$*.sql -bail
 
 new_cases.csv: cases.json
  cat $^ | jq '.[] | [.ad_damnum, .calendar, .case_number, .case_type, .court, .division, .filing_date, .hash] | @csv' -r > $@
@@ -52,13 +50,13 @@ cases.json : chancery.jl
 # Query parameterized by civil case subdivision
 CIVIL_SCRAPE_START_QUERY=$(shell tail -n +2 scripts/nightly_civil_start.sql)
 
-civil-%.jl: $(DB)
- START=$$(sqlite-utils query --csv --no-headers $(DB) \
+civil-%.jl: cases.db
+ START=$$(sqlite-utils query --csv --no-headers cases.db \
  "$(CIVIL_SCRAPE_START_QUERY)" -p subdivision $*); \
  scrapy crawl civil -a division=$* -a start=$$START -O $@;
 
-chancery.jl: $(DB)
- START=$$(sqlite3 $(DB) < scripts/nightly_chancery_start.sql); \
+chancery.jl: cases.db
+ START=$$(sqlite3 cases.db < scripts/nightly_chancery_start.sql); \
  scrapy crawl chancery -a start=$$START -O $@;
 
 cases.db :