tasks scheduler, news views, Obsolete code cleaning
This commit is contained in:
@@ -17,7 +17,7 @@ class Search(models.Model):
|
||||
db_table = 'search'
|
||||
|
||||
def __str__(self):
|
||||
return "[{}] {}".format(self.type, self.search)
|
||||
return "[{}]->{}".format(self.type, self.search)
|
||||
|
||||
class Source(models.Model):
|
||||
id = models.SmallAutoField(primary_key=True)
|
||||
@@ -28,7 +28,7 @@ class Source(models.Model):
|
||||
db_table = 'source'
|
||||
|
||||
def __str__(self):
|
||||
return self.source
|
||||
return "[{}]".format(self.source)
|
||||
|
||||
class StatusPatternMatching(models.Model):
|
||||
pattern = models.TextField(primary_key=True)
|
||||
@@ -82,7 +82,7 @@ class Urls(models.Model):
|
||||
ordering = ["-ts_fetch"]
|
||||
|
||||
def __str__(self):
|
||||
return "{} {} {}".format(self.url, self.ts_fetch, self.status)
|
||||
return "URL: {} Fetch:{} Status:{}".format(self.url, self.ts_fetch, self.status)
|
||||
|
||||
|
||||
class UrlsDuplicate(models.Model):
|
||||
@@ -95,8 +95,7 @@ class UrlsDuplicate(models.Model):
|
||||
unique_together = (('id_url_canonical', 'id_url_duplicated'),)
|
||||
|
||||
def __str__(self):
|
||||
return Urls(id=self.id_url_duplicated), Urls(id=self.id_url_canonical)
|
||||
|
||||
return "{} {} ".format(self.id_url_duplicated, self.id_url_canonical)
|
||||
|
||||
class UrlsSourceSearch(models.Model):
|
||||
id_url = models.OneToOneField(Urls, models.DO_NOTHING, db_column='id_url', primary_key=True) # The composite primary key (id_url, id_source, id_search) found, that is not supported. The first column is selected.
|
||||
@@ -109,4 +108,4 @@ class UrlsSourceSearch(models.Model):
|
||||
unique_together = (('id_url', 'id_source', 'id_search'),)
|
||||
|
||||
def __str__(self):
|
||||
return Urls(id=self.id_url), Source(id=self.id_source), Search(id=self.id_search)
|
||||
return "{} {} {}".format(self.id_source, self.id_search, self.id_url)
|
||||
|
||||
Reference in New Issue
Block a user