Feature:

replace or add collection data

Author: HeersGBV

app.py

@@ -115,16 +115,17 @@ def postCollectionData(coll_index):
     '''Upload new collection data. Recent data will be deleted.'''
     if coll_index > 0:
         if file := request.files.get('file'):
-            # Copy data to file, then call importer services receive and add
-            # logger.info(f'name = {file.filename} index = {index}')
+            add_mode = request.form.get('add_mode', 'false')
+            # Copy data to file, then call importer services receive and add/load
+            # logger.info(f'name = {file.filename} add-mode = {add_mode}')
             buffer_name = f'collection_{coll_index}{Path(file.filename).suffix}'
             file.save(f'./data/{buffer_name}')
 
             service_url = f'{IMPORTER_HOST}/collection/{coll_index}'
             res = requests.post(f'{service_url}/receive?from={buffer_name}')
             if res.ok:
-                res = requests.post(f'{service_url}/load')
-                # TODO res = requests.post(f'{service}/add') #Not supporte
+                cmd_str = 'add' if add_mode == 'true' else 'load'
+                res = requests.post(f'{service_url}/{cmd_str}')
             Path(f'./data/{buffer_name}').unlink(missing_ok=False)
             return res.text, res.status_code
     return jsonify(message='No data or collection index provided')

static/collections.js

@@ -50,11 +50,12 @@ function showProgess(on = false) {
 }
 
 /// Import TTL data into the KG
-function postCollectionData(index,file) {
+function postCollectionData(index,file,add_mode=false) {
     showProgess(true);
     var data = new FormData();
     data.append('file', file, file.filename);
     data.append('index', index);
+    data.append('add_mode', add_mode);
 
     var req = { method: 'POST', body: data, };
     fetch('/postCollectionData/'+index, req)
@@ -79,6 +80,7 @@ function makeAppData() {
                 displayCollection: null,
                 collectionInfo: 'No info.',
                 rdfFiles: [],
+                add_mode: false,
             }
         },
         delimiters: ["${", "}$"], // for global
@@ -173,7 +175,7 @@ function makeAppData() {
                 }
                 else {
                     const file0 = this.rdfFiles[0]
-                    postCollectionData(this.displayCollection.id, file0);
+                    postCollectionData(this.displayCollection.id, file0, this.add_mode);
                     this.rdfFiles = [];
                 }
             },

templates/collections.html

@@ -34,9 +34,13 @@ <h5 class="modal-title" id="uploadRDFLabel">Uploading RDF files</h5>
           <form novalidate @submit.prevent="uploadRDF">
             <div class="input-group mb-3">
               <input type="file" class="form-control" @change="saveRDFUrl" accept=".ttl,.nt,.xml,.n3,.zip" />&nbsp;
-              <input type="submit" class="btn btn-primary" data-bs-dismiss="modal" value="Open" />
+              <input type="submit" class="btn btn-primary" data-bs-dismiss="modal" value="Load" />
             </div>
           </form>
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" value="" id="id_add_mode" v-model="add_mode">
+            <label class="form-check-label" for="id_add_mode">add data</label>
+          </div>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal">Close</button>