Commit f12eda9a authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Add LF letter to strip string for authors last and first names

parent 454710d8

opds_catalog/feeds.py

+6 −6
Original line number Diff line number Diff line
@@ -577,16 +577,16 @@ class AuthorsFeed(AuthFeed): 
    def items(self, obj):

        length, chars = obj

        if self.lang_code:

            sql="""select upper(substr(last_name,1,%(length)s)) as id, count(*) as cnt 

            sql="""select upper(substr(last_name || ' ' || first_name,1,%(length)s)) as id, count(*) as cnt 

                   from opds_catalog_author 

                   where lang_code=%(lang_code)s and upper(last_name) like '%(chars)s%%'

                   group by upper(substr(last_name,1,%(length)s)) 

                   where lang_code=%(lang_code)s and upper(last_name || ' ' || first_name) like '%(chars)s%%'

                   group by upper(substr(last_name || ' ' || first_name,1,%(length)s)) 

                   order by id"""%{'length':length, 'lang_code':self.lang_code, 'chars':chars}

        else:

            sql="""select upper(substr(last_name,1,%(length)s)) as id, count(*) as cnt 

            sql="""select upper(substr(last_name || ' ' || first_name,1,%(length)s)) as id, count(*) as cnt 

                   from opds_catalog_author 

                   where upper(last_name) like '%(chars)s%%'

                   group by upper(substr(last_name,1,%(length)s)) 

                   where upper(last_name || ' ' || first_name) like '%(chars)s%%'

                   group by upper(substr(last_name || ' ' || first_name,1,%(length)s)) 

                   order by id"""%{'length':length,'chars':chars}

          

        dataset = Author.objects.raw(sql)

opds_catalog/sopdscan.py

+3 −3
Original line number Diff line number Diff line
@@ -186,13 +186,13 @@ class opdsScanner: 


                   idx=0

                   for l in self.fb2parser.author_last.getvalue():

                       last_name=l.strip(' \'\"\&-.#\\\`')

                       first_name=self.fb2parser.author_first.getvalue()[idx].strip(' \'\"\&-.#\\\`')

                       last_name=l.strip(' \n\'\"\&-.#\\\`')

                       first_name=self.fb2parser.author_first.getvalue()[idx].strip(' \n\'\"\&-.#\\\`')

                       author=opdsdb.addauthor(first_name,last_name)

                       opdsdb.addbauthor(book,author)

                       idx+=1

                   for l in self.fb2parser.genre.getvalue():

                       opdsdb.addbgenre(book,opdsdb.addgenre(l.lower().strip(' \'\"')))

                       opdsdb.addbgenre(book,opdsdb.addgenre(l.lower().strip(' \n\'\"')))

                   for l in self.fb2parser.series.attrss:

                       ser_name=l.get('name')

                       if ser_name: