Fix double dot-slash in docs and update script references

argahsuknesib · argahsuknesib · commit fa8d67346914 · 2025-12-04T10:43:25.000+01:00
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ check: fmt-check lint ## Run all checks (formatting and linting)
 
 ci-check: ## Run full CI/CD checks locally before pushing
 	@echo "$(BLUE)Running CI/CD checks...$(NC)"
-	@./ci-check.sh
+	@./scripts/ci-check.sh
 
 clean: ## Clean build artifacts
 	@echo "$(BLUE)Cleaning build artifacts...$(NC)"
diff --git a/README.md b/README.md
@@ -51,8 +51,7 @@ Before pushing to the repository, run the CI/CD checks locally:
 make ci-check
 
 # Or use the script directly
-./ci-check.sh
-```
+   ./scripts/ci-check.sh```
 
 This will run:
 - **rustfmt** - Code formatting check
diff --git a/START_HERE.md b/START_HERE.md
@@ -4,8 +4,7 @@
 
 ```bash
 # 1. Setup (one time)
-./test_setup.sh
-
+   ./scripts/test_setup.sh
 # 2. Start MQTT
 docker-compose up -d mosquitto
 
diff --git a/docs/DOCUMENTATION_INDEX.md b/docs/DOCUMENTATION_INDEX.md
@@ -3,7 +3,7 @@
 ## Getting Started
 
 1. **START_HERE.md** - 🚀 BEGIN HERE - Quick start guide
-2. **test_setup.sh** - Automated setup script
+2. **scripts/test_setup.sh** - Automated setup script
 3. **docker-compose.yml** - MQTT broker configuration
 
 ## Quick Reference
diff --git a/docs/LIVE_STREAMING_GUIDE.md b/docs/LIVE_STREAMING_GUIDE.md
@@ -47,7 +47,7 @@ docker-compose up -d mosquitto
 ### 2. Start HTTP Server
 
 ```bash
