merge

controllers/catalog.py

@@ -245,7 +245,10 @@ def index():
 
     ignored_submission_id = myconf.take('omp.ignore_submissions') if myconf.take(
         'omp.ignore_submissions') else -1
-
+    try:
+        current_page = int(request.vars.get('page_nr', 1)) - 1
+    except ValueError as e:
+        raise HTTP(400, "Error with value of page_nr: " + str(e)) from e
     submissions = []
     session.filters = request.vars.get('filter_by').strip('[').strip(']') if request.vars.get(
             'filter_by') else session.get('filters', '')
@@ -259,7 +262,6 @@ def index():
     else:
         session.sort_by = 'datePublished-2'
     '''
-    current_page = int(request.vars.get('page_nr', 1)) - 1
     page_begin = current_page * session.per_page
     page_end = (current_page+1) * session.per_page
 

controllers/publishing.py

@@ -23,3 +23,8 @@ def peer_review():
 def conflict_interest():
     return dict()
 
+def export():
+    return dict()
+
+def vgwort():
+    return dict()

controllers/reader.py

@@ -12,6 +12,7 @@
 import ompformat
 from os.path import exists
 import gluon
+import heiviewer
 
 locale = 'en_US' if session.forced_language == 'en' else 'de_DE'
 
@@ -34,9 +35,9 @@ def index():
         raise HTTP(404)
     submission_id = request.args[0]
     file_id = request.args[1]
-
+    press_id = myconf.take('omp.press_id')
     if str(file_id).endswith('.xml'):
-        path = os.path.join(request.folder, 'static/files/presses', myconf.take('omp.press_id'), 'monographs',
+        path = os.path.join(request.folder, 'static/files/presses', press_id, 'monographs',
                             submission_id, 'submission/proof', file_id)
         if os.path.exists(path) is False:
             raise HTTP(404)
@@ -60,11 +61,22 @@ def index():
 
         return dict(json_list=XML(gluon.serializers.json(json_list)), authors=authors_string, font_family=font_family)
     else:
-        path = os.path.join(request.folder, 'static/files/presses', myconf.take('omp.press_id'), 'monographs',
+        path = os.path.join(request.folder, 'static/files/presses', press_id, 'monographs',
                             submission_id, 'submission/', file_id)
-        return response.stream(path, chunk_size=1048576)
-
-
+        if os.path.exists(path):
+            return response.stream(path, chunk_size=1048576)
+        else:
+            if len(request.args) < 3 :
+                raise HTTP(404)
+
+            publication_format_id = file_id
+            file_id = request.args[2]
+            response.view = '../static/omp-resources/views/reader/heiviewer.html'
+            heiviewer_chapter_id = None
+            if len(request.args) > 3:
+                heiviewer_chapter_id = request.args[3]
+            return heiviewer.prepare_heiviewer(press_id, submission_id, publication_format_id, file_id, ompdal, locale,
+                                               settings, chapter_id=heiviewer_chapter_id)
 
 def get_setting_value(settings, name):
     val = []

controllers/search.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from ompdal import OMPDAL, OMPSettings, OMPItem
+import ompindex
 
 ompdal = OMPDAL(db, myconf)
 press = ompdal.getPress(myconf.take('omp.press_id'))
@@ -14,31 +15,6 @@ def index():
 
 
 def authors():
-    searchInitial = request.vars.searchInitial.upper() if request.vars.searchInitial else None
-    authors = []
-    initials = set()
-    author_index = []
-    prev_author, prev_index = '',''
-    prev = 1
-
-    for a in ompdal.getAuthorsByPress(press.press_id):
-        last_name = a['last_name']
-        first_name = a['first_name']
-        initial = last_name[:1].upper()
-        if initial != prev_index:
-            a['initial'] = initial
-        this_author = '{}{}'.format(last_name, first_name)
-        prev = prev + 1 if prev_author == this_author else 1
-        a['index'] = prev
-        if searchInitial and last_name.upper().startswith(searchInitial):
-            authors.append(a)
-        elif not searchInitial:
-            authors.append(a)
-        if initial not in initials:
-            author_index.append(initial)
-            initials.add(initial)
-
-        prev_author = this_author
-        prev_index = initial
-
-    return locals()
+    search_initial = request.vars.searchInitial.upper() if request.vars.searchInitial else None
+    rows = ompdal.getAuthorsByPress(press.press_id)
+    return ompindex.author_names(search_initial, rows)

languages/de.py

@@ -197,6 +197,7 @@
 'Errors': 'Fehlermeldungen',
 'Erstverkaufstag': 'Erstverkaufstag',
 'export as csv file': 'als csv Datei exportieren',
+'Export control of publications': 'Exportkontrolle bei Publikationen',
 'FAQ': 'FAQ',
 'Farbraum': 'Farbraum',
 'February': 'Februar',

models/z_menu.py

@@ -45,7 +45,9 @@ def title(t):
                    ['peer_review', T('Peer Review')],
                    ['rights_and_licences', T('Rights and Licences')],
                    ['plagiarism', T('Plagiarism')],
-                   ['data_privacy', T('Data Privacy')]
+                   ['data_privacy', T('Data Privacy')],
+                   ['export', T('Export control of publications')],
+                   ['vgwort', T('VG Wort')]
                    ]
 
 publishing_dict_list = [LI(A(i[1], _href=URL('publishing', i[0])))

static/css/lens.css

@@ -1819,3 +1819,10 @@ body[data-submission-id="862"] {
 body[data-submission-id="900"] {
   font-family: Junicode;
 }
+
+/** Hinzugefügt am 5.12.2022 von nw für die Veröffentlichung mit ID 545:
+ * Siehe https://gitlab.ub.uni-heidelberg.de/wit/verlag-portale/-/issues/423#note_37390
+ */
+body[data-submission-id="545"] {
+  font-family: Junicode;
+}

static/utils/imagesJATSXMLBySubmission.py

@@ -1,16 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-'''
-@author: wit
+"""
+@author: Dulip Withanage
 python /home/wit/software/web2py/web2py.py -R  /home/wit/software/web2py/applications/UBHD_OMPPortal/static/utils/imagesJATSXMLBySubmission.py   --shell UBHD_OMPPortal  -M
-'''
-import sys
+"""
+
 import os
