Skip to content

Commit bec2cb1

Browse files
mearvkmearvk
committed
Science Commit 5.
1 parent 476b317 commit bec2cb1

13 files changed

Lines changed: 103 additions & 4 deletions

File tree

‎modules/black/presidential/Brarner.M.Alete/install/after-pull.sh‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,53 @@ else
257257
mark_skip "Tomcat not running — cannot check pages"
258258
fi
259259

260+
# ─── Legal data integrity ───
261+
echo ""
262+
echo "[6b] Legal module data..."
263+
264+
LEGAL_SAFE="$BMA_ROOT/data/legal/safe"
265+
if [ -d "$LEGAL_SAFE" ]; then
266+
SAFE_COUNT=$(find "$LEGAL_SAFE" -type f \( -name "*.csv" -o -name "*.rdns" -o -name "*.txt" \) | wc -l)
267+
if [ "$SAFE_COUNT" -ge 10 ]; then
268+
mark_ok "Legal safe data: $SAFE_COUNT files"
269+
else
270+
mark_fail "Legal safe data incomplete ($SAFE_COUNT files, expected 10+)"
271+
echo " Fix: bash data/legal/download-legal-data.sh && bash data/legal/unzip-and-consume.sh"
272+
fi
273+
# Verify SHA-256 integrity
274+
INTEGRITY="$LEGAL_SAFE/integrity.sha256"
275+
if [ -f "$INTEGRITY" ]; then
276+
if cd "$LEGAL_SAFE" && sha256sum -c "$INTEGRITY" &>/dev/null; then
277+
mark_ok "Legal data integrity: SHA-256 verified"
278+
else
279+
mark_fail "Legal data integrity: SHA-256 mismatch — rerun unzip-and-consume.sh"
280+
fi
281+
cd "$BMA_ROOT" 2>/dev/null || true
282+
else
283+
mark_skip "No integrity.sha256 found — rerun unzip-and-consume.sh"
284+
fi
285+
# Check legal.jsp deployed
286+
if [ -f "$DEPLOY_DIR/legal.jsp" ]; then
287+
mark_ok "legal.jsp deployed"
288+
else
289+
mark_fail "legal.jsp missing from $DEPLOY_DIR — webapp needs redeploy"
290+
fi
291+
# Deploy legal safe data to webapp if missing
292+
if [ ! -d "$DEPLOY_DIR/data/legal" ] || [ "$(find "$DEPLOY_DIR/data/legal" -type f 2>/dev/null | wc -l)" -lt "$SAFE_COUNT" ]; then
293+
mkdir -p "$DEPLOY_DIR/data/legal"
294+
cp "$LEGAL_SAFE"/*.csv "$DEPLOY_DIR/data/legal/" 2>/dev/null || true
295+
cp "$LEGAL_SAFE"/*.rdns "$DEPLOY_DIR/data/legal/" 2>/dev/null || true
296+
cp "$LEGAL_SAFE"/*.txt "$DEPLOY_DIR/data/legal/" 2>/dev/null || true
297+
chmod 444 "$DEPLOY_DIR/data/legal/"* 2>/dev/null || true
298+
mark_fix "Legal data synced to $DEPLOY_DIR/data/legal/"
299+
else
300+
mark_ok "Legal data in webapp is current"
301+
fi
302+
else
303+
mark_fail "Legal safe directory not found: $LEGAL_SAFE"
304+
echo " Fix: bash data/legal/download-legal-data.sh && bash data/legal/unzip-and-consume.sh"
305+
fi
306+
260307
# ─── Restart decisions ───
261308
echo ""
262309
echo "[7] Service restart decisions..."

‎modules/black/presidential/Brarner.M.Alete/install/deploy-local.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,19 @@ fi
8686
# Fix ownership
8787
chown -R tomcat:tomcat "$DEPLOY_DIR" 2>/dev/null || true
8888

89+
# Deploy legal data to webapp data directory (for direct JSP access if needed)
90+
LEGAL_SAFE="$BMA_ROOT/data/legal/safe"
91+
if [ -d "$LEGAL_SAFE" ]; then
92+
mkdir -p "$DEPLOY_DIR/data/legal"
93+
cp "$LEGAL_SAFE"/*.csv "$DEPLOY_DIR/data/legal/" 2>/dev/null || true
94+
cp "$LEGAL_SAFE"/*.rdns "$DEPLOY_DIR/data/legal/" 2>/dev/null || true
95+
cp "$LEGAL_SAFE"/*.txt "$DEPLOY_DIR/data/legal/" 2>/dev/null || true
96+
chmod 444 "$DEPLOY_DIR/data/legal/"* 2>/dev/null || true
97+
echo "[*] Legal data deployed to $DEPLOY_DIR/data/legal/ (read-only)"
98+
else
99+
echo "[!] Legal safe data not found — run: bash data/legal/download-legal-data.sh && bash data/legal/unzip-and-consume.sh"
100+
fi
101+
89102
# Create www and web symlinks in BMA project root → canonical deploy dir
90103
ln -sfn "$DEPLOY_DIR" "$BMA_ROOT/www"
91104
ln -sfn "$DEPLOY_DIR" "$BMA_ROOT/web"

‎modules/black/presidential/Brarner.M.Alete/install/install.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,23 @@ echo "[✓] Local install complete"
177177
echo " URL: http://localhost:8080/${TOMCAT_CONTEXT}/"
178178
echo ""
179179
echo " Deployed resources:"
180-
echo " JSP (preferred): index.jsp, species.jsp, postal.jsp, art.jsp, science.jsp, status.jsp, guest.jsp, register.jsp"
180+
echo " JSP (preferred): index.jsp, species.jsp, postal.jsp, art.jsp, science.jsp, legal.jsp, status.jsp, guest.jsp, register.jsp"
181181
echo " XHTML (legacy): index.xhtml, species.xhtml, postal.xhtml, art.xhtml, science.xhtml, status.xhtml"
182182
echo ""
183183
echo " JSP pages query the database server-side (no JavaScript fetch)."
184184
echo " XHTML pages use inlined JS with client-side fetch (legacy fallback)."
185185
echo " welcome-file: index.jsp (WEB-INF/web.xml)"
186186
echo ""
187+
echo " Legal module:"
188+
echo " Data: data/legal/safe/ (csv, rdns, txt — read-only)"
189+
echo " Server: source/legal/BaseServer.java (ports 18500-18507)"
190+
echo " Config: source/legal/config.xml"
191+
echo " Web: legal.jsp (search, precedent, counts, connectors)"
192+
echo ""
193+
echo " To populate legal data:"
194+
echo " bash data/legal/download-legal-data.sh"
195+
echo " bash data/legal/unzip-and-consume.sh"
196+
echo ""
187197

188198
# ─── Remote deploy option ───
189199
echo "───────────────────────────────────────────────────────────────"

‎modules/black/presidential/Brarner.M.Alete/install/macos/populate-all.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
set -e
66

77
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
8+
BMA_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
89

910
echo "═══════════════════════════════════════════════════════════════"
1011
echo " Brarner.M.Alete™ — Populate All Tables (macOS)"
@@ -21,8 +22,15 @@ bash "$SCRIPT_DIR/populate-publications.sh"
2122
echo ""
2223
bash "$SCRIPT_DIR/populate-ssa.sh"
2324

25+
echo ""
26+
echo "[*] Populating legal data..."
27+
bash "$BMA_ROOT/data/legal/download-legal-data.sh"
28+
echo ""
29+
echo "[*] Processing legal data into safe formats..."
30+
bash "$BMA_ROOT/data/legal/unzip-and-consume.sh"
31+
2432
echo ""
2533
echo "═══════════════════════════════════════════════════════════════"
2634
echo " [✓] All tables populated"
27-
echo " animalia, species, postal, art_works, publications, ssa_offices"
35+
echo " animalia, species, postal, art_works, publications, ssa_offices, legal"
2836
echo "═══════════════════════════════════════════════════════════════"

‎modules/black/presidential/Brarner.M.Alete/install/populate-all.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
set -e
66

77
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
8+
BMA_ROOT="$(dirname "$SCRIPT_DIR")"
89

910
echo "═══════════════════════════════════════════════════════════════"
1011
echo " Brarner.M.Alete™ — Populate All Tables"
@@ -21,8 +22,15 @@ bash "$SCRIPT_DIR/populate-publications.sh"
2122
echo ""
2223
bash "$SCRIPT_DIR/populate-ssa.sh"
2324

25+
echo ""
26+
echo "[*] Populating legal data..."
27+
bash "$BMA_ROOT/data/legal/download-legal-data.sh"
28+
echo ""
29+
echo "[*] Processing legal data into safe formats..."
30+
bash "$BMA_ROOT/data/legal/unzip-and-consume.sh"
31+
2432
echo ""
2533
echo "═══════════════════════════════════════════════════════════════"
2634
echo " [✓] All tables populated"
27-
echo " animalia, species, postal, art_works, publications, ssa_offices"
35+
echo " animalia, species, postal, art_works, publications, ssa_offices, legal"
2836
echo "═══════════════════════════════════════════════════════════════"

‎modules/black/presidential/Brarner.M.Alete/install/windows/populate-all.bat‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ call "%SCRIPT_DIR%populate-publications.bat"
2020
echo.
2121
call "%SCRIPT_DIR%populate-ssa.bat"
2222

23+
echo.
24+
echo [*] Legal data: Download and process manually on Windows:
25+
echo bash data/legal/download-legal-data.sh
26+
echo bash data/legal/unzip-and-consume.sh
27+
echo (Requires WSL or Git Bash)
28+
2329
echo.
2430
echo ═══════════════════════════════════════════════════════════════
2531
echo [OK] All tables populated
26-
echo animalia, species, postal, art_works, publications, ssa_offices
32+
echo animalia, species, postal, art_works, publications, ssa_offices, legal
2733
echo ═══════════════════════════════════════════════════════════════
2834
endlocal

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/art.jsp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<li><a href="postal.jsp">Postal</a></li>
1919
<li><a href="art.jsp" class="active">Art</a></li>
2020
<li><a href="science.jsp">Science</a></li>
21+
<li><a href="legal.jsp">Legal</a></li>
2122
<li><a href="status.jsp">Status</a></li>
2223
</ul>
2324
<div class="nav-actions">

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/guest.jsp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<li><a href="postal.jsp">Postal</a></li>
3333
<li><a href="art.jsp">Art</a></li>
3434
<li><a href="science.jsp">Science</a></li>
35+
<li><a href="legal.jsp">Legal</a></li>
3536
<li><a href="status.jsp">Status</a></li>
3637
</ul>
3738
<div class="nav-actions">

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/postal.jsp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<li><a href="postal.jsp" class="active">Postal</a></li>
1919
<li><a href="art.jsp">Art</a></li>
2020
<li><a href="science.jsp">Science</a></li>
21+
<li><a href="legal.jsp">Legal</a></li>
2122
<li><a href="status.jsp">Status</a></li>
2223
</ul>
2324
<div class="nav-actions">

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/register.jsp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
<li><a href="postal.jsp">Postal</a></li>
140140
<li><a href="art.jsp">Art</a></li>
141141
<li><a href="science.jsp">Science</a></li>
142+
<li><a href="legal.jsp">Legal</a></li>
142143
<li><a href="status.jsp">Status</a></li>
143144
</ul>
144145
<div class="nav-actions">

0 commit comments

Comments
 (0)