oaiserver: fix set creation

docs/conf.py

@@ -60,6 +60,10 @@
 copyright = u'2018, RERO'
 author = u'RERO'
 
+# RERO Services
+RERO_SERVICE_ILS = 'https://bib.rero.ch'
+RERO_SERVICE_SONAR = 'https://sonar.rero.ch'
+
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.

pyproject.toml

@@ -23,12 +23,13 @@ python = ">= 3.9, <3.10"
 #------------------------------------------------------------------------------
 # Default from Invenio
 lxml = ">=4.9.1"
-marshmallow = ">=3.0.0,<4.0.0"
 uwsgi = ">=2.0"
 uwsgi-tools = ">=1.1.1"
 uwsgitop = ">=0.11"
 
 ## Third party invenio modules used by RERO EBOOKS
+# TODO: needed for `parameter from` fix.
+invenio-oaiserver = { git = "https://github.com/rerowep/invenio-oaiserver.git", branch = "wep-fix-from" }
 invenio-oaiharvester = { git = "https://github.com/inveniosoftware/invenio-oaiharvester.git", tag = "v1.0.0a4" }
 invenio-search = {version = ">=2.1.0,<3.0.0", extras = ["elasticsearch7"]}
 
@@ -57,7 +58,7 @@ invenio-userprofiles = ">=2.2.0,<2.3.0"
 # Invenio metadata bundle
 invenio-indexer = ">=2.1.0,<2.2.0"
 invenio-jsonschemas = ">=1.1.4,<1.2.0"
-invenio-oaiserver = ">=2.2.0,<2.3.0"
+# invenio-oaiserver = ">=2.2.0,<2.3.0"
 invenio-pidstore = ">=1.3.0,<1.4.0"
 invenio-records-rest = ">=2.2.0,<2.3.0"
 invenio-records-ui = ">=1.2.0,<1.3.0"
@@ -82,7 +83,7 @@ pydocstyle = ">=6.1.1"
 ## RERO ILS specific python modules
 poethepoet = "*"
 # rero-invenio-base = ">=0.2.0"
-werkzeug = "<2.3.0"
+# werkzeug = "<2.3.0"
 
 [tool.poetry.dev-dependencies]
 ## Python packages development dependencies (order matters)

rero_ebooks/apiharvester/utils.py

@@ -37,14 +37,19 @@ def add_set(spec, name, pattern, description='...'):
     :param description: human readable description
     """
     try:
-        oaiset = OAISet(spec=spec, name=name, description=description)
+        oaiset = OAISet(
+            spec=spec,
+            name=name,
+            description=description,
+            system_created=False
+        )
         oaiset.search_pattern = pattern
         db.session.add(oaiset)
         db.session.commit()
         msg = f'OAIset added: {name}'
     except Exception as err:
         db.session.rollback()
-        msg = f'OAIset exist: {name}'
+        msg = f'OAIset exist: {name} {err}'
     return msg
 
 

rero_ebooks/theme/assets/scss/rero_ebooks/ebooks.scss

@@ -13,7 +13,8 @@ footer {
 }
 
 #header-logo {
-    margin-top: 14px;
+    margin-top: 6px;
+    height: 46px;
 }
 
 .ebooks-list {
@@ -44,7 +45,29 @@ footer {
     display: inline-block;
 }
 
-.service img {
-    height: 44px;
-    margin: 4px;
+.service-container {
+    display: flex;
+    flex-direction: row;
 }
+
+.service-container .service {
+    background-color: #204b73;
+    height: 60px;
+    width: 200px;
+    padding: 5px 20px;
+    margin-top: 4px;
+    margin-right: 6px;
+    border-radius: 5px;
+    text-align: center;
+}
+
+.service-container .service img {
+    max-height: 50px;
+    margin: auto;
+    display: block;
+}
+
+.service-container .service .img-sonar {
+    height: 80%;
+    margin-top: 0.4em;
+}

rero_ebooks/theme/templates/rero_ebooks/frontpage.html

@@ -15,21 +15,18 @@ <h1>ebooks</h1>
   <div class="row margin-top-large">
     <div class="col-md-8">
       <h3 class="margin-top-extra-large">Other RERO products</h3>
-      <a href="https://ils.test.rero.ch" target="_blank">
-        <div class="service">
-          <img src="{{ url_for('static', filename='images/logo_rero_ils.png')}}" alt="RERO ILS" />
-        </div>
-      </a>
-      <a href="https://explore.rero.ch" target="_blank">
-        <div class="service">
-          <img src="{{ url_for('static', filename='images/logo_explore.png')}}" alt="RERO Explore" />
-        </div>
-      </a>
-      <a href="https://doc.rero.ch" target="_blank">
-        <div class="service">
-          <img src="{{ url_for('static', filename='images/logo_rerodoc.png')}}" alt="RERO Doc" />
-        </div>
-      </a>
+      <div class="service-container">
+        <a href="{{ config.RERO_SERVICE_ILS }}" target="_blank">
+          <div class="service">
+            <img src="{{ url_for('static', filename='images/logo_rero_plus.svg')}}" alt="RERO BIB" />
+          </div>
+        </a>
+        <a href="{{ config.RERO_SERVICE_SONAR }}" target="_blank">
+          <div class="service">
+            <img class="img-sonar" src="{{ url_for('static', filename='images/logo_sonar.svg')}}" alt="RERO SONAR" />
+          </div>
+        </a>
+      </div>
     </div>
     <div class="col-md-4">
       <h4 class="margin-top-remove">Links</h4>

rero_ebooks/theme/templates/rero_ebooks/header.html

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="row">
       <div class="col-md-12">
-        <img id="header-logo" src="{{ url_for('static', filename='images/logo_rero.png')}}" alt="RERO EBOOKS" />
+        <img id="header-logo" src="{{ url_for('static', filename='images/logo_rero_plus.svg')}}" alt="RERO EBOOKS" />
       </div>
     </div>
   </div>