diff --git a/data/interfaces/default/importresults.html b/data/interfaces/default/importresults.html index f7d9f960..146421f3 100755 --- a/data/interfaces/default/importresults.html +++ b/data/interfaces/default/importresults.html @@ -136,9 +136,9 @@ ${result['ImportDate']} %if result['Status'] == 'Not Imported' and result['SRID'] is None: - [Import] + [Import] %endif - [Remove] + [Remove] %if result['SRID'] is not None and result['Status'] != 'Imported': [Select] %endif diff --git a/mylar/mb.py b/mylar/mb.py index ab445357..f9fde5cc 100755 --- a/mylar/mb.py +++ b/mylar/mb.py @@ -291,6 +291,7 @@ def findComic(name, mode, issue, limityear=None, explicit=None, type=None): if tmpYr.isdigit(): + yearRange.append(tmpYr) tmpyearRange = int(xmlcnt) / 12 if float(tmpyearRange): tmpyearRange +1 possible_years = int(tmpYr) + tmpyearRange @@ -300,6 +301,8 @@ def findComic(name, mode, issue, limityear=None, explicit=None, type=None): yearRange.append(str(i)) logger.fdebug('[RESULT] ComicName:' + xmlTag + ' -- ' + str(xmlYr) + ' [Series years: ' + str(yearRange) + ']') + if tmpYr != xmlYr: + xmlYr = tmpYr if any([limityear in yearRange, limityear == 'None']): xmlurl = result.getElementsByTagName('site_detail_url')[0].firstChild.wholeText diff --git a/mylar/webserve.py b/mylar/webserve.py index 9ec614fc..2a77a563 100755 --- a/mylar/webserve.py +++ b/mylar/webserve.py @@ -2018,7 +2018,7 @@ class WebInterface(object): DynamicName = v if volume is None or volume == 'None': logger.info('Removing ' + ComicName + ' from the Import list') - myDB.action('DELETE from importresults WHERE DynamicName=? AND Volume is NULL', [DynamicName]) + myDB.action('DELETE from importresults WHERE DynamicName=? AND (Volume is NULL OR Volume="None")', [DynamicName]) else: logger.info('Removing ' + ComicName + ' [' + str(volume) + '] from the Import list') myDB.action('DELETE from importresults WHERE DynamicName=? AND Volume=?', [DynamicName, volume]) @@ -3102,7 +3102,7 @@ class WebInterface(object): logname = ComicName + '[' + str(volume) + ']' logger.info("Removing import data for Comic: " + logname) if volume is None or volume == 'None': - myDB.action('DELETE from importresults WHERE DynamicName=? AND Volume is NULL AND Status=?', [DynamicName, Status]) + myDB.action('DELETE from importresults WHERE DynamicName=? AND Status=? AND (Volume is NULL OR Volume="None")', [DynamicName, Status]) else: myDB.action('DELETE from importresults WHERE DynamicName=? AND Volume=? AND Status=?', [DynamicName, volume, Status]) raise cherrypy.HTTPRedirect("importResults") @@ -3470,9 +3470,11 @@ class WebInterface(object): 'srid': SRID} self.addbyid(sr['comicid'], calledby=True, imported=imported, ogcname=ogcname) #imported=yes) + else: + logger.info('[IMPORT] There is more than one result that might be valid - normally this is due to the filename(s) not having enough information for me to use (ie. no volume label/year). Manual intervention is required.') mylar.IMPORTLOCK = False - logger.info('Importing finished.') + logger.info('[IMPORT] Importing complete.') preSearchit.exposed = True