From 815b43e56f6d7ddd7d1c2876c86226c6c2b6b369 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 23 Jan 2005 14:31:02 +0000
Subject: [PATCH] renamed tag to finger to avoid confusion (I tried to exmplain
 why I use term tag and failed -- it too similar to tags used in import_xml)

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@642 13eb9ef6-21d5-0310-b721-a9d68796d827
---
 WebPac.pm                               |  2 +-
 all2xml.pl                              |  2 +-
 index_DBI_tag.pm => index_DBI_filter.pm | 28 +++++++++++++------------
 3 files changed, 17 insertions(+), 15 deletions(-)
 rename index_DBI_tag.pm => index_DBI_filter.pm (90%)

diff --git a/WebPac.pm b/WebPac.pm
index d6356a2..5cc5f89 100644
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -12,7 +12,7 @@ use Text::Unaccent;
 use Data::Pageset;
 
 use lib '..';
-use index_DBI_tag;
+use index_DBI_filter;
 use back2html;
 
 
diff --git a/all2xml.pl b/all2xml.pl
index e0beef7..ee41297 100755
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -23,7 +23,7 @@ my $config;
 
 #use index_DBI;		# default DBI module for index
 #use index_DBI_cache;	# faster DBI module using memory cache
-use index_DBI_tag;	# tag support for indexes
+use index_DBI_filter;	# filter support for indexes
 my $index;
 
 my %opts;
diff --git a/index_DBI_tag.pm b/index_DBI_filter.pm
similarity index 90%
rename from index_DBI_tag.pm
rename to index_DBI_filter.pm
index 0220b71..5ac3208 100644
--- a/index_DBI_tag.pm
+++ b/index_DBI_filter.pm
@@ -68,7 +68,9 @@ sub delete_and_create {
 	my $sql_delete = "delete from $index";
 	my $sth = $self->{dbh}->prepare($sql_delete) || confess "can't prepare: $sql_delete";
 
-	unless ($sth->execute()) {
+	if ($sth->execute()) {
+		print STDERR "## deleted rows from table $index\n" if ($debug);
+	} else {
 		# can't delete from table, assume it doesn't exists!
 		$self->{dbh}->rollback;
 		$self->{dbh}->do($sql) || confess "SQL: $sql ".$self->{dbh}->errstr();
@@ -83,7 +85,7 @@ sub insert {
 	my $field = shift;
 	my $index_data = shift || print STDERR "\$index->insert($field,NULL,...)";
 	my $display = shift || $index_data;
-	my $tag = shift;
+	my $filter = shift;
 
 	if (! $index_data) {
 		print STDERR "\$index->insert() -- no value to insert\n";
@@ -106,7 +108,7 @@ sub insert {
 	}
 
 	$self->{c}->{$uc}->{$field}->{count}++;
-	$self->{c}->{$uc}->{$field}->{tag}->{$tag}++ if ($tag);
+	$self->{c}->{$uc}->{$field}->{filter}->{$filter}++ if ($filter);
 }
 
 sub count {
@@ -207,12 +209,12 @@ sub close {
 		);
 	});
 
-	$self->delete_and_create('tags', qq{
-		create table tags (
-			tag varchar(255),
+	$self->delete_and_create('filters', qq{
+		create table filters (
+			filter varchar(255),
 			ord int,
 			count int,
-			primary key (tag,ord)
+			primary key (filter,ord)
 		);
 	});
 
@@ -224,8 +226,8 @@ sub close {
 	my $sql = "insert into index  (name,ord,item,display,count) values (?,?,?,?,?)";
 	my $sth_index = $self->{dbh}->prepare($sql) || confess "$sql: ".$self->{dbh}->errstr();
 
-	$sql = "insert into tags (tag, ord, count) values (?,?,?)";
-	my $sth_tag = $self->{dbh}->prepare($sql) || confess "$sql: ".$self->{dbh}->errstr();
+	$sql = "insert into filters (filter, ord, count) values (?,?,?)";
+	my $sth_filter = $self->{dbh}->prepare($sql) || confess "$sql: ".$self->{dbh}->errstr();
 
 	my $ord = 0;
 	foreach my $key (@items) {
@@ -240,11 +242,11 @@ sub close {
 				$self->{c}->{$key}->{$field}->{count},
 			);
 
-			# store tags
-			next unless ($self->{c}->{$key}->{$field}->{tag});
+			# store filters
+			next unless ($self->{c}->{$key}->{$field}->{filter});
 
-			foreach my $tag (keys %{$self->{c}->{$key}->{$field}->{tag}}) {
-				$sth_tag->execute( $tag, $ord, $self->{c}->{$key}->{$field}->{tag}->{$tag} );
+			foreach my $filter (keys %{$self->{c}->{$key}->{$field}->{filter}}) {
+				$sth_filter->execute( $filter, $ord, $self->{c}->{$key}->{$field}->{filter}->{$filter} );
 			}
 		}
 
-- 
2.20.1