Merge pull request inveniosoftware#2 from nharraud/clean-invenio-modi…

…fications Port invenio modifications
nharraud · Aug 19, 2015 · 9dbcdac · 9dbcdac
2 parents 6beaf13 + a839a61
commit 9dbcdac
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 327 deletions.
diff --git a/invenio/base/config.py b/invenio/base/config.py
@@ -58,7 +58,6 @@
 ]
 
 PACKAGES = [
-    # 'b2share.modules.*',
     'invenio.modules.*',
     'invenio.base',
 ]
@@ -70,27 +69,12 @@
     'invenio.modules.linkbacks',
     'invenio.modules.multimedia',
     'invenio.modules.pages',
-    'invenio.modules.deposit',
 ]
 
 LEGACY_WEBINTERFACE_EXCLUDE = [
     'invenio.legacy.websubmit',
 ]
 
-# from invenio.modules.oauthclient.contrib import github
-from invenio.modules.oauthclient.contrib import unity
-
-OAUTHCLIENT_REMOTE_APPS = dict(
-    # github=github.REMOTE_APP,
-    unity=unity.REMOTE_APP,
-)
-
-UNITY_APP_CREDENTIALS = dict(
-    # will only work on development configurations
-    consumer_key= "b2share",
-    consumer_secret= "b2share8juelich",
-)
-
 CFG_PREFIX = distutils.sysconfig.get_config_var("prefix")
 
 CFG_BATCHUPLOADER_DAEMON_DIR = join(CFG_PREFIX, "var", "batchupload")

diff --git a/invenio/base/static/favicon.ico b/invenio/base/static/favicon.ico
diff --git a/invenio/modules/formatter/format_elements/bfe_abstract.py b/invenio/modules/formatter/format_elements/bfe_abstract.py
@@ -62,12 +62,10 @@ def format_element(bfo, prefix_en, prefix_fr, suffix_en, suffix_fr, limit, max_c
 
     abstract_en = bfo.fields('520__a', escape=escape_mode_int)
     abstract_en.extend(bfo.fields('520__b', escape=escape_mode_int))
-    abstract_en = [line for abstract in abstract_en for line in abstract.split("\n") if line]
     abstract_en = separator_en.join(abstract_en)
 
     abstract_fr = bfo.fields('590__a', escape=escape_mode_int)
     abstract_fr.extend(bfo.fields('590__b', escape=escape_mode_int))
-    abstract_fr = [line for abstract in abstract_fr for line in abstract.split("\n") if line]
     abstract_fr = separator_fr.join(abstract_fr)
 
     if contextual == 'yes' and limit != "" and \
@@ -111,15 +109,15 @@ def format_element(bfo, prefix_en, prefix_fr, suffix_en, suffix_fr, limit, max_c
             out = '. '.join(s_abstract)
 
             # Add final dot if needed
-            if abstract_en.endswith('.') and not out.endswith('.'):
+            if abstract_en.endswith('.'):
                 out += '.'
 
+            if print_extension:
+                out += " " + extension_en
+
         else:
             out += abstract_en
 
-        if print_extension:
-            out += " " + extension_en
-
         out += suffix_en
 
     if len(abstract_fr) > 0 and 'fr' in languages:
@@ -148,15 +146,15 @@ def format_element(bfo, prefix_en, prefix_fr, suffix_en, suffix_fr, limit, max_c
             out += '. '.join(s_abstract)
 
             # Add final dot if needed
-            if abstract_fr.endswith('.') and not out.endswith('.'):
+            if abstract_fr.endswith('.'):
                 out += '.'
 
+            if print_extension:
+                out += " "+extension_fr
+
         else:
             out += abstract_fr
 
-        if print_extension:
-            out += " "+extension_fr
-
         out += suffix_fr
 
     if highlight == 'yes':

diff --git a/invenio/modules/formatter/format_elements/bfe_fulltext.py b/invenio/modules/formatter/format_elements/bfe_fulltext.py
@@ -177,8 +177,8 @@ def format_element(bfo, style, separator='; ', show_icons='no', focus_on_main_fi
         out += separator.join(url_list)
 
     if others_urls:
-        # external_link = len(others_urls) == 1 and _('external link') or _('external links')
-        # out += '<strong>%s</strong>: ' % external_link.capitalize()
+        external_link = len(others_urls) == 1 and _('external link') or _('external links')
+        out += '<strong>%s</strong>: ' % external_link.capitalize()
         url_list = []
         for url, descr in others_urls:
             url_list.append('<a '+style+' href="'+escape(url)+'">'+ \
@@ -289,7 +289,7 @@ def get_files(bfo, distinguish_main_and_additional_files=True, include_subformat
                 ## This format should be hidden.
                 continue
 
-            descr = filename
+            descr = _("Fulltext")
             if 'y' in complete_url:
                 descr = complete_url['y']
                 if descr == 'Fulltext':

diff --git a/invenio/modules/formatter/format_elements/bfe_metadata.py b/invenio/modules/formatter/format_elements/bfe_metadata.py
diff --git a/invenio/modules/formatter/format_templates/DC.xsl b/invenio/modules/formatter/format_templates/DC.xsl
@@ -57,12 +57,6 @@ exclude-result-prefixes="marc fn">
         </xsl:if>
     </xsl:template>
     <xsl:template match="record">
-      <!-- PID as Identifier -->
-      <xsl:if test="datafield[@tag=024 and @ind1=7 and subfield[@code='2']='PID']">
-        <xsl:for-each select="datafield[@tag=024 and @ind1=7 and subfield[@code='2']='PID']">
-          <dc:identifier><xsl:value-of select="subfield[@code='a']"/></dc:identifier>
-        </xsl:for-each>
-      </xsl:if>
       <!-- DOI -->
       <xsl:if test="datafield[@tag=024 and @ind1=7 and (subfield[@code='2']='doi' or subfield[@code='2']='DOI')]">
 	<xsl:for-each select="datafield[@tag=024 and @ind1=7 and (subfield[@code='2']='doi' or subfield[@code='2']='DOI')]">
@@ -75,11 +69,6 @@ exclude-result-prefixes="marc fn">
                 <xsl:value-of select="subfield[@code='a']"/>
             </dc:language>
         </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=546]">
-            <dc:language>
-                <xsl:value-of select="subfield[@code='a']"/>
-            </dc:language>
-        </xsl:for-each>
 	<!-- Author/Creator -->
         <xsl:for-each select="datafield[@tag=100]">
             <dc:creator>
@@ -120,26 +109,6 @@ exclude-result-prefixes="marc fn">
                 <xsl:value-of select="subfield[@code='a']"/>
             </dc:subject>
         </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=653 and @ind1=1]">
-            <dc:subject>
-                <xsl:value-of select="subfield[@code='a']"/>
-            </dc:subject>
-        </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=526]">
-            <dc:subject>
-                <xsl:value-of select="subfield[@code='a']"/>
-            </dc:subject>
-        </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=540]">
-            <dc:rights>
-                <xsl:value-of select="subfield[@code='a']"/>
-            </dc:rights>
-        </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=542]">
-            <dc:rights>
-                <xsl:value-of select="subfield[@code='l']"/>
-            </dc:rights>
-        </xsl:for-each>
 	<!-- Main report number-->
 	<xsl:for-each select="datafield[@tag=037]">
           <dc:identifier><xsl:value-of select="subfield[@code='a']"/></dc:identifier>
@@ -181,7 +150,7 @@ exclude-result-prefixes="marc fn">
                 <xsl:value-of select="fn:eval_bibformat(controlfield[@tag=001],'&lt;BFE_SERVER_INFO var=&quot;absoluterecurl&quot; >')" />
             </dc:source>
         <xsl:for-each select="datafield[@tag=024 and @ind1=7]">
-            <xsl:if test="subfield[@code='2']='doi' or subfield[@code='2']='DOI'">
+            <xsl:if test="subfield[@code='2']">
                 <dc:doi>
                     <xsl:value-of select="subfield[@code='a']"/>
                 </dc:doi>

diff --git a/invenio/modules/formatter/format_templates/Default_HTML_actions.bft b/invenio/modules/formatter/format_templates/Default_HTML_actions.bft
@@ -1,26 +1,19 @@
 <name>Actions HTML detailed</name>
 <description>Output the various actions available on a record</description>
 
-<div class="well">
-<h4>Export</h4>
-<ul class="detailedrecordactions list-unstyled">
-        <!--li><a href="/yourbaskets/add?ln=<BFE_CLIENT_INFO var='ln'/>&amp;recid=<BFE_RECORD_ID/>">_(Add to personal basket)_</a></li-->
+<ul class="detailedrecordactions">
+        <li><a href="<BFE_SERVER_INFO var='CFG_BASE_URL'/>yourbaskets/add?ln=<BFE_CLIENT_INFO var='ln'/>&amp;recid=<BFE_RECORD_ID/>">_(Add to personal basket)_</a></li>
         <li>_(Export as)_
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/hx?ln=<BFE_CLIENT_INFO var='ln'/>">BibTeX</a>,
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/hm?ln=<BFE_CLIENT_INFO var='ln'/>">MARC</a>,
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xm?ln=<BFE_CLIENT_INFO var='ln'/>">MARCXML</a>,
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xd?ln=<BFE_CLIENT_INFO var='ln'/>">DC</a>,
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xe?ln=<BFE_CLIENT_INFO var='ln'/>">EndNote</a>,
-            <!--<a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xe8x?ln=<BFE_CLIENT_INFO var='ln'/>">EndNote (8-X)</a>,-->
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xn?ln=<BFE_CLIENT_INFO var='ln'/>">NLM</a>,
-            <a style="text-decoration:underline;font-weight:normal" href="/<BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xw?ln=<BFE_CLIENT_INFO var='ln'/>">RefWorks</a></li>
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/hx?ln=<BFE_CLIENT_INFO var='ln'/>">BibTeX</a>,
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/hm?ln=<BFE_CLIENT_INFO var='ln'/>">MARC</a>,
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xm?ln=<BFE_CLIENT_INFO var='ln'/>">MARCXML</a>,
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xd?ln=<BFE_CLIENT_INFO var='ln'/>">DC</a>,
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xe?ln=<BFE_CLIENT_INFO var='ln'/>">EndNote</a>,
+<!--            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xe8x?ln=<BFE_CLIENT_INFO var='ln'/>">EndNote (8-X)</a>,-->
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xn?ln=<BFE_CLIENT_INFO var='ln'/>">NLM</a>,
+            <a style="text-decoration:underline;font-weight:normal" href="<BFE_SERVER_INFO var='CFG_BASE_URL'/><BFE_SERVER_INFO var='CFG_SITE_RECORD'/>/<BFE_RECORD_ID/>/export/xw?ln=<BFE_CLIENT_INFO var='ln'/>">RefWorks</a></li>
+        <BFE_EDIT_RECORD prefix="<li>" suffix="</li>" />
+        <BFE_EDIT_FILES prefix="<li>" suffix="</li>" />
         <BFE_SWORD_PUSH prefix="<li>" suffix="</li>" />
 </ul>
 <BFE_BOOKMARK prefix="<div style='padding-left: 13px;'>" suffix="</div>" />
-</div>
-
-
-<div class="well">
-<h4>Metadata</h4>
-<BFE_METADATA/>
-</div>
diff --git a/invenio/modules/formatter/format_templates/OAI_DC.xsl b/invenio/modules/formatter/format_templates/OAI_DC.xsl
@@ -44,12 +44,6 @@
     </xsl:if>
   </xsl:template>
   <xsl:template match="record">
-    <!-- PID as Identifier -->
-    <xsl:if test="datafield[@tag=024 and @ind1=7 and subfield[@code='2']='PID']">
-      <xsl:for-each select="datafield[@tag=024 and @ind1=7 and subfield[@code='2']='PID']">
-        <dc:identifier><xsl:value-of select="subfield[@code='a']"/></dc:identifier>
-      </xsl:for-each>
-    </xsl:if>
     <!-- DOI -->
     <xsl:if test="datafield[@tag=024 and @ind1=7 and (subfield[@code='2']='doi' or subfield[@code='2']='DOI')]">
       <xsl:for-each select="datafield[@tag=024 and @ind1=7 and (subfield[@code='2']='doi' or subfield[@code='2']='DOI')]">
@@ -62,15 +56,12 @@
     <xsl:for-each select="datafield[@tag=041]">
       <dc:language><xsl:value-of select="subfield[@code='a']"/></dc:language>
     </xsl:for-each>
-    <xsl:for-each select="datafield[@tag=546]">
-      <dc:language><xsl:value-of select="subfield[@code='a']"/></dc:language>
-    </xsl:for-each>
     <!-- Author/Creator -->
     <xsl:for-each select="datafield[@tag=100]">
       <dc:creator><xsl:value-of select="subfield[@code='a']"/></dc:creator>
     </xsl:for-each>
     <xsl:for-each select="datafield[@tag=700]">
-      <dc:contributor><xsl:value-of select="subfield[@code='a']"/></dc:contributor>
+      <dc:creator><xsl:value-of select="subfield[@code='a']"/></dc:creator>
     </xsl:for-each>
     <!-- Corporate Author/Creator, if no main author/creator -->
     <xsl:if test="not (datafield[@tag=100 and subfield[@code='a']] or datafield[@tag=700 and subfield[@code='a']])">
@@ -98,18 +89,6 @@
     <xsl:for-each select="datafield[@tag=650 and @ind1=1 and @ind2=7]">
       <dc:subject><xsl:value-of select="subfield[@code='a']"/></dc:subject>
     </xsl:for-each>
-    <xsl:for-each select="datafield[@tag=653 and @ind1=1]">
-      <dc:subject><xsl:value-of select="subfield[@code='a']"/></dc:subject>
-    </xsl:for-each>
-    <xsl:for-each select="datafield[@tag=526]">
-      <dc:subject><xsl:value-of select="subfield[@code='a']"/></dc:subject>
-    </xsl:for-each>
-    <xsl:for-each select="datafield[@tag=540]">
-      <dc:rights><xsl:value-of select="subfield[@code='a']"/></dc:rights>
-    </xsl:for-each>
-    <xsl:for-each select="datafield[@tag=542]">
-      <dc:rights><xsl:value-of select="subfield[@code='l']"/></dc:rights>
-    </xsl:for-each>
     <!-- Abstract -->
     <xsl:for-each select="datafield[@tag=520]">
       <dc:description><xsl:value-of select="subfield[@code='a']"/></dc:description>
@@ -170,13 +149,6 @@
 <!--        <xsl:for-each select="datafield[@tag=856 and @ind1=4]">
           <dc:identifier><xsl:value-of select="subfield[@code='u']"/></dc:identifier>
         </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=024]">
-          <dc:identifier><xsl:value-of select="subfield[@code='a']"/></dc:identifier>
-        </xsl:for-each>
-        <xsl:for-each select="datafield[@tag=337]">
-          <dc:type><xsl:value-of select="subfield[@code='a']"/></dc:type>
-        </xsl:for-each>
-        <dc:date><xsl:value-of select="fn:creation_date(controlfield[@tag=001])"/></dc:date>
 -->
 	<!-- Date. Please keep ISO 8601 format -->
 	<xsl:variable name="date" select="fn:eval_bibformat(controlfield[@tag='001'],'&lt;BFE_DATE date_format=&quot;%Y-%m-%d&quot; source_formats=&quot;%d %b %Y&quot; source_fields=&quot;269__c,260__c&quot;>')" />

diff --git a/invenio/modules/formatter/format_templates/metadata.bft b/invenio/modules/formatter/format_templates/metadata.bft
diff --git a/invenio/modules/formatter/output_formats/HDMD.bfo b/invenio/modules/formatter/output_formats/HDMD.bfo