Browse Source

Merge branch 'development' into migration_tool

Stefano Cossu 6 years ago
parent
commit
9574ad4ea5
4 changed files with 9 additions and 4 deletions
  1. 2 0
      doc/notes/TODO
  2. 1 1
      docker-compose.yml
  3. 1 2
      lakesuperior/api/resource.py
  4. 5 1
      lakesuperior/model/ldpr.py

+ 2 - 0
doc/notes/TODO

@@ -1,3 +1,5 @@
+## NOTE: after alpha 7 the TODO list has moved to Github issues. ##
+
 # Alpha 1
 
 - [D] Logging

+ 1 - 1
docker-compose.yml

@@ -5,7 +5,7 @@ volumes:
 
 services:
   lakesuperior:
-    build: .
+    image: scossu/lakesuperior:stable
     volumes:
       - lakesuperior:/data
     ports:

+ 1 - 2
lakesuperior/api/resource.py

@@ -210,13 +210,12 @@ def create_or_replace(uid, stream=None, **kwargs):
     @return string Event type: whether the resource was created or updated.
     '''
     rsrc = LdpFactory.from_provided(uid, stream=stream, **kwargs)
-    create = not rsrc.is_stored
 
     if not stream and rsrc.is_stored:
         raise InvalidResourceError(rsrc.uid,
                 'Resource {} already exists and no data set was provided.')
 
-    return rsrc.create_or_replace(create_only=create)
+    return rsrc.create_or_replace()
 
 
 @transaction(True)

+ 5 - 1
lakesuperior/model/ldpr.py

@@ -383,9 +383,13 @@ class Ldpr(metaclass=ABCMeta):
         if not create:
             rdfly.truncate_rsrc(self.uid)
 
+        remove_trp = {
+            (self.uri, nsc['fcrepo'].lastModified, None),
+            (self.uri, nsc['fcrepo'].lastModifiedBy, None),
+        }
         add_trp = set(self.provided_imr.graph) | self._containment_rel(create)
 
-        self._modify_rsrc(ev_type, add_trp=add_trp)
+        self._modify_rsrc(ev_type, remove_trp, add_trp)
         new_gr = Graph()
         for trp in add_trp:
             new_gr.add(trp)