Bibcirculation: escape user_info

Makefile.am

@@ -30,7 +30,7 @@ MJV = 2.3
 MATHJAX = http://invenio-software.org/download/mathjax/MathJax-v$(MJV).zip
 
 # current CKeditor version
-CKV = 3.6.6
+CKV = 4.5.3
 CKEDITOR = ckeditor_$(CKV).zip
 
 # current MediaElement.js version
@@ -332,6 +332,62 @@ uninstall-pdfa-helper-files:
 	@echo "** The PDF/A helper files were successfully uninstalled. **"
 	@echo "***********************************************************"
 
+<<<<<<< HEAD
+install-youtube:
+	@echo "***********************************************************"
+	@echo "**        Installing youtube client libraries            **"
+	@echo "***********************************************************"
+	@echo "Please make sure that you have pip installed             **"
+	@echo "-----------------------------------------------------------"
+	@echo "For more infos about the library please visit:"
+	@echo "https://developers.google.com/api-client-library/python/start/installation"
+	sudo pip install --upgrade google-api-python-client
+	rm -rf /tmp/invenio_js_frameworks
+	mkdir -p /tmp/invenio_js_frameworks
+	(cd /tmp/invenio_js_frameworks && \
+	wget https://github.com/dimsemenov/Magnific-Popup/archive/master.zip && \
+	unzip master.zip && \
+	mkdir -p ${prefix}/var/www/static/magnific_popup && \
+	cp -r Magnific-Popup-master/dist/* ${prefix}/var/www/static/magnific_popup && \
+	cd /tmp && \
+	rm -rf invenio_js_frameworks)
+	@echo "***********************************************************"
+	@echo "**  Youtube client libraries was successfully installed  **"
+	@echo "***********************************************************"
+
+unistall-youtube:
+	@echo "***********************************************************"
+	@echo "**       Unistalling Youtube client libraries            **"
+	@echo "***********************************************************"
+	sudo pip uninstall google-api-python-client
+	rm -rf ${prefix}/var/www/static/magnific_popup
+	@echo "***********************************************************"
+	@echo "** Youtube client libraries was successfully unistalled  **"
+	@echo "***********************************************************"
+
+install-webcomment:
+	@echo "***********************************************************"
+	@echo "** Installing Webcomment plugin dependencies.            **"
+	@echo "***********************************************************"
+	rm -rf /tmp/webcomment
+	mkdir /tmp/webcomment
+	wget 'https://github.com/cowboy/jquery-throttle-debounce/archive/master.zip' -O '/tmp/webcomment/webcomment.zip' --no-check-certificate
+	unzip -u -d '/tmp/webcomment' '/tmp/webcomment/webcomment.zip'
+	mv /tmp/webcomment/jquery-throttle-debounce-master/jquery.ba-throttle-debounce.min.js ${prefix}/var/www/js
+	wget 'https://raw.githubusercontent.com/bartaz/sandbox.js/master/jquery.highlight.js' -O '/tmp/webcomment/jquery.highlight.min.js' --no-check-certificate
+	mv /tmp/webcomment/jquery.highlight.min.js ${prefix}/var/www/js
+	rm -rf /tmp/webcomment
+	@echo "***********************************************************"
+	@echo "** Webcomment plugins were successfully installed.       **"
+	@echo "***********************************************************"
+
+uninstall-webcomment:
+	rm -f ${prefix}/var/www/js/jquery.ba-throttle-debounce.min.js
+	rm -f ${prefix}/var/www/js/jquery.highlight.min.js
+	@echo "***********************************************************"
+	@echo "** The Webcomment plugins were successfully uninstalled. **"
+	@echo "***********************************************************"
+
 #Solrutils allows automatic installation, running and searching of an external Solr index.
 install-solrutils:
 	@echo "***********************************************************"

config/invenio.conf

@@ -603,6 +603,17 @@ CFG_WEBSEARCH_SYNONYM_KBRS = {
     'journal': ['SEARCH-SYNONYM-JOURNAL', 'leading_to_number'],
     }
 
+# CFG_OBELIX_HOST -- optionally, enables the Obelix integration
+# and defines the Obelix IP or Hostname to connect to.
+# Searches, page views and downloads will be logged to Obelix
+# and will be used to generate recommendations recommendation data for users.
+# To integrate Obelix in the search results,
+# configure it in the BibRank settings (template_read_recommendations.cfg).
+CFG_OBELIX_HOST =
+
+# CFG_OBELIX_PREFIX -- optionally, defines the Obelix cache prefix.
+CFG_OBELIX_PREFIX = obelix::
+
 # CFG_SOLR_URL -- optionally, you may use Solr to serve full-text
 # queries and ranking.  If so, please specify the URL of your Solr instance.
 # Example: http://localhost:8983/solr (default solr port)
@@ -929,6 +940,8 @@ CFG_BIBDOCFILE_DOCUMENT_FILE_MANAGER_RESTRICTIONS = [
 CFG_BIBDOCFILE_DOCUMENT_FILE_MANAGER_MISC = {
     'can_revise_doctypes': ['*'],
     'can_comment_doctypes': ['*'],
+    'can_change_copyright_doctypes': ['*'],
+    'can_change_advanced_copyright_doctypes': ['*'],
     'can_describe_doctypes': ['*'],
     'can_delete_doctypes': ['*'],
     'can_keep_doctypes': ['*'],
@@ -1171,6 +1184,8 @@ CFG_BIBINDEX_PERFORM_OCR_ON_DOCNAMES = scan-.*
 # NOTE: for backward compatibility reasons you can set this to a simple
 # regular expression that will directly be used as the unique key of the
 # map, with corresponding value set to ".*" (in order to match any URL)
+# NOTE2: If the value is None, the url mapping the key regex will be used
+# directly
 CFG_BIBINDEX_SPLASH_PAGES = {
     "http://documents\.cern\.ch/setlink\?.*": ".*",
     "http://ilcagenda\.linearcollider\.org/subContributionDisplay\.py\?.*|http://ilcagenda\.linearcollider\.org/contributionDisplay\.py\?.*": "http://ilcagenda\.linearcollider\.org/getFile\.py/access\?.*|http://ilcagenda\.linearcollider\.org/materialDisplay\.py\?.*",
@@ -1475,6 +1490,15 @@ CFG_WEBCOMMENT_MAX_ATTACHED_FILES = 5
 # discussions.
 CFG_WEBCOMMENT_MAX_COMMENT_THREAD_DEPTH = 1
 
+# CFG_WEBCOMMENT_ENABLE_HTML_EMAILS -- if True, emails will also contain
+# HTML content, in addition to the plaintext version.
+CFG_WEBCOMMENT_ENABLE_HTML_EMAILS = True
+
+# CFG_WEBCOMMENT_ENABLE_MARKDOWN_TEXT_RENDERING -- if True, and when
+# CFG_WEBCOMMENT_USE_RICH_TEXT_EDITOR is False, plain text will be rendered
+# as Markdown <http://daringfireball.net/projects/markdown/>.
+CFG_WEBCOMMENT_ENABLE_MARKDOWN_TEXT_RENDERING = True
+
 ##################################
 # Part 11: BibSched parameters ##
 ##################################
@@ -2565,6 +2589,72 @@ CFG_ARXIV_URL_PATTERN = http://export.arxiv.org/pdf/%sv%s.pdf
 # e.g. CFG_REDIS_HOSTS = [{'db': 0, 'host': '127.0.0.1', 'port': 7001}]
 CFG_REDIS_HOSTS = {'default': [{'db': 0, 'host': '127.0.0.1', 'port': 6379}]}
 
+#################################
+## Elasticsearch Configuration ##
+#################################
+
+## CFG_ELASTICSEARCH_LOGGING -- Whether to use Elasticsearch logging or not
+CFG_ELASTICSEARCH_LOGGING = 0
+
+## CFG_ELASTICSEARCH_INDEX_PREFIX -- The prefix to be used for the
+## Elasticsearch indices.
+CFG_ELASTICSEARCH_INDEX_PREFIX = invenio-
+
+## CFG_ELASTICSEARCH_HOSTS -- The list of Elasticsearch hosts to connect to.
+## This is a list of dictionaries with connection information.
+CFG_ELASTICSEARCH_HOSTS = [{'host': '127.0.0.1', 'port': 9200}]
+
+## CFG_ELASTICSEARCH_SUFFIX_FORMAT -- The time format string to base the
+## suffixes for the Elasticsearch indices on.  E.g. "%Y.%m" for indices to be
+## called "invenio-2014.10" for example.
+CFG_ELASTICSEARCH_SUFFIX_FORMAT = %Y.%m
+
+## CFG_ELASTICSEARCH_MAX_QUEUE_LENGTH -- The maximum length the queue of events
+## is allowed to grow to before it is flushed to Elasticsearch.  If you don't
+## want to set a maximum, and rely entirely on the periodic flush instead, set
+## this to -1.
+CFG_ELASTICSEARCH_MAX_QUEUE_LENGTH = -1
+
+## CFG_ELASTICSEARCH_FLUSH_INTERVAL -- The time (in seconds) to wait between
+## flushes of the event queue to Elasticsearch.  If you want to disable
+## periodic flushing and instead rely on the max. queue length to trigger
+## flushes, set this to -1.
+CFG_ELASTICSEARCH_FLUSH_INTERVAL = 30
+
+## CFG_ELASTICSEARCH_BOT_AGENT_STRINGS -- A list of strings which, if found in
+## the user agent string, will cause a 'bot' flag to be added to the logged
+## event.  This list taken from bots marked "active" at
+## <http://www.searchenginedictionary.com/spider-names.shtml>.  Googlebot and
+## bingbot added to the head of the list for speed.
+CFG_ELASTICSEARCH_BOT_AGENT_STRINGS = ['Googlebot', 'bingbot', 'Arachnoidea',
+'FAST-WebCrawler', 'Fluffy the spider', 'Gigabot', 'Gulper', 'ia_archiver',
+'MantraAgent', 'MSN', 'Scooter', 'Scrubby', 'Slurp', 'Teoma_agent1', 'Winona',
+'ZyBorg', 'Almaden', 'Cyveillance', 'DTSearch', 'Girafa.com', 'Indy Library',
+'LinkWalker', 'MarkWatch', 'NameProtect', 'Robozilla', 'Teradex Mapper',
+'Tracerlock', 'W3C_Validator', 'WDG_Validator', 'Zealbot']
+
+##############################
+# Recommender Configuration ##
+##############################
+# CFG_RECOMMENDER_REDIS -- optionally, enables the recommendations and
+# specifies the Redis host from where the recommendations are loaded.
+# To show the recommendations on the record page include the
+# BibFormat element `bfe_record_recommendations`.
+CFG_RECOMMENDER_REDIS =
+
+# CFG_RECOMMENDER_PREFIX -- optionally, defines the prefix used in the
+# redis cache.
+CFG_RECOMMENDER_PREFIX = Reco_1::
+
+##########################
+# Part 37: WEBJOURNAL   ##
+##########################
+
+# Specify webjournal categories that have been deleted and we want to redirect
+# the articles in the CDS detail view. For example all the articles in deleted
+# category `General Information` will redirect to the record detail view.
+CFG_WEBJOURNAL_REDIRECT_ARTICLES_OF_DELETED_CATEGORIES = []
+
 ##########################
 #  THAT's ALL, FOLKS!  ##
 ##########################

configure.ac

@@ -811,6 +811,7 @@ AC_CONFIG_FILES([config.nice  \
      modules/miscutil/etc/ckeditor_scientificchar/lang/Makefile \
      modules/miscutil/lib/Makefile \
      modules/miscutil/lib/upgrades/Makefile \
+     modules/miscutil/lib/pid_providers/Makefile \
      modules/miscutil/sql/Makefile \
      modules/miscutil/web/Makefile \
      modules/webaccess/Makefile \
@@ -874,6 +875,10 @@ AC_CONFIG_FILES([config.nice  \
      modules/webmessage/doc/hacking/Makefile \
      modules/webmessage/lib/Makefile \
      modules/webmessage/web/Makefile \
+     modules/webnews/Makefile \
+     modules/webnews/doc/Makefile \
+     modules/webnews/lib/Makefile \
+     modules/webnews/web/Makefile \
      modules/websearch/Makefile \
      modules/websearch/bin/Makefile \
      modules/websearch/bin/webcoll \

modules/Makefile.am

@@ -52,6 +52,7 @@ SUBDIRS = bibauthorid \
           webjournal \
           weblinkback \
           webmessage \
+          webnews \
           websearch \
           websession \
           webstat \

modules/bibcirculation/lib/bibcirculation_dblayer.py

@@ -2721,6 +2721,11 @@ def get_purchase_request_borrower_details(ill_request_id):
     else:
         return None
 
+def update_ill_request_letter_number(ill_request_id, overdue_letter_number):
+    query = ('UPDATE crcILLREQUEST set overdue_letter_number=%s '
+             'where id=%s')
+    run_sql(query, (overdue_letter_number, ill_request_id))
+
 def update_ill_request(ill_request_id, library_id, request_date,
                        expected_date, arrival_date, due_date, return_date,
                        status, cost, barcode, library_notes):

modules/bibcirculation/lib/bibcirculation_templates.py

@@ -2246,8 +2246,8 @@ def tmpl_loan_on_desk_step1(self, result, key, string, infos,
                 name = user_info[0]
                 user_id = user_info[2]
                 out += """
-                       <option value='%s'>%s
-                       """ % (name, user_id)
+                       <option value="%s">%s
+                       """ % (cgi.escape(name, True), user_id)
 
             out += """
                     </select>
@@ -2992,7 +2992,7 @@ def tmpl_create_new_request_step1(self, borrower, infos, result, p, f,
               """ % (CFG_SITE_URL)
             for recid in result:
                 out += """
-                       <option value ='%s'>%s
+                       <option value ="%s">%s
 
                        """ % (recid, book_title_from_MARC(recid))
 
@@ -3494,9 +3494,9 @@ def tmpl_place_new_request_step1(self, result, key, string, barcode,
             for (borrower_id, ccid, name, email,
                  phone, address, mailbox) in result:
                 out += """
-                       <option value ='%s,%s,%s,%s,%s,%s,%s'>%s
-                       """ % (borrower_id, ccid, name, email, phone,
-                              address, mailbox, name)
+                       <option value="%s,%s,%s,%s,%s,%s,%s">%s
+                       """ % (borrower_id, ccid, cgi.escape(name, True), email,
+                              phone, address, mailbox, name)
 
             out += """
                     </select>
@@ -9940,9 +9940,9 @@ def tmpl_register_ill_request_with_no_recid_step2(self, book_info,
             for (borrower_id, ccid, name, email,
                  phone, address, mailbox) in result:
                 out += """
-                       <option value ='%s,%s,%s,%s,%s,%s,%s'>%s
-                       """ % (borrower_id, ccid, name, email, phone,
-                              address, mailbox, name)
+                       <option value="%s,%s,%s,%s,%s,%s,%s">%s
+                       """ % (borrower_id, ccid, cgi.escape(name, True), email,
+                              phone, address, mailbox, name)
 
             out += """
                     </select>
@@ -10827,8 +10827,8 @@ def tmpl_register_ill_article_request_step2(self, article_info,
             for (borrower_id, ccid, name, email,
                  phone, address, mailbox) in result:
                 out += """
-                       <option value ='%s,%s,%s,%s,%s,%s,%s'>%s
-                       """ % (borrower_id, ccid, name, email,
+                       <option value="%s,%s,%s,%s,%s,%s,%s">%s
+                       """ % (borrower_id, ccid, cgi.escape(name, True), email,
                               phone, address, mailbox, name)
 
             out += """
@@ -14092,7 +14092,7 @@ def tmpl_merge_libraries_step1(self, library_details, library_items,
             for (library_to, library_name) in result:
                 if library_to != library_id:
                     out += """
-                                                <option value ='%s'>%s
+                                                <option value="%s">%s
 
                        """ % (library_to, library_name)
 

modules/bibcirculation/lib/bibcirculationadminlib.py

@@ -3044,36 +3044,35 @@ def update_item_info_step6(req, tup_infos, ln=CFG_SITE_LANG):
             else:
                 infos.append(_("Item <strong>[%s]</strong> updated, but the <strong>barcode was not modified</strong> because it was not found (!?).") % (old_barcode))
 
-        copies = db.get_item_copies_details(recid)
-        requests = db.get_item_requests(recid)
-        loans = db.get_item_loans(recid)
-        purchases = db.get_item_purchases(CFG_BIBCIRCULATION_ACQ_STATUS_NEW, recid)
+    copies = db.get_item_copies_details(recid)
+    requests = db.get_item_requests(recid)
+    loans = db.get_item_loans(recid)
+    purchases = db.get_item_purchases(CFG_BIBCIRCULATION_ACQ_STATUS_NEW, recid)
 
-        req_hist_overview = db.get_item_requests_historical_overview(recid)
-        loans_hist_overview = db.get_item_loans_historical_overview(recid)
-        purchases_hist_overview = db.get_item_purchases(CFG_BIBCIRCULATION_ACQ_STATUS_RECEIVED, recid)
+    req_hist_overview = db.get_item_requests_historical_overview(recid)
+    loans_hist_overview = db.get_item_loans_historical_overview(recid)
+    purchases_hist_overview = db.get_item_purchases(CFG_BIBCIRCULATION_ACQ_STATUS_RECEIVED, recid)
 
-        body = bc_templates.tmpl_get_item_details(recid=recid,
-                                            copies=copies,
-                                            requests=requests,
-                                            loans=loans,
-                                            purchases=purchases,
-                                            req_hist_overview=req_hist_overview,
-                                            loans_hist_overview=loans_hist_overview,
-                                            purchases_hist_overview=purchases_hist_overview,
-                                            infos=infos,
-                                            ln=ln)
+    infos.append(_('If you wish, you can now open the <a href="%s">Record Editor</a> to modify the bibliographic information of this item.') % (CFG_SITE_SECURE_URL + "/record/edit/#state=edit&recid=" + str(recid)))
 
-        return page(title=_("Update item information"),
-                    uid=id_user,
-                    req=req,
-                    body=body, language=ln,
-                    navtrail=navtrail_previous_links,
-                    lastupdated=__lastupdated__)
+    body = bc_templates.tmpl_get_item_details(recid=recid,
+                                        copies=copies,
+                                        requests=requests,
+                                        loans=loans,
+                                        purchases=purchases,
+                                        req_hist_overview=req_hist_overview,
+                                        loans_hist_overview=loans_hist_overview,
+                                        purchases_hist_overview=purchases_hist_overview,
+                                        infos=infos,
+                                        ln=ln)
+
+    return page(title=_("Update item information"),
+                uid=id_user,
+                req=req,
+                body=body, language=ln,
+                navtrail=navtrail_previous_links,
+                lastupdated=__lastupdated__)
 
-    else:
-        return redirect_to_url(req, CFG_SITE_SECURE_URL +
-                                    "/record/edit/#state=edit&recid=" + str(recid))
 
 def item_search(req, infos=[], ln=CFG_SITE_LANG):
     """
@@ -4969,6 +4968,25 @@ def ill_request_details_step2(req, delete_key, ill_request_id, new_status,
         barcode = db.get_ill_barcode(ill_request_id)
         db.update_ill_loan_status(borrower_id, barcode, return_date, 'ill')
 
+    # ill recall letter issue
+    try:
+        from invenio.dbquery import run_sql
+        _query = ('SELECT due_date from crcILLREQUEST where id = %s')
+        _due = run_sql(_query, (ill_request_id))[0][0]
+
+        # Since we don't know if the due_date is a string or datetime
+        try:
+            _due_date = datetime.datetime.strptime(due_date, '%Y-%m-%d')
+        except TypeError:
+            _due_date = due_date
+
+        # This means that the ILL got extended, we therefore reset the 
+        # overdue_letter_numer
+        if _due < _due_date:
+            db.update_ill_request_letter_number(ill_request_id, 0)
+    except Exception:
+        pass
+
     db.update_ill_request(ill_request_id, library_id, request_date,
                           expected_date, arrival_date, due_date, return_date,
                           new_status, cost, barcode,

modules/bibconvert/etc/oaiarxiv2marcxml.xsl

@@ -2,7 +2,7 @@
 <!-- $Id$
 
      This file is part of Invenio.
-     Copyright (C) 2007, 2008, 2010, 2011 CERN.
+     Copyright (C) 2007, 2008, 2010, 2011, 2015 CERN.
 
      Invenio is free software; you can redistribute it and/or
      modify it under the terms of the GNU General Public License as