Merge lp:~submarine/unity-scope-zotero/bug1174987 into lp:unity-scope-zotero

[Mark Tully]

Updates SQL query to take into account zotero attachments

Updating SQL query to take into account that in Zotero 4, urls may not be included in the main entry of an article, but rather in an attachment. The query now uses the url in the article entry if it exists, or else uses the first url in the attachments.

Also escaping forbidden characters in the preview description which was preventing it from being displayed if the forbidden characters were in the description.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/unity-scope-zotero-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-zotero-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-zotero-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-zotero-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-zotero-ci/5/rebuild

review: Approve (continuous-integration)

[David Callé (davidc3)]

LGTM

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-06-16 00:37:28 +0000
@@ -0,0 +1,5 @@
+*.log
+*.substvars
+./build
+./debian/files
+./debian/unity-scope-zotero

=== modified file 'po/unity-scope-zotero.pot'
--- po/unity-scope-zotero.pot	2013-03-06 00:58:55 +0000
+++ po/unity-scope-zotero.pot	2013-06-16 00:37:28 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-06 00:56+0000\n"
+"POT-Creation-Date: 2013-06-16 01:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,22 +17,27 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/unity_zotero_daemon.py:33 ../data/zotero.scope.in.h:4
+#: ../src/unity_zotero_daemon.py:34 ../data/zotero.scope.in.h:4
 msgid "Search Zotero"
 msgstr ""
 
-#: ../src/unity_zotero_daemon.py:34
+#: ../src/unity_zotero_daemon.py:35
 msgid "Sorry, there are no Zotero results that match your search."
 msgstr ""
 
-#: ../src/unity_zotero_daemon.py:35
+#: ../src/unity_zotero_daemon.py:36
 msgid "Powered by Zotero"
 msgstr ""
 
-#: ../src/unity_zotero_daemon.py:59
+#: ../src/unity_zotero_daemon.py:62
 msgid "Articles"
 msgstr ""
 
+#. Add the "View" action
+#: ../src/unity_zotero_daemon.py:158
+msgid "View Article"
+msgstr ""
+
 #: ../data/zotero.scope.in.h:1
 msgid "zotero;"
 msgstr ""
@@ -42,5 +47,9 @@
 msgstr ""
 
 #: ../data/zotero.scope.in.h:3
-msgid "Find Zotero items"
+msgid ""
+"This is an Ubuntu search plugin that enables information from Zotero to be "
+"searched and displayed in the Dash underneath the Reference header. If you "
+"do not wish to search this content source, you can disable this search "
+"plugin."
 msgstr ""

=== modified file 'src/unity_zotero_daemon.py'
--- src/unity_zotero_daemon.py	2013-04-29 15:49:22 +0000
+++ src/unity_zotero_daemon.py	2013-06-16 00:37:28 +0000
@@ -20,6 +20,7 @@
 import os.path
 import shutil
 import sqlite3
+import html
 
 APP_NAME = 'unity-scope-zotero'
 LOCAL_PATH = '/usr/share/locale/'
@@ -40,11 +41,12 @@
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
 
 PATHS = [os.getenv("HOME") + "/.mozilla/firefox/", os.getenv("HOME") + "/.zotero/zotero/"]
-QUERY = ''' SELECT title.value, url.value, pub.value, c1.lastName, c2.lastName, c3.lastName, c4.lastName, c5.lastName, abstract.value
+QUERY = '''SELECT title.value, COALESCE(url.value, url2.value), pub.value, GROUP_CONCAT(COALESCE(c1.lastName, "") || ' ' || COALESCE(c2.lastName, "") || ' ' || COALESCE(c3.lastName, "") || ' ' || COALESCE(c4.lastName, "") || ' ' || COALESCE(c5.lastName, "")) as creator, abstract.value
 FROM items i
 INNER JOIN itemDataValues title ON title.valueID =(SELECT itemData.valueID FROM itemData WHERE itemData.fieldID =(SELECT fieldID FROM fields WHERE fields.fieldName = 'title' LIMIT 1) AND itemData.itemID=i.itemID LIMIT 1)
 LEFT JOIN itemTypes t ON t.itemTypeID = i.itemTypeID
