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

Fix Raw SQL in feeds

parent ae45699f
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -771,13 +771,13 @@ class BooksFeed(AuthFeed):
        if self.lang_code:
            sql="""select %(length)s as l, upper(substring(title,1,%(length)s)) as id, count(*) as cnt 
                   from opds_catalog_book 
                   where lang_code=%(lang_code)s and upper(title) like '%(chars)s%%'
                   where lang_code=%(lang_code)s and upper(title) like '%(chars)s%%%%'
                   group by upper(substring(title,1,%(length)s)) 
                   order by id"""%{'length':length, 'lang_code':self.lang_code, 'chars':chars}
        else:
            sql="""select %(length)s as l, upper(substring(title,1,%(length)s)) as id, count(*) as cnt 
                   from opds_catalog_book 
                   where upper(title) like '%(chars)s%%'
                   where upper(title) like '%(chars)s%%%%'
                   group by upper(substring(title,1,%(length)s)) 
                   order by id"""%{'length':length,'chars':chars}
          
@@ -830,13 +830,13 @@ class AuthorsFeed(AuthFeed):
        if self.lang_code:
            sql="""select %(length)s as l, upper(substring(last_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%%'
                   where lang_code=%(lang_code)s and upper(last_name) like '%(chars)s%%%%'
                   group by upper(substring(last_name,1,%(length)s)) 
                   order by id"""%{'length':length, 'lang_code':self.lang_code, 'chars':chars}
        else:
            sql="""select %(length)s as l, upper(substring(last_name,1,%(length)s)) as id, count(*) as cnt 
                   from opds_catalog_author 
                   where upper(last_name) like '%(chars)s%%'
                   where upper(last_name) like '%(chars)s%%%%'
                   group by upper(substring(last_name,1,%(length)s)) 
                   order by id"""%{'length':length,'chars':chars}
          
@@ -889,13 +889,13 @@ class SeriesFeed(AuthFeed):
        if self.lang_code:
            sql="""select %(length)s as l, upper(substring(ser,1,%(length)s)) as id, count(*) as cnt 
                   from opds_catalog_series 
                   where lang_code=%(lang_code)s and upper(ser) like '%(chars)s%%'
                   where lang_code=%(lang_code)s and upper(ser) like '%(chars)s%%%%'
                   group by upper(substring(ser,1,%(length)s)) 
                   order by id"""%{'length':length, 'lang_code':self.lang_code, 'chars':chars}
        else:
            sql="""select %(length)s as l, upper(substring(ser,1,%(length)s)) as id, count(*) as cnt 
                   from opds_catalog_series 
                   where upper(ser) like '%(chars)s%%'
                   where upper(ser) like '%(chars)s%%%%'
                   group by upper(substring(ser,1,%(length)s)) 
                   order by id"""%{'length':length,'chars':chars}
          
+1 −2
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ def BooksView(request):
               group by upper(substring(title,1,%(length)s)) 
               order by id"""%{'length':length,'chars':chars}
      
    print(sql)  
    items = Book.objects.raw(sql)
          
    args['items']=items