From 5bfe348e72448dabb815ab0d41817fbcb628d383 Mon Sep 17 00:00:00 2001
From: TheLabRatt <labratty@gmail.com>
Date: Wed, 8 Oct 2014 19:17:44 +0100
Subject: [PATCH] Annuals link to series

Redesigned listLibrary as a dictionary. Annuals now link to their
series.
---
 data/interfaces/default/searchresults.html |  4 ++--
 mylar/helpers.py                           | 12 +++++++-----
 mylar/mb.py                                |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/data/interfaces/default/searchresults.html b/data/interfaces/default/searchresults.html
index f67154da..2e6b11f3 100755
--- a/data/interfaces/default/searchresults.html
+++ b/data/interfaces/default/searchresults.html
@@ -64,7 +64,7 @@
 						grade = 'A'
 					else:
 						grade = 'Z'
-					if result['haveit'] == "Yes":
+					if result['haveit'] != "No":
 						grade = 'H';
 				%>
 				<tr class="grade${grade}">
@@ -77,7 +77,7 @@
 					%if result['haveit'] == "No":
 						<td class="add" nowrap="nowrap"><a href="addComic?comicid=${result['comicid']}&comicname=${result['name'] |u}&comicyear=${result['comicyear']}&comicpublisher=${result['publisher'] |u}&comicimage=${result['comicimage']}&comicissues=${result['issues']}&imported=${imported}&ogcname=${ogcname}&serinfo=${serinfo}"><span class="ui-icon ui-icon-plus"></span> Add this Comic</a></td>
 					%else:
-						<td class="add" nowrap="nowrap"><a href="comicDetails?ComicID=${result['comicid']}"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span> Already in library</a></td>
+						<td class="add" nowrap="nowrap"><a href="comicDetails?ComicID=${result['haveit']}"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span> Already in library</a></td>
 					%endif
 				</tr>
 				%endfor
diff --git a/mylar/helpers.py b/mylar/helpers.py
index 2c503585..b3dc895e 100755
--- a/mylar/helpers.py
+++ b/mylar/helpers.py
@@ -1438,16 +1438,18 @@ def int_num(s):
 
 def listLibrary():
     import db
-    library = []
+    library = {}
     myDB = db.DBConnection()
-    # Get individual comics
+#    # Get individual comics
     list = myDB.select("SELECT ComicId FROM Comics")
     for row in list:
-        library.append(row['ComicId'])
+        library[row['ComicID']] = row['ComicID']
+#        library.append(row['ComicId'])
     # Add the annuals
-    list = myDB.select("SELECT ReleaseComicId FROM Annuals")
+    list = myDB.select("SELECT ReleaseComicId,ComicID FROM Annuals")
     for row in list:
-        library.append(row['ReleaseComicId'])
+        library[row['ReleaseComicId']] = row['ComicID']
+#        library.append(row['ReleaseComicId'])
     return library
 
 from threading import Thread
diff --git a/mylar/mb.py b/mylar/mb.py
index 1efdb8e8..ea084a88 100755
--- a/mylar/mb.py
+++ b/mylar/mb.py
@@ -235,9 +235,9 @@ def findComic(name, mode, issue, limityear=None, explicit=None, type=None):
                         xmldesc = "None"
                             
                         if xmlid in comicLibrary:
-                            haveit = "Yes"
+                            haveit = comicLibrary[xmlid]
                         else:
-						haveit = "No"
+                            haveit = "No"
 
                     comiclist.append({
                             'name':                 xmlTag,
@@ -289,7 +289,7 @@ def findComic(name, mode, issue, limityear=None, explicit=None, type=None):
                             except:
                                 xmldesc = "None"
                             if xmlid in comicLibrary:
-                                haveit = "Yes"
+                                haveit = comicLibrary[xmlid]
                             else:
                                 haveit = "No"
                             comiclist.append({