pages/page.py

@@ -54,25 +54,17 @@ class meta_data(dict):
     def history_filename(self, history_version):
         return os.path.join(self._path, HISTORY_FOLDER_NAME, "%05d_%s" % (history_version, self.META_FILE_NAME))
 
-    def update_required(self, tags):
-        return tags != self.get(self.KEY_TAGS)
-
     def update(self, username, tags):
-        if self._history_version:
-            logger.error("A history version %05d can not be updated!", self._history_version)
-            return False
-        else:
-            if username:
-                self[self.KEY_MODIFIED_TIME] = int(time.time())
-                self[self.KEY_MODIFIED_USER] = username
-                if self.KEY_CREATION_TIME not in self:
-                    self[self.KEY_CREATION_TIME] = self[self.KEY_MODIFIED_TIME]
-            if tags:
-                self[self.KEY_TAGS] = tags
-            #
-            if username or tags:
-                self.save()
-            return True
+        if username:
+            self[self.KEY_MODIFIED_TIME] = int(time.time())
+            self[self.KEY_MODIFIED_USER] = username
+            if self.KEY_CREATION_TIME not in self:
+                self[self.KEY_CREATION_TIME] = self[self.KEY_MODIFIED_TIME]
+        if tags:
+            self[self.KEY_TAGS] = tags
+        #
+        if username or tags:
+            self.save()
 
     def save(self):
         if self._history_version:
@@ -137,7 +129,7 @@ class page_data(object):
     def is_available(self):
         is_a = os.path.isfile(self.filename)
         if not is_a:
-            logger.debug("page.is_available: Not available - %s", self.filename)
+            logger.info("page.is_available: Not available - %s", self.filename)
         return is_a
 
     @property
@@ -429,23 +421,21 @@ class page_wrapped(object):
         return rv
 
     def update_page(self, txt, tags):
-        if self._page.update_required(txt) or self._page_meta.update_required(tags):
-            rv = False
+        if self._page.update_required(txt):
             # Store history
             self.__store_history__()
+            # Update page
+            rv = self._page.update_page(txt)
+            # Update meta data
             username = None
-            if self._page.update_required(txt):
-                # Update page
-                rv |= self._page.update_page(txt)
-                # Identify username, to update meta
-                try:
-                    if self._request.user.is_authenticated:
-                        username = self._request.user.username
-                    else:
-                        logger.warning("Page edit without having a logged in user. This is not recommended. Check your access definitions!")
-                except AttributeError:
-                    logger.exception("Page edit without having a request object. Check programming!")
-            rv |= self._page_meta.update(username, tags)
+            try:
+                if self._request.user.is_authenticated:
+                    username = self._request.user.username
+                else:
+                    logger.warning("Page edit without having a logged in user. This is not recommended. Check your access definitions!")
+            except AttributeError:
+                logger.exception("Page edit without having a request object. Check programming!")
+            self._page_meta.update(username, tags)
             # Update search index
             from pages.search import update_item
             update_item(self)

pages/search.py

@@ -72,7 +72,7 @@ def add_item(ix, pw: page_wrapped):
     )
     with ix.writer() as w:
         logger.info('Adding document with id=%s to the search index.', data.get('id'))
-        w.update_document(**data)
+        w.add_document(**data)
         for key in data:
             logger.debug('  - Adding %s=%s', key, repr(data[key]))