-import pwd
-import grp
 
-from xlrd import open_workbook
-from gluon import DAL
 from ompdal import OMPDAL
 
 
@@ -43,7 +39,7 @@ def main():
                                            ]
                         file_name = '-'.join([str(i) for i in file_name_items]) + '.' + file_type
                         if os.path.isfile(file_path+file_name):
-                            xml_file.write('<fig-group><fig id="fig_{}_{}" position="float"><label> {} </label><graphic xlink:href="{}"/></fig></fig-group>\n'.format(f.submission_id, f.file_id,f.original_file_name, file_name))
+                            xml_file.write('<fig-group><fig id="fig_{}_{}" position="float"><label> {} </label><caption><p>CAPTION</p></caption><graphic xlink:href="{}"/></fig></fig-group>\n'.format(f.submission_id, f.file_id,f.original_file_name, file_name))
 
             xml_file.write('</all-images>\n')
             xml_file.close()

static/utils/vgwortInsertBySubmission.py

@@ -28,6 +28,8 @@ def insert_sfs(name, file_id, value):
             setting_type='',
             locale='')
         db.commit()
+    else:
+        print(name, "already inserted", value, "for file_id", file_id)
     return
 
 

views/about_us/advisory_board.html

@@ -42,18 +42,6 @@ <h3>  {{if session.forced_language =='de': }}
       </div>
     </div> 
 
-    <div class="media" style="margin-bottom: 1em">
-            <div class="media-left pull-left">
-              <img src="../static/images/about_us/board/cerwenka.jpg" class="pull-left media-object beiratPortrait" alt="" />
-      </div>        
-      <div class="media-body">
-        <p class="media-heading"><strong>Adelheid Cerwenka</strong></p>
-          <p class="beiratBeschreibung">
-                Professorin am Centrum für Biomedizin und Medizintechnik Mannheim 
-              <a href="https://www.umm.uni-heidelberg.de/forschung/forschungsschwerpunkte/onkologie/mitglieder/adelheid-cerwenka/" target="_self">&nbsp;<i class="fa fa-external-link"></i></a>
-          </p>
-      </div>
-    </div>
 
     <div class="media" style="margin-bottom: 1em">
             <div class="media-left pull-left">
@@ -200,19 +188,6 @@ <h3>  {{if session.forced_language =='de': }}
       </div>
     </div> 
 
-    <div class="media" style="margin-bottom: 1em">
-            <div class="media-left pull-left">
-              <img src="../static/images/about_us/board/cerwenka.jpg" class="pull-left media-object beiratPortrait" alt="" />
-      </div>        
-      <div class="media-body">
-        <p class="media-heading"><strong>Adelheid Cerwenka</strong></p>
-          <p class="beiratBeschreibung">
-                Professor at the Centre for Biomedicine and Medical Technology Mannheim (CBMT) 
-              <a href="https://www.umm.uni-heidelberg.de/forschung/forschungsschwerpunkte/onkologie/mitglieder/adelheid-cerwenka/" target="_self">&nbsp;<i class="fa fa-external-link"></i></a>
-          </p>
-      </div>
-    </div>
-
     <div class="media" style="margin-bottom: 1em">
             <div class="media-left pull-left">
             <img src="../static/images/about_us/board/felder.jpg" class="pull-left media-object beiratPortrait" alt="" />