-LEFT JOIN itemDataValues url ON url.valueID =(SELECT itemData.valueID FROM itemData WHERE itemData.fieldID =(SELECT fieldID FROM fields WHERE fields.fieldName = 'url' LIMIT 1) AND itemData.itemID=i.itemID LIMIT 1)
+LEFT JOIN itemDataValues url ON url.valueID = (SELECT itemData.valueID FROM itemData WHERE itemData.fieldID =(SELECT fieldID FROM fields WHERE fields.fieldName = 'url' LIMIT 1) AND itemData.itemID=i.itemID LIMIT 1)
+LEFT JOIN itemDataValues url2 on url2.valueID = (SELECT itemData.valueID FROM itemData WHERE itemData.fieldID =(SELECT fieldID FROM fields WHERE fields.fieldName = 'url' LIMIT 1) AND itemData.itemID = (SELECT itemAttachments.itemID FROM itemAttachments WHERE itemAttachments.sourceItemID = i.itemID) LIMIT 1)
 LEFT JOIN creatorData c1 ON c1.creatorDataID =(SELECT creatorDataID FROM creators WHERE creatorID =(SELECT creatorID FROM itemCreators WHERE itemID = i.itemID ORDER BY orderIndex LIMIT 0,1) LIMIT 1)
 LEFT JOIN creatorData c2 ON c2.creatorDataID =(SELECT creatorDataID FROM creators WHERE creatorID =(SELECT creatorID FROM itemCreators WHERE itemID = i.itemID ORDER BY orderIndex LIMIT 1,1) LIMIT 1)
 LEFT JOIN creatorData c3 ON c3.creatorDataID =(SELECT creatorDataID FROM creators WHERE creatorID =(SELECT creatorID FROM itemCreators WHERE itemID = i.itemID ORDER BY orderIndex LIMIT 2,1) LIMIT 1)
@@ -53,7 +55,8 @@
 LEFT JOIN itemDataValues pub ON pub.valueID =(SELECT itemData.valueID FROM itemData WHERE itemData.fieldID =(SELECT fieldID FROM fields WHERE fields.fieldName = 'publicationTitle' LIMIT 1) AND itemData.itemID=i.itemID LIMIT 1)
 LEFT JOIN itemDataValues abstract ON abstract.valueID =(SELECT itemData.valueID FROM itemData WHERE itemData.fieldID =(SELECT fieldID FROM fields WHERE fields.fieldName = 'abstractNote' LIMIT 1) AND itemData.itemID=i.itemID LIMIT 1)
 LEFT JOIN deletedItems ON i.itemID = deletedItems.itemID
-WHERE deletedItems.itemID IS NULL AND t.typeName = "journalArticle"'''
+WHERE deletedItems.itemID IS NULL AND t.typeName = "journalArticle"
+GROUP BY title.value'''
 
 c1 = {'id': 'scholar',
       'name': _('Articles'),
@@ -114,13 +117,8 @@
             title = record[0]
             uri = record[1]
             journal = record[2]
-            author1 = record[3]
-            author2 = record[4]
-            author3 = record[5]
-            author4 = record[6]
-            author5 = record[7]
-            authors = "%s, %s, %s, %s, %s" % (author1, author2, author3, author4, author5)
-            abstract = record[8]
+            authors = record[3]
+            abstract = record[4]
             if search.lower() in title.lower():
                 if uri:
                     results.append({'uri': uri,
@@ -151,11 +149,11 @@
         except KeyError as e:
             print(e)
         try:
-            description += self.result.metadata['abstract'].get_string()
+            description += html.escape(self.result.metadata['abstract'].get_string())
         except KeyError as e:
             print(e)
         preview.props.description_markup = description
-      
+
         # Add the "View" action
         show_action = Unity.PreviewAction.new("show", _("View Article"), None)
         preview.add_action(show_action)
@@ -267,5 +265,6 @@
         result_preview.set_search_metadata(metadata)
         return result_preview
 
+
 def load_scope():
     return Scope()

=== modified file 'tests/data/mock_zotero_pass/zotero.default/zotero/zotero-lensbackup.sqlite'
Binary files tests/data/mock_zotero_pass/zotero.default/zotero/zotero-lensbackup.sqlite	2013-03-14 00:31:22 +0000 and tests/data/mock_zotero_pass/zotero.default/zotero/zotero-lensbackup.sqlite	2013-06-16 00:37:28 +0000 differ
=== modified file 'tests/data/mock_zotero_pass/zotero.default/zotero/zotero.sqlite'
Binary files tests/data/mock_zotero_pass/zotero.default/zotero/zotero.sqlite	2013-03-14 00:31:22 +0000 and tests/data/mock_zotero_pass/zotero.default/zotero/zotero.sqlite	2013-06-16 00:37:28 +0000 differ