--- deliantra/server/ext/map-tags.ext	2007/09/13 08:35:24	1.5
+++ deliantra/server/ext/map-tags.ext	2007/09/19 22:07:16	1.9
@@ -79,9 +79,10 @@
 
    # we don't actually care if it succeeds or not, as we
    # will just retry an hour later
-   BDB::db_txn_commit $txn;
+   BDB::db_txn_finish $txn;
 
-#   warn "tag-updated $file (= $key) $hash\n";#d#
+   warn "tag-updated $file (= $key) <@tags>\n"
+      if @tags;
 }
 
 sub scan_static {
@@ -103,9 +104,36 @@
 }
 
 sub reload {
+   my $guard = cf::lock_acquire "map-tags::reload";
+
    my $start = Event::time;
 
    # 1. check for maps no longer existing
+   {
+      my @delkeys;
+
+      my $cursor = $db_mapinfo->cursor;
+      for (;;) {
+         BDB::db_c_get $cursor, my $key, my $data, BDB::NEXT;
+         last if $!;
+
+         my $data = JSON::XS::from_json $data;
+         my ($ver, undef, undef, $path) = split /,/, $data->{hash}, 4;
+         push @delkeys, [$key, $data->{tags}]
+            if $ver != 1 || Coro::AIO::aio_stat $path;
+      }
+      BDB::db_c_close $cursor;
+
+      for (@delkeys) {
+         my ($key, $tags) = @$_;
+         my $txn = $cf::DB_ENV->txn_begin;
+         BDB::db_del $db_mapinfo, $txn, $key;
+         for my $tag (@{ $tags || [] }) {
+            remove_tag_target $txn, $tag, $key;
+         }
+         BDB::db_txn_finish $txn;
+      }
+   }
 
    # 2. scan all static maps
    scan_static $cf::MAPDIR, "/";
@@ -152,6 +180,7 @@
    data     => cf::WF_AUTOCANCEL,
    cb       => Coro::unblock_sub {
       $Coro::current->prio (Coro::PRIO_MIN);
+      $Coro::current->desc ("map-tag scanner");
       reload;
    },
 );