views/about_us/partners.html

@@ -37,10 +37,10 @@ <h3>  {{ if session.forced_language =='de': }}
           <p class="media-heading"><a href="https://blog.bibliothek.kit.edu/ag_univerlage/" target="_self"><strong>AG Universitätsverlage</strong>&nbsp;<i class="fa fa-external-link"></i></a> </p>
           {{ if session.forced_language =='de': }}
 
-          <p class="beiratBeschreibung">Die Arbeitsgemeinschaft der Universitätsverlage verbindet seit 2004 zahlreiche Verlage aus Deutschland, Österreich und Italien. Ziel der Arbeitsgemeinschaft ist es, die Verlage bei der Vertretung ihrer Interessen nach außen zu unterstützen und den Erfahrungsaustausch zu fördern.
+          <p class="beiratBeschreibung">Heidelberg University Publishing (heiUP) ist Mitglied der Arbeitsgemeinschaft der Universitätsverlage (AG Universitätsverlage). Die Arbeitsgemeinschaft ist ein Zusammenschluss aus Verlagen, Publikationsdiensten und -plattformen aus dem deutschsprachigen Raum, die verlegerische Dienstleistungen anbieten und eine ausgewiesene Anbindung an eine Forschungseinrichtung haben. Die <a href="https://ag-univerlage.de/?page_id=2192" title="AG Universitätsverlage, Kriterien für eine Mitgliedschaft">Kriterien für eine Mitgliedschaft</a> in der Arbeitsgemeinschaft umfassen insbesondere die Unterstützung von Open Access und die Qualitätssicherung gemäß wissenschaftlichen Standards.
           </p>
           {{elif session.forced_language =='en': }}
-          <p class="beiratBeschreibung">Since 2004 the Arbeitsgemeinschaft der Universitätsverlage (University Publisher Working Group) has been bringing together many university publishing houses based in Germany, Austria and Italy. Their aim is to support publishers' interests and to promote exchange of experience.
+          <p class="beiratBeschreibung">Heidelberg University Publishing (heiUP) is a member of Arbeitsgemeinschaft Universitätsverlage (AG Universitätsverlage). The working group is an association of university presses, publishing services and platforms, which are connected to an academic institution and offer professional publishing services, in German speaking countries. The <a href="https://ag-univerlage.de/?page_id=2192" title="Homepage AG Universitätsverlage, membership criteria">membership criteria</a> include especially quality assurance according to scientific standards and the support of Open Access.
           </p>
 
 

views/about_us/profile.html

@@ -33,9 +33,9 @@ <h3>  {{if session.forced_language =='de': }}
         <article>
         <div class="box">
 	           <div class="box-gray" style="height: auto;">
-             <h5>{{=T('Programme')}} 2021-22 / {{=T('Flyer')}}</h5>
+             <h5>{{=T('Programme')}} 2022-23 / {{=T('Flyer')}}</h5>
                {{=IMG(_src=URL(myconf.take('web.application'),'static','/images/about_us/profile/cover_programm_flyer.png'),_alt='',_style='width:250px')}}<br /><br />
-               <a class="btn btn-default btn-xs" href="/static/medien/heiUP_Programmheft2021-22.pdf" role="button" title="Download heiUP Programm 2021">Download {{=T('Programme')}}</a><br />
+               <a class="btn btn-default btn-xs" href="/static/medien/Programm_heiUP_2022-23.pdf" role="button" title="Download heiUP Programm 2022-23">Download {{=T('Programme')}}</a><br />
                <a class="btn btn-default btn-xs" href="/static/medien/heiUP_Flyer.pdf" role="button" title="Download heiUP Flyer">Download Flyer</a>
 
              </div>
@@ -44,4 +44,4 @@ <h5>{{=T('Programme')}} 2021-22 / {{=T('Flyer')}}</h5>
     </div>
   </div>
 </div>
-</div>
+</div>

views/campusmedia/index.html

@@ -100,7 +100,7 @@ <h5 class="widgetheading"></h5>
       <div class="col-lg-2">
         <article>
           <div class="post-image">
-            <img alt="" src="{{=URL(myconf.take('web.application'),'static','images/campusmedia/cover_02_2022.jpg')}}">
+            <img alt="" src="{{=URL(myconf.take('web.application'),'static','images/campusmedia/cover_02_2023.jpg')}}">
           </div>
         </article>
       </div>