-./start_http_server.sh --clean
+./scripts/start_http_server.sh --clean
 ```
 
 ### 3. Open Dashboard
@@ -201,7 +201,7 @@ Results stream via WebSocket as JSON:
 ```bash
 # Clean storage and restart
 rm -rf data/storage/*
-./start_http_server.sh
+./scripts/start_http_server.sh
 ```
 
 ### No Live Results
@@ -266,7 +266,7 @@ docker-compose restart mosquitto
 Use the automated test script:
 
 ```bash
-./test_live_streaming.sh
+./scripts/test_live_streaming.sh
 ```
 
 This script:
diff --git a/docs/LIVE_STREAMING_READY.md b/docs/LIVE_STREAMING_READY.md
@@ -45,7 +45,7 @@ WebSocket → Dashboard
 
 ```bash
 cd /Users/kushbisen/Code/janus
-./test_live_streaming.sh
+./scripts/test_live_streaming.sh
 ```
 
 This runs a complete test cycle and shows you if everything works.
@@ -56,7 +56,7 @@ This runs a complete test cycle and shows you if everything works.
 
 ```bash
 cd /Users/kushbisen/Code/janus
-./start_http_server.sh --clean
+./scripts/start_http_server.sh --clean
 ```
 
 You should see:
@@ -184,7 +184,7 @@ The live results will keep coming because `loop_file: true` continuously replays
 # Clean storage
 rm -rf data/storage/*
 # Restart server
-./start_http_server.sh
+./scripts/start_http_server.sh
 ```
 
 #### Issue: Only historical results, no live results
diff --git a/docs/QUICK_REFERENCE.md b/docs/QUICK_REFERENCE.md
@@ -3,7 +3,7 @@
 ## Setup (3 Commands)
 
 ```bash
-./test_setup.sh                    # One-time setup
+./scripts/test_setup.sh                    # One-time setup
 docker-compose up -d mosquitto     # Start MQTT
 cargo run --bin http_server        # Start server
 ```
@@ -104,7 +104,7 @@ janus/
 ├── COMPLETE_SOLUTION.md            # Full explanation
 ├── SETUP_GUIDE.md                  # Detailed setup
 ├── README_HTTP_API.md              # API guide
-└── test_setup.sh                   # Automated setup
+└── ./scripts/test_setup.sh                   # Automated setup
 ```
 
 ## Success Checklist
@@ -119,4 +119,4 @@ janus/
 
 ---
 
-**Quick Start:** `./test_setup.sh` then `cargo run --bin http_server`
+**Quick Start:** `./scripts/test_setup.sh` then `cargo run --bin http_server`
diff --git a/docs/README_HTTP_API.md b/docs/README_HTTP_API.md
@@ -44,7 +44,7 @@ git clone https://github.com/SolidLabResearch/janus.git
 cd janus
 
 # Run automated setup
-./test_setup.sh
+./scripts/test_setup.sh
 
 # Start HTTP server (in new terminal)
 cargo run --bin http_server
diff --git a/docs/RSP_INTEGRATION_COMPLETE.md b/docs/RSP_INTEGRATION_COMPLETE.md
@@ -136,7 +136,7 @@ Total results received: 21
 
 ### CI/CD Checks
 ```bash
-./ci-check.sh
+./scripts/ci-check.sh
 ✅ Formatting check passed!
 ✅ Clippy check passed!
 ✅ All tests passed!
@@ -323,7 +323,7 @@ cargo run --example live_stream_processing_example
 
 **CI/CD Check:**
 ```bash
-./ci-check.sh
+./scripts/ci-check.sh
 ```
 
 **Format Code:**
diff --git a/examples/test_query_pipeline.rs b/examples/test_query_pipeline.rs
@@ -1,8 +1,6 @@
 use janus::{
-    api::janus_api::JanusApi,
-    parsing::janusql_parser::JanusQLParser,
-    registry::query_registry::QueryRegistry,
-    storage::segmented_storage::StreamingSegmentedStorage,
+    api::janus_api::JanusApi, parsing::janusql_parser::JanusQLParser,
+    registry::query_registry::QueryRegistry, storage::segmented_storage::StreamingSegmentedStorage,
     storage::util::StreamingConfig,
 };
 use std::sync::Arc;
@@ -22,7 +20,8 @@ WHERE {
     ?sensor ex:temperature ?temp .
   }
 }
-"#.trim();
+"#
+    .trim();
 
     println!("Testing query pipeline...\n");
     println!("Query:\n{}\n", janusql);
@@ -37,15 +36,15 @@ WHERE {
     };
 
     let storage = Arc::new(StreamingSegmentedStorage::new(config).expect("Failed to load storage"));
-    
+
     let events = storage.query(0, u64::MAX).expect("Storage query failed");
     println!("Storage has {} events", events.len());
-    
+
     if events.len() > 0 {
         let dict = storage.get_dictionary().read().unwrap();
         println!("\nFirst 3 events decoded:");
         for (i, e) in events.iter().take(3).enumerate() {
-            println!("Event {}:", i+1);
+            println!("Event {}:", i + 1);
             println!("  subject: {:?}", dict.decode(e.subject));
             println!("  predicate: {:?}", dict.decode(e.predicate));
             println!("  object: {:?}", dict.decode(e.object));
@@ -83,7 +82,7 @@ WHERE {
     println!("\nWaiting for results (5 seconds)...");
     let start = std::time::Instant::now();
     let mut result_count = 0;
-    
+
     while start.elapsed().as_secs() < 5 {
         if let Some(result) = handle.try_receive() {
             result_count += 1;
@@ -92,7 +91,7 @@ WHERE {
             println!("  Timestamp: {}", result.timestamp);
             println!("  Bindings ({} items):", result.bindings.len());
             for (i, binding) in result.bindings.iter().take(3).enumerate() {
-                println!("    {}: {:?}", i+1, binding);
+                println!("    {}: {:?}", i + 1, binding);
             }
         } else {
             std::thread::sleep(std::time::Duration::from_millis(100));
diff --git a/examples/test_storage_query.rs b/examples/test_storage_query.rs
@@ -12,22 +12,29 @@ fn main() {
     };
 
     let storage = StreamingSegmentedStorage::new(config).expect("Failed to load storage");
-    
+
     let events = storage.query(0, u64::MAX).expect("Query failed");
-    
+
     println!("Total events in storage: {}", events.len());
-    
+
     if events.len() > 0 {
         println!("\nFirst 3 events:");
         for (i, event) in events.iter().take(3).enumerate() {
-            println!("Event {}: timestamp={}, subject={}, predicate={}, object={}, graph={}", 
-                i+1, event.timestamp, event.subject, event.predicate, event.object, event.graph);
+            println!(
+                "Event {}: timestamp={}, subject={}, predicate={}, object={}, graph={}",
+                i + 1,
+                event.timestamp,
+                event.subject,
+                event.predicate,
+                event.object,
+                event.graph
+            );
         }
-        
+
         let dict = storage.get_dictionary().read().unwrap();
         println!("\nDecoded first 3 events:");
         for (i, e) in events.iter().take(3).enumerate() {
-            println!("Event {}:", i+1);
+            println!("Event {}:", i + 1);
             println!("  subject: {:?}", dict.decode(e.subject));
             println!("  predicate: {:?}", dict.decode(e.predicate));
             println!("  object: {:?}", dict.decode(e.object));
diff --git a/examples/test_storage_with_dict.rs b/examples/test_storage_with_dict.rs
@@ -12,16 +12,16 @@ fn main() {
     };
 
     let storage = StreamingSegmentedStorage::new(config).expect("Failed to load storage");
-    
+
     let events = storage.query(0, u64::MAX).expect("Query failed");
-    
+
     println!("Total events in storage: {}", events.len());
-    
+
     if events.len() > 0 {
         let dict = storage.get_dictionary().read().unwrap();
         println!("\nDecoded first 5 events:");
         for (i, e) in events.iter().take(5).enumerate() {
-            println!("\nEvent {}:", i+1);
+            println!("\nEvent {}:", i + 1);
             println!("  timestamp: {}", e.timestamp);
             println!("  subject: {:?}", dict.decode(e.subject));
             println!("  predicate: {:?}", dict.decode(e.predicate));
diff --git a/scripts/.gitkeep b/scripts/.gitkeep
diff --git a/scripts/ci-check.sh b/scripts/ci-check.sh
@@ -4,6 +4,9 @@
 
 set -e  # Exit on any error
 
+# Ensure we are in the project root
+cd "$(dirname "$0")/.."
+
 echo "Running CI/CD checks locally..."
 echo ""
 
diff --git a/scripts/generate_historical_data.py b/scripts/generate_historical_data.py
diff --git a/scripts/generate_historical_graph.py b/scripts/generate_historical_graph.py
diff --git a/scripts/generate_realistic_data.py b/scripts/generate_realistic_data.py
diff --git a/scripts/start_http_server.sh b/scripts/start_http_server.sh
@@ -5,6 +5,9 @@
 
 set -e
 
+# Ensure we are in the project root
+cd "$(dirname "$0")/.."
+
 echo "╔════════════════════════════════════════════════════════════════╗"
 echo "║         Janus HTTP Server Startup Script                      ║"
 echo "╚════════════════════════════════════════════════════════════════╝"
diff --git a/scripts/test_live_streaming.sh b/scripts/test_live_streaming.sh
@@ -5,6 +5,9 @@
 
 set -e
 
+# Ensure we are in the project root
+cd "$(dirname "$0")/.."
+
 echo "╔════════════════════════════════════════════════════════════════╗"
 echo "║         Janus Live + Historical Streaming Test                ║"
 echo "╚════════════════════════════════════════════════════════════════╝"
@@ -252,7 +255,7 @@ echo ""
 echo -e "${GREEN}✓ All steps completed successfully${NC}"
 echo ""
 echo "To view the dashboard:"
-echo "  1. Start the server: ./start_http_server.sh"
+echo "  1. Start the server: ./scripts/start_http_server.sh"
 echo "  2. Open: examples/demo_dashboard.html in your browser"
 echo "  3. Click 'Start Replay' and wait 10 seconds"
 echo "  4. Click 'Start Query' to see results"
diff --git a/scripts/test_server.sh b/scripts/test_server.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+cd "$(dirname "$0")/.."
 cargo run --bin http_server &
 SERVER_PID=$!
 sleep 3
diff --git a/scripts/test_setup.sh b/scripts/test_setup.sh
@@ -4,6 +4,9 @@
 
 set -e
 
+# Ensure we are in the project root
+cd "$(dirname "$0")/.."
+
 echo "🔧 Janus HTTP API - Complete Setup Test"
 echo "========================================"
 echo ""
diff --git a/src/parsing/janusql_parser.rs b/src/parsing/janusql_parser.rs
