Index: database.sql ================================================================== --- database.sql +++ database.sql @@ -134,15 +134,13 @@ ALTER TABLE ONLY rules ADD CONSTRAINT rules_pkey PRIMARY KEY (netmask); -- table to hold site arrays --- maybe full original domain should be added with trigger to leave tripdomain function away CREATE TABLE site ( id_site serial, - site text[] NOT NULL, - domain not null + site text[] NOT NULL ); ALTER TABLE ONLY site ADD CONSTRAINT site_id PRIMARY KEY (id_site); @@ -173,10 +171,12 @@ ALTER TABLE ONLY urls ADD CONSTRAINT urls_pkey PRIMARY KEY (date_added); CREATE UNIQUE INDEX urls_id_site ON urls USING btree (id_site); + +CREATE UNIQUE INDEX urls_id_tag ON urls USING btree (id_tag); -- rule to join all tables into one to simplify access -- automaticall uses current day and time data CREATE VIEW site_rule AS SELECT a.redirect_url, a.netmask, b.site, b.regexp Index: squid-tagger.py ================================================================== --- squid-tagger.py +++ squid-tagger.py @@ -13,15 +13,15 @@ import syslog self._syslog = syslog self._syslog.openlog('squidTag') def info(self, message): - if not self._syslog: + if self._syslog: self._syslog.syslog(self._syslog.LOG_INFO, message) def notice(self, message): - if not self._syslog: + if self._syslog: self._syslog.syslog(self._syslog.LOG_NOTICE, message) class tagDB: __slots__ = frozenset(['_prepared', '_check_stmt', '_db'])