Spalod tested

JJponciano · Feb 23, 2024 · 3cee3d7 · 3cee3d7
1 parent 49513d6
commit 3cee3d7
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 334 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/django/spalod/geotime/__init__.py b/django/spalod/geotime/__init__.py
diff --git a/django/spalod/geotime/admin.py b/django/spalod/geotime/admin.py
diff --git a/django/spalod/geotime/apps.py b/django/spalod/geotime/apps.py
diff --git a/django/spalod/geotime/migrations/0001_initial.py b/django/spalod/geotime/migrations/0001_initial.py
diff --git a/django/spalod/geotime/migrations/0002_profile_delete_user.py b/django/spalod/geotime/migrations/0002_profile_delete_user.py
diff --git a/django/spalod/geotime/migrations/__init__.py b/django/spalod/geotime/migrations/__init__.py
diff --git a/django/spalod/geotime/models.py b/django/spalod/geotime/models.py
diff --git a/django/spalod/geotime/tests.py b/django/spalod/geotime/tests.py
diff --git a/django/spalod/geotime/urls.py b/django/spalod/geotime/urls.py
diff --git a/django/spalod/geotime/views.py b/django/spalod/geotime/views.py
diff --git a/django/spalod/manage.py b/django/spalod/manage.py
diff --git a/django/spalod/spalod/__init__.py b/django/spalod/spalod/__init__.py
diff --git a/django/spalod/spalod/asgi.py b/django/spalod/spalod/asgi.py
diff --git a/django/spalod/spalod/settings.py b/django/spalod/spalod/settings.py
diff --git a/django/spalod/spalod/urls.py b/django/spalod/spalod/urls.py
diff --git a/django/spalod/spalod/wsgi.py b/django/spalod/spalod/wsgi.py
diff --git a/src/main/java/info/ponciano/lab/spalodwfs/model/Triplestore.java b/src/main/java/info/ponciano/lab/spalodwfs/model/Triplestore.java
@@ -3,7 +3,11 @@
 import java.io.File;
 import java.util.*;
 import java.net.URI;
-
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
 import org.apache.jena.query.*;
 import org.apache.jena.rdf.model.*;
 import org.apache.jena.sparql.exec.http.QueryExecutionHTTP;
@@ -90,7 +94,8 @@ public String executeSelectQuery(String queryString) {
 
     public static String executeSelectQuery(String sparqlQuery, String triplestore) {
         if(!sparqlQuery.contains("PREFIX schema:"))
-        sparqlQuery = KB.PREFIX + sparqlQuery;
+            sparqlQuery = KB.PREFIX + sparqlQuery;
+        System.out.println(sparqlQuery);
         Query query = QueryFactory.create(sparqlQuery);
         // if (triplestore == GRAPHDB_QUERY_ENDPOINT) {
             ParameterizedSparqlString queryCommand = new ParameterizedSparqlString();
@@ -213,25 +218,36 @@ public static void main(String[] args) {
     }
 
     public static void executeUpdateQuery(String query, String graphdbUpdateEndpoint) {
-        boolean inprocess = true;
-        while (inprocess) {
-            try {
-                UpdateRequest insertRequest = UpdateFactory.create(query);
-                UpdateProcessor insertProcessor = UpdateExecutionFactory.createRemoteForm(insertRequest,
-                        graphdbUpdateEndpoint);
-                insertProcessor.execute();
-                Thread.sleep(100);
-                inprocess = false;
-            } catch (Exception e) {
-                if (!e.getMessage().equals("Currently in an active transaction")) {
-                    inprocess = false;
-                    System.err.println(":::::::::::::::::ERROR:::::::::::::::::");
-                    System.err.println(query);
-                    System.err.println("----------");
-                    System.err.println(e.getMessage());
-                    System.err.println(":::::::::::::::::END ERROR:::::::::::::::::");
-                }
+        try {
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(graphdbUpdateEndpoint))
+                .header("Content-Type", "application/sparql-update")
+                .POST(BodyPublishers.ofString(query))
+                .build();
+
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+        System.out.println("Response status code: " + response.statusCode());
+        System.out.println("Response body: " + response.body());
+        // boolean inprocess = true;
+        // while (inprocess) {
+        //     try {
+        //         UpdateRequest insertRequest = UpdateFactory.create(query);
+        //         UpdateProcessor insertProcessor = UpdateExecutionFactory.createRemoteForm(insertRequest,
+        //                 graphdbUpdateEndpoint);
+        //         insertProcessor.execute();
+        //         Thread.sleep(100);
+        //         inprocess = false;
+        } catch (Exception e) {
+            if (!e.getMessage().equals("Currently in an active transaction")) {
+                System.err.println(":::::::::::::::::ERROR:::::::::::::::::");
+                System.err.println(query);
+                System.err.println("----------");
+                System.err.println(e.getMessage());
+                System.err.println(":::::::::::::::::END ERROR:::::::::::::::::");
             }
         }
+        // }
     }
 }
diff --git a/src/main/vue_js/spalod/.env b/src/main/vue_js/spalod/.env
@@ -1 +1,2 @@
 VITE_APP_API_BASE_URL=https://localhost:8081
+VITE_APP_GRAPH_DB=https://localhost:7200
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		VITE_APP_API_BASE_URL=https://localhost:8081
		VITE_APP_GRAPH_DB=https://localhost:7200