Merging with master

.gitignore

@@ -3,4 +3,6 @@
 .idea
 out
 web-server/metaScience/WebContent/META-INF/context*.xml
-extractor/database_connection_config.py
+extractor/database_connection_config.*
+extractor/*.pyc
+extractor/*.log

README.md

@@ -1,13 +1,13 @@
 # MetaScience
 
-MetaScience is an online service we have developed to help researchers on analyzing conferences. We rely on the database provided by DBLP, to derive some useful metrics for conferences and authors. 
+MetaScience is an online service we have developed to help researchers analyze their research profile and that of the conferences where they publish. We rely on the data provided by DBLP, to derive some useful metrics for conferences and authors. 
 
 The conference metrics include:
 
 - **Top 5 authors** and **Top 5 regular authors**
 - **Conference activity**. It provides the overall number of authors and papers for each conference edition.
 - **Conference ratios**. It presents the number of authors per paper and papers per author for each edition.
-- **Community turnover**. Following the popular expression publish or perish, it calculates the percentage of authors that survived/perished between the editions of the conference. In particular, the user can select a unit of time that spans between two consecutive editions or three.
+- **Community turnover**. Following the popular expression publish or perish, it calculates the percentage of authors that survived/perished between the editions of the conference. 
 - **Openness**. It measures how much the community underlying a conference is open towards newcomers. Thus, for each edition it presents the ratio between papers coming from authors that have never published in the conference before (outsiders) as well as the papers with all authors having published there already (community member).
 - **Co-author connections**. It shows a graph where nodes represent authors and edges connect co-authors. It helps to identify group of people usually working together.
 
@@ -33,7 +33,7 @@ Of course if you would like MetaScience to show something you have in mind, do n
 * [Jordi Cabot](http://github.com/jcabot/ "Jordi Cabot")
 * [Robin Boncorps](http://github.com/rboncorps/ "Robin Boncorps")
 
-Javier and Jordi are currently members of [SOM](http://som.uoc.es), a research team of IN3-UOC. Robin and Valerio are members of [Atlanmod](http://www.emn.fr/z-info/atlanmod), a research team of Inria.
+Javier and Jordi are currently members of [SOM](http://som-research.uoc.edu), a research team of IN3-UOC. Robin and Valerio are members of [Atlanmod](http://www.emn.fr/z-info/atlanmod), a research team of Inria.
 
 How can I follow the latest news about the project?
 ---------------------------------------------------

extractor/update_type_conference.py

@@ -0,0 +1,67 @@
+import logging
+import mysql.connector
+from mysql.connector import errorcode
+from selenium import webdriver
+from selenium.common.exceptions import NoSuchElementException
+import time
+import cross_module_variables as shared
+import re
+import database_connection_config as dbconnection
+
+LOG_FILENAME = 'logger_conference_type.log'
+driver = webdriver.PhantomJS()
+
+# This script gathers (via Selenium) the TITLE for each proceedings in DBLP
+# and add them to the table AUX_DBLP_PROCEEDINGS.
+#
+# The table AUX_DBLP_PROCEEDINGS is derived from DBLP_PUB_NEW
+
+def update_type_conference(cnx, dblp_key):
+    conf_cursor = cnx.cursor()
+    query = "SELECT title FROM dblp_pub_new WHERE type='proceedings' AND BINARY dblp_key = %s"
+    arguments = [dblp_key]
+    conf_cursor.execute(query, arguments)
+    title = conf_cursor.fetchone()[0]
+
+    cursor = cnx.cursor()
+    type = ''
+    if 'workshop' in title.lower():
+        type = 'workshop'
+    elif 'conference' in title.lower():
+        type = 'conference'
+    elif 'symposium' in title.lower():
+        type = 'symposium'
+
+    query = "UPDATE aux_dblp_proceedings SET type = %s WHERE BINARY dblp_key = %s"
+    arguments = [type, dblp_key]
+    cursor.execute(query, arguments)
+    cnx.commit()
+
+    cursor.close()
+
+def add_type_info(cnx):
+    conf_cursor = cnx.cursor()
+    query = "SELECT id, dblp_key " \
+            "FROM aux_dblp_proceedings " \
+            "WHERE dblp_key IS NOT NULL AND title is not NULL"
+    conf_cursor.execute(query)
+    row = conf_cursor.fetchone()
+    while row is not None:
+        id = row[0]
+        dblp_key = row[1]
+        update_type_conference(cnx, dblp_key)
+        row = conf_cursor.fetchone()
+        logging.warning("last conf analysed " + str(dblp_key))
+
+    conf_cursor.close()
+
+def main():
+    logging.basicConfig(filename=LOG_FILENAME, level=logging.WARNING)
+    with open(LOG_FILENAME, "w") as log_file:
+        log_file.write('\n')
+    cnx = mysql.connector.connect(**dbconnection.CONFIG)
+    add_type_info(cnx)
+    driver.close()
+
+if __name__ == "__main__":
+    main()

web-server/metaScience/WebContent/WEB-INF/config.properties

@@ -1,3 +1,4 @@
-allowOrigin=http://som-research.uoc.edu/
+allowOrigin=http://som-research.uoc.edu
 dblpSchema=dblp20150613
-version=v0.3.0
+<<<<<<< HEAD
+version=v0.3.0

web-server/metaScience/WebContent/WEB-INF/config.properties.jlcanovas.dev

@@ -1,3 +1,3 @@
 allowOrigin=http://localhost:8000
 dblpSchema=dblp20150613
-version=v0.3.0
+version=v0.3.0

web-server/metaScience/WebContent/WEB-INF/config.properties.rBoncorps.dev

@@ -1,3 +1,3 @@
 allowOrigin=http://localhost:8080
 dblpSchema=dblp
-version=v0.3.0
+version=v0.3.0

web-server/metaScience/WebContent/WEB-INF/config.properties.server

@@ -1,3 +1,3 @@
-allowOrigin=http://som-research.uoc.edu/
+allowOrigin=http://som-research.uoc.edu
 dblpSchema=dblp20150613
-version=v0.3.0
+version=v0.3.0

web-server/metaScience/WebContent/css/style.css

@@ -318,7 +318,6 @@ footer a:link, footer a:visited, footer a:hover, footer a:active {
 	color: #2b5a70;
 }
 
-
 .socialBtnTop {
 	float : right;
 	margin-top: 30px;

web-server/metaScience/src/som/metascience/VenueAuthorCollaborationServlet.java

@@ -79,7 +79,10 @@ private JsonObject getVenueAuthorCollaboration(String venueId, String subVenueId
 					+ "		FROM ("
 					+ "			SELECT source_authors.author AS source_author_name, source_authors.author_id AS source_author_id,"
 					+ "						target_authors.author AS target_author_name, target_authors.author_id AS target_author_id,"
-					+ "						COUNT(*) AS relation_strength, source_authors.author_id * target_authors.author_id AS connection_id"
+					+ "                     COUNT(*) as relation_strength,"
+					+ "						CONCAT(GREATEST(source_authors.author_id, target_authors.author_id), "
+					+ "                            '-',"
+					+ "                            LEAST(source_authors.author_id, target_authors.author_id)) as connection_id"
 					+ "			FROM ("
 					+ "				SELECT pub.id AS pub, author, author_id"
 					+ "				FROM dblp_pub_new pub"