stdlib: Remove support for Dets version 8 tables

When at it, types have been added to record fields.

1 files changed, 189 insertions, 291 deletions

diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 8ce29f23d3..5bc9475fc8 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -105,9 +105,6 @@
 %%% the file with the split indicator, size etc is held in ram by the
 %%% server at all times.
 %%%
-%%% The parts specific for formats up to and including 8(c) are
-%%% implemented in dets_v8.erl, parts specific for format 9 are
-%%% implemented in dets_v9.erl.
 
 %%  The method of hashing is the so called linear hashing algorithm
 %%  with segments. 
@@ -140,28 +137,33 @@
 %%% written, and a repair is forced next time the file is opened.
 
 -record(dets_cont, {
-         what,        % object | bindings | select | bchunk
-	 no_objs,     % requested number of objects: default | integer() > 0
-	 bin,         % small chunk not consumed, or 'eof' at end-of-file
-	 alloc,       % the part of the file not yet scanned, mostly a binary
-	 tab,
-         proc,        % the pid of the Dets process
-         match_program % true | compiled_match_spec() | undefined
+          what :: 'undefined' | 'bchunk' | 'bindings' | 'object' | 'select',
+          no_objs :: 'default' | pos_integer(), % requested number of objects
+          bin :: 'eof' | binary(), % small chunk not consumed,
+                                  % or 'eof' at end-of-file
+          alloc :: binary() % the part of the file not yet scanned
+                 | {From :: non_neg_integer(),
+                    To :: non_neg_integer,
+                    binary()},
+          tab :: tab_name(),
+          proc :: 'undefined' | pid(), % the pid of the Dets process
+          match_program :: 'true'
+                         | 'undefined'
+                         | {'match_spec', ets:comp_match_spec()}
 	 }).
 
 -record(open_args, {
-          file,
-          type,
-          keypos,
-          repair,
-          min_no_slots,
-	  max_no_slots,
-          ram_file,
-          delayed_write,
-          auto_save,
-          access,
-          version,
-          debug
+          file :: list(),
+          type :: type(),
+          keypos :: keypos(),
+          repair :: 'force' | boolean(),
+          min_no_slots :: no_slots(),
+	  max_no_slots :: no_slots(),
+          ram_file :: boolean(),
+          delayed_write :: cache_parms(),
+          auto_save :: auto_save(),
+          access :: access(),
+          debug :: boolean()
          }).
 
 -define(PATTERN_TO_OBJECT_MATCH_SPEC(Pat), [{Pat,[],['$_']}]).
@@ -177,20 +179,13 @@
 %%-define(PROFILE(C), C).
 -define(PROFILE(C), void).
 
--type access()    :: 'read' | 'read_write'.
--type auto_save() :: 'infinity' | non_neg_integer().
 -opaque bindings_cont() :: #dets_cont{}.
 -opaque cont()    :: #dets_cont{}.
--type keypos()    :: pos_integer().
 -type match_spec()  :: ets:match_spec().
 -type object()    :: tuple().
--type no_slots()  :: non_neg_integer() | 'default'.
 -opaque object_cont() :: #dets_cont{}.
 -type pattern()   :: atom() | tuple().
 -opaque select_cont() :: #dets_cont{}.
--type tab_name() :: term().
--type type()      :: 'bag' | 'duplicate_bag' | 'set'.
--type version()   :: 8 | 9 | 'default'.
 
 %%% Some further debug code was added in R12B-1 (stdlib-1.15.1):
 %%% - there is a new open_file() option 'debug';
@@ -273,19 +268,20 @@ delete_all_objects(Tab) ->
 delete_object(Tab, O) ->
     badarg(treq(Tab, {delete_object, [O]}), [Tab, O]).
 
+%% Backwards compatibility.
+fsck(Fname, _Version) ->
+    fsck(Fname).
+
 %% Given a filename, fsck it. Debug.
 fsck(Fname) ->
-    fsck(Fname, default).
-
-fsck(Fname, Version) ->
     catch begin
       {ok, Fd, FH} = read_file_header(Fname, read, false),
       ?DEBUGF("FileHeader: ~p~n", [FH]),	    
-      case (FH#fileheader.mod):check_file_header(FH, Fd) of
+      case dets_v9:check_file_header(FH, Fd) of
           {error, not_closed} ->
-              fsck(Fd, make_ref(), Fname, FH, default, default, Version);
-          {ok, _Head, _Extra} ->
-              fsck(Fd, make_ref(), Fname, FH, default, default, Version);
+              fsck(Fd, make_ref(), Fname, FH, default, default);
+          {ok, _Head} ->
+              fsck(Fd, make_ref(), Fname, FH, default, default);
           Error ->
               Error
       end
@@ -372,7 +368,7 @@ info(Tab) ->
       Item :: 'access' | 'auto_save' | 'bchunk_format'
             | 'hash' | 'file_size' | 'filename' | 'keypos' | 'memory'
             | 'no_keys' | 'no_objects' | 'no_slots' | 'owner' | 'ram_file'
-            | 'safe_fixed' | 'safe_fixed_monotonic_time' | 'size' | 'type' | 'version',
+            | 'safe_fixed' | 'safe_fixed_monotonic_time' | 'size' | 'type',
       Value :: term().
 
 info(Tab, owner) ->
@@ -640,8 +636,7 @@ open_file(File) ->
                 | {'keypos', keypos()}
                 | {'ram_file', boolean()}
                 | {'repair', boolean() | 'force'}
-                | {'type', type()}
-                | {'version', version()},
+                | {'type', type()},
       Reason :: term().
 
 open_file(Tab, Args) when is_list(Args) ->
@@ -674,13 +669,13 @@ remove_user(Pid, From) ->
       Continuation2 :: select_cont(),
       MatchSpec :: match_spec().
 
-repair_continuation(#dets_cont{match_program = B}=Cont, MS) 
-    when is_binary(B) ->
+repair_continuation(#dets_cont{match_program = {match_spec, B}}=Cont, MS) ->
     case ets:is_compiled_ms(B) of
 	true ->
 	    Cont;
 	false ->
-            Cont#dets_cont{match_program = ets:match_spec_compile(MS)}
+            Cont#dets_cont{match_program = {match_spec,
+                                            ets:match_spec_compile(MS)}}
     end;
 repair_continuation(#dets_cont{}=Cont, _MS) ->
     Cont;
@@ -999,7 +994,9 @@ init_chunk_match(Tab, Pat, What, N, Safe) when is_integer(N), N >= 0;
                     case req(Proc, {match, MP, Spec, N, Safe}) of
                         {done, L} ->
                             {L, #dets_cont{tab = Tab, proc = Proc,
-                                           what = What, bin = eof}};
+                                           what = What, bin = eof,
+                                           no_objs = default,
+                                           alloc = <<>>}};
                         {cont, State} ->
                             chunk_match(State#dets_cont{what = What,
                                                         tab = Tab,
@@ -1041,17 +1038,17 @@ chunk_match(#dets_cont{proc = Proc}=State, Safe) ->
 
 do_foldl_bins(Bins, true) ->
     foldl_bins(Bins, []);
-do_foldl_bins(Bins, MP) ->
+do_foldl_bins(Bins, {match_spec, MP}) ->
     foldl_bins(Bins, MP, []).
 
 foldl_bins([], Terms) ->
-    %% Preserve time order (version 9). 
+    %% Preserve time order.
     Terms;
 foldl_bins([Bin | Bins], Terms) ->    
     foldl_bins(Bins, [binary_to_term(Bin) | Terms]).
 
 foldl_bins([], _MP, Terms) ->
-    %% Preserve time order (version 9).
+    %% Preserve time order.
     Terms;
 foldl_bins([Bin | Bins], MP, Terms) ->
     Term = binary_to_term(Bin),
@@ -1068,7 +1065,7 @@ compile_match_spec(select, ?PATTERN_TO_OBJECT_MATCH_SPEC('_') = Spec) ->
 compile_match_spec(select, Spec) ->
     case catch ets:match_spec_compile(Spec) of
 	X when is_binary(X) ->
-	    {Spec, X};
+	    {Spec, {match_spec, X}};
 	_ ->
 	    badarg
     end;
@@ -1091,16 +1088,10 @@ defaults(Tab, Args) ->
                            delayed_write = ?DEFAULT_CACHE,
                            auto_save = timer:minutes(?DEFAULT_AUTOSAVE),
                            access = read_write,
-                           version = default,
                            debug = false},
     Fun = fun repl/2,
     Defaults = lists:foldl(Fun, Defaults0, Args),
-    case Defaults#open_args.version of
-        8 ->
-            Defaults#open_args{max_no_slots = default};
-        _ ->
-            is_comp_min_max(Defaults)
-    end.
+    is_comp_min_max(Defaults).
 
 to_list(T) when is_atom(T) -> atom_to_list(T);
 to_list(T) -> T.
@@ -1131,7 +1122,6 @@ repl({file, File}, Defs) when is_atom(File) ->
 repl({keypos, P}, Defs) when is_integer(P), P > 0 ->
     Defs#open_args{keypos =P};
 repl({max_no_slots, I}, Defs)  ->
-    %% Version 9 only.
     MaxSlots = is_max_no_slots(I),
     Defs#open_args{max_no_slots = MaxSlots};
 repl({min_no_slots, I}, Defs)  ->
@@ -1147,8 +1137,9 @@ repl({type, T}, Defs) ->
     mem(T, [set, bag, duplicate_bag]),
     Defs#open_args{type =T};
 repl({version, Version}, Defs) ->
-    V = is_version(Version),
-    Defs#open_args{version = V};
+    %% Backwards compatibility.
+    is_version(Version),
+    Defs;
 repl({debug, Bool}, Defs) ->
     %% Not documented.
     mem(Bool, [true, false]),
@@ -1164,16 +1155,15 @@ is_max_no_slots(default) -> default;
 is_max_no_slots(I) when is_integer(I), I > 0, I < 1 bsl 31 -> I.
 
 is_comp_min_max(Defs) ->
-    #open_args{max_no_slots = Max, min_no_slots = Min, version = V} = Defs,
-    case V of
-	_ when Min =:= default -> Defs;
-	_ when Max =:= default -> Defs;
-	_ -> true = Min =< Max, Defs
+    #open_args{max_no_slots = Max, min_no_slots = Min} = Defs,
+    if
+        Min =:= default -> Defs;
+	Max =:= default -> Defs;
+	true -> true = Min =< Max, Defs
     end.
 
-is_version(default) -> default;
-is_version(8) -> 8;
-is_version(9) -> 9.
+is_version(default) -> true;
+is_version(9) -> true.
 
 mem(X, L) ->
     case lists:member(X, L) of
@@ -1288,17 +1278,23 @@ badarg_exit(Reply, _A) ->
 
 init(Parent, Server) ->
     process_flag(trap_exit, true),
-    open_file_loop(#head{parent = Parent, server = Server}).
-
-open_file_loop(Head) ->
     %% The Dets server pretends the file is open before
     %% internal_open() has been called, which means that unless the
     %% internal_open message is applied first, other processes can
     %% find the pid by calling dets_server:get_pid() and do things
     %% before Head has been initialized properly.
     receive
-        ?DETS_CALL(From, {internal_open, _Ref, _Args}=Op) ->
-            do_apply_op(Op, From, Head, 0)
+        ?DETS_CALL(From, {internal_open, Ref, Args}=Op) ->
+            try do_internal_open(Parent, Server, From, Ref, Args) of
+                Head ->
+                    open_file_loop(Head, 0)
+            catch
+                exit:normal ->
+                    exit(normal);
+                _:Bad ->
+                    bug_found(no_name, Op, Bad, From),
+                    exit(Bad) % give up
+            end
     end.
 
 open_file_loop(Head, N) when element(1, Head#head.update_mode) =:= error ->
@@ -1379,28 +1375,7 @@ do_apply_op(Op, From, Head, N) ->
         exit:normal -> 
             exit(normal);
         _:Bad -> 
-            Name = Head#head.name,
-            case dets_utils:debug_mode() of
-                true ->
-                    %% If stream_op/5 found more requests, this is not
-                    %% the last operation.
-                    error_logger:format
-                      ("** dets: Bug was found when accessing table ~w,~n"
-                       "** dets: operation was ~p and reply was ~w.~n"
-                       "** dets: Stacktrace: ~w~n",
-                       [Name, Op, Bad, erlang:get_stacktrace()]);
-                false ->
-                    error_logger:format
-                      ("** dets: Bug was found when accessing table ~w~n",
-                       [Name])
-            end,
-            if
-                From =/= self() ->
-                    From ! {self(), {error, {dets_bug, Name, Op, Bad}}},
-                    ok;
-                true -> % auto_save | may_grow | {delayed_write, _}
-                    ok
-            end,
+            bug_found(Head#head.name, Op, Bad, From),
             open_file_loop(Head, N)
     end.
 
@@ -1408,10 +1383,7 @@ apply_op(Op, From, Head, N) ->
     case Op of
 	{add_user, Tab, OpenArgs}->
             #open_args{file = Fname, type = Type, keypos = Keypos, 
-                       ram_file = Ram, access = Access, 
-		       version = Version} = OpenArgs,
-            VersionOK = (Version =:= default) or 
-                        (Head#head.version =:= Version),
+                       ram_file = Ram, access = Access} = OpenArgs,
 	    %% min_no_slots and max_no_slots are not tested
 	    Res = if
 		      Tab =:= Head#head.name,
@@ -1419,7 +1391,6 @@ apply_op(Op, From, Head, N) ->
 		      Head#head.type =:= Type,
 		      Head#head.ram_file =:= Ram,
 		      Head#head.access =:= Access,
-		      VersionOK,
 		      Fname =:= Head#head.filename ->
 			  ok;
 		      true ->
@@ -1475,21 +1446,14 @@ apply_op(Op, From, Head, N) ->
             From ! {self(), Res},
             ok;
 	{internal_open, Ref, Args} ->
-	    ?PROFILE(ep:do()),
-	    case do_open_file(Args, Head#head.parent, Head#head.server,Ref) of
-		{ok, H2} -> 
-		    From ! {self(), ok},
-		    H2;
-		Error -> 
-		    From ! {self(), Error},
-		    exit(normal)
-	    end;
+            do_internal_open(Head#head.parent, Head#head.server, From,
+                             Ref, Args);
 	may_grow when Head#head.update_mode =/= saved ->
 	    if
 		Head#head.update_mode =:= dirty ->
 		    %% Won't grow more if the table is full.
 		    {H2, _Res} = 
-			(Head#head.mod):may_grow(Head, 0, many_times),
+			dets_v9:may_grow(Head, 0, many_times),
 		    {N + 1, H2};
 		true -> 
 		    ok
@@ -1519,21 +1483,10 @@ apply_op(Op, From, Head, N) ->
 	    From ! {self(), Res},
 	    erlang:garbage_collect(),
 	    {0, H2};
-	{delete_key, Keys} when Head#head.update_mode =:= dirty ->
-	    if
-		Head#head.version =:= 8 ->
-		    {H2, Res} = fdelete_key(Head, Keys),
-		    From ! {self(), Res},
-		    {N + 1, H2};
-		true ->
-		    stream_op(Op, From, [], Head, N)
-	    end;
+	{delete_key, _Keys} when Head#head.update_mode =:= dirty ->
+            stream_op(Op, From, [], Head, N);
 	{delete_object, Objs} when Head#head.update_mode =:= dirty ->
 	    case check_objects(Objs, Head#head.keypos) of
-		true when Head#head.version =:= 8 ->
-		    {H2, Res} = fdelete_object(Head, Objs),
-		    From ! {self(), Res},
-		    {N + 1, H2};
 		true ->
 		    stream_op(Op, From, [], Head, N);
 		false ->
@@ -1551,10 +1504,6 @@ apply_op(Op, From, Head, N) ->
             H2;
 	{insert, Objs} when Head#head.update_mode =:= dirty ->
 	    case check_objects(Objs, Head#head.keypos) of
-		true when Head#head.version =:= 8 ->
-		    {H2, Res} = finsert(Head, Objs),
-		    From ! {self(), Res},
-		    {N + 1, H2};
 		true ->
 		    stream_op(Op, From, [], Head, N);
 		false ->
@@ -1565,10 +1514,6 @@ apply_op(Op, From, Head, N) ->
             {H2, Res} = finsert_new(Head, Objs),
             From ! {self(), Res},
             {N + 1, H2};
-	{lookup_keys, Keys}  when Head#head.version =:= 8 ->
-	    {H2, Res} = flookup_keys(Head, Keys),
-	    From ! {self(), Res},
-	    H2;
 	{lookup_keys, _Keys} ->
 	    stream_op(Op, From, [], Head, N);
 	{match_init, State, Safe} ->
@@ -1584,10 +1529,6 @@ apply_op(Op, From, Head, N) ->
 	    {H2, Res} = fmatch(Head, MP, Spec, NObjs, Safe, From),
 	    From ! {self(), Res},
 	    H2;
-	{member, Key} when Head#head.version =:= 8 ->
-	    {H2, Res} = fmember(Head, Key),
-	    From ! {self(), Res},
-	    H2;
 	{member, _Key} = Op ->
 	    stream_op(Op, From, [], Head, N);
 	{next, Key} ->
@@ -1628,7 +1569,7 @@ apply_op(Op, From, Head, N) ->
 	    apply_op(WriteOp, From, H2, 0);
 	WriteOp when Head#head.access =:= read_write,
 		     Head#head.update_mode =:= saved ->
-	    case catch (Head#head.mod):mark_dirty(Head) of
+	    case catch dets_v9:mark_dirty(Head) of
 		ok ->
 		    start_auto_save_timer(Head),
 		    H2 = Head#head{update_mode = dirty},
@@ -1643,6 +1584,40 @@ apply_op(Op, From, Head, N) ->
 	    ok
     end.
 
+bug_found(Name, Op, Bad, From) ->
+    case dets_utils:debug_mode() of
+        true ->
+            %% If stream_op/5 found more requests, this is not
+            %% the last operation.
+            error_logger:format
+              ("** dets: Bug was found when accessing table ~w,~n"
+               "** dets: operation was ~p and reply was ~w.~n"
+               "** dets: Stacktrace: ~w~n",
+               [Name, Op, Bad, erlang:get_stacktrace()]);
+        false ->
+            error_logger:format
+              ("** dets: Bug was found when accessing table ~w~n",
+               [Name])
+    end,
+    if
+        From =/= self() ->
+            From ! {self(), {error, {dets_bug, Name, Op, Bad}}},
+            ok;
+        true -> % auto_save | may_grow | {delayed_write, _}
+            ok
+    end.
+
+do_internal_open(Parent, Server, From, Ref, Args) ->
+    ?PROFILE(ep:do()),
+    case do_open_file(Args, Parent, Server, Ref) of
+        {ok, Head} ->
+            From ! {self(), ok},
+            Head;
+        Error ->
+            From ! {self(), Error},
+            exit(normal)
+    end.
+
 start_auto_save_timer(Head) when Head#head.auto_save =:= infinity ->
     ok;
 start_auto_save_timer(Head) ->
@@ -1650,7 +1625,7 @@ start_auto_save_timer(Head) ->
     _Ref = erlang:send_after(Millis, self(), ?DETS_CALL(self(), auto_save)),
     ok.
 
-%% Version 9: Peek the message queue and try to evaluate several
+%% Peek the message queue and try to evaluate several
 %% lookup requests in parallel. Evalute delete_object, delete and
 %% insert as well.
 stream_op(Op, Pid, Pids, Head, N) ->
@@ -1760,7 +1735,7 @@ lookup_reply(P, O) ->
 %% Callback functions for system messages handling.
 %%-----------------------------------------------------------------
 system_continue(_Parent, _, Head) ->
-    open_file_loop(Head).
+    open_file_loop(Head, 0).
 
 system_terminate(Reason, _Parent, _, Head) ->
     _NewHead = do_stop(Head),
@@ -1793,7 +1768,8 @@ read_file_header(FileName, Access, RamFile) ->
         dets_utils:pread_close(Fd, FileName, ?FILE_FORMAT_VERSION_POS, 4),
     if 
         Version =< 8 ->
-            dets_v8:read_file_header(Fd, FileName);
+            _ = file:close(Fd),
+            throw({error, {format_8_no_longer_supported, FileName}});
         Version =:= 9 ->
             dets_v9:read_file_header(Fd, FileName);
         true ->
@@ -1820,7 +1796,7 @@ perform_save(Head, DoSync) when Head#head.update_mode =:= dirty;
 				Head#head.update_mode =:= new_dirty ->
     case catch begin
                    {Head1, []} = write_cache(Head),
-                   {Head2, ok} = (Head1#head.mod):do_perform_save(Head1),
+                   {Head2, ok} = dets_v9:do_perform_save(Head1),
                    ok = ensure_written(Head2, DoSync),
                    {Head2#head{update_mode = saved}, ok}
                end of
@@ -1853,7 +1829,7 @@ ensure_written(Head, false) when not Head#head.ram_file ->
 do_bchunk_init(Head, Tab) ->
     case catch write_cache(Head) of
 	{H2, []} ->
-	    case (H2#head.mod):table_parameters(H2) of
+	    case dets_v9:table_parameters(H2) of
 		undefined ->
 		    {H2, {error, old_version}};
 		Parms ->
@@ -1862,9 +1838,9 @@ do_bchunk_init(Head, Tab) ->
                               L =:= <<>> -> eof;
                               true -> <<>>
                           end,
-                    C0 = #dets_cont{no_objs = default, bin = Bin, alloc = L},
 		    BinParms = term_to_binary(Parms),
-		    {H2, {C0#dets_cont{tab = Tab, proc = self(),what = bchunk},
+		    {H2, {#dets_cont{no_objs = default, bin = Bin, alloc = L,
+                                     tab = Tab, proc = self(),what = bchunk},
                           [BinParms]}}
 	    end;
 	{NewHead, _} = HeadError when is_record(NewHead, head) ->
@@ -1904,16 +1880,8 @@ do_delete_all_objects(Head) ->
 	  max_no_slots = MaxSlots, cache = Cache} = Head, 
     CacheSz = dets_utils:cache_size(Cache),
     ok = dets_utils:truncate(Fd, Fname, bof),
-    (Head#head.mod):initiate_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots,
-				  Ram, CacheSz, Auto, true).
-
-%% -> {NewHead, Reply}, Reply = ok | Error.
-fdelete_key(Head, Keys) ->
-    do_delete(Head, Keys, delete_key).
-
-%% -> {NewHead, Reply}, Reply = ok | badarg | Error.
-fdelete_object(Head, Objects) ->
-    do_delete(Head, Objects, delete_object).
+    dets_v9:initiate_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots,
+                          Ram, CacheSz, Auto, true).
 
 ffirst(H) ->
     Ref = make_ref(),
@@ -1930,7 +1898,7 @@ ffirst1(H) ->
     ffirst(NH, 0).
 
 ffirst(H, Slot) ->
-    case (H#head.mod):slot_objs(H, Slot) of
+    case dets_v9:slot_objs(H, Slot) of
 	'$end_of_table' -> {H, '$end_of_table'};
 	[] -> ffirst(H, Slot+1);
 	[X|_] -> {H, element(H#head.keypos, X)}
@@ -2067,7 +2035,7 @@ finfo(H, auto_save) -> {H, H#head.auto_save};
 finfo(H, bchunk_format) -> 
     case catch write_cache(H) of
         {H2, []} ->
-            case (H2#head.mod):table_parameters(H2) of
+            case dets_v9:table_parameters(H2) of
                 undefined = Undef ->
                     {H2, Undef};
                 Parms ->
@@ -2100,7 +2068,7 @@ finfo(H, no_keys) ->
 	{H2, _} = HeadError when is_record(H2, head) ->
 	    HeadError
     end;
-finfo(H, no_slots) -> {H, (H#head.mod):no_slots(H)};
+finfo(H, no_slots) -> {H, dets_v9:no_slots(H)};
 finfo(H, pid) -> {H, self()};
 finfo(H, ram_file) -> {H, H#head.ram_file};
 finfo(H, safe_fixed) ->
@@ -2127,7 +2095,7 @@ finfo(H, size) ->
 	    HeadError
     end;
 finfo(H, type) -> {H, H#head.type};
-finfo(H, version) -> {H, H#head.version};
+finfo(H, version) -> {H, 9};
 finfo(H, _) -> {H, undefined}.
 
 file_size(Fd, FileName) -> 
@@ -2136,8 +2104,6 @@ file_size(Fd, FileName) ->
 
 test_bchunk_format(_Head, undefined) ->
     false;
-test_bchunk_format(Head, _Term) when Head#head.version =:= 8 ->
-    false;
 test_bchunk_format(Head, Term) ->
     dets_v9:try_bchunk_header(Term, Head) =/= not_ok.
 
@@ -2206,7 +2172,7 @@ do_finit(Head, Init, Format, NoSlots) ->
     #head{fptr = Fd, type = Type, keypos = Kp, auto_save = Auto,
           cache = Cache, filename = Fname, ram_file = Ram,
 	  min_no_slots = MinSlots0, max_no_slots = MaxSlots,
-          name = Tab, update_mode = UpdateMode, mod = HMod} = Head,
+          name = Tab, update_mode = UpdateMode} = Head,
     CacheSz = dets_utils:cache_size(Cache),
     {How, Head1} =
 	case Format of
@@ -2219,9 +2185,10 @@ do_finit(Head, Init, Format, NoSlots) ->
 			{general_init, Head};
 		    true ->
 			ok = dets_utils:truncate(Fd, Fname, bof),
-			{ok, H} = HMod:initiate_file(Fd, Tab, Fname, Type, Kp,
-						     MinSlots, MaxSlots, Ram,
-						     CacheSz, Auto, false),
+			{ok, H} =
+                            dets_v9:initiate_file(Fd, Tab, Fname, Type, Kp,
+                                                  MinSlots, MaxSlots, Ram,
+                                                  CacheSz, Auto, false),
 			{general_init, H}
 		end;
 	    bchunk ->
@@ -2230,7 +2197,7 @@ do_finit(Head, Init, Format, NoSlots) ->
 	end,
     case How of
 	bchunk_init -> 
-	    case HMod:bchunk_init(Head1, Init) of
+	    case dets_v9:bchunk_init(Head1, Init) of
 		{ok, NewHead} ->
 		    {ok, NewHead#head{update_mode = dirty}};
 		Error ->
@@ -2238,10 +2205,10 @@ do_finit(Head, Init, Format, NoSlots) ->
 	    end;
 	general_init ->
 	    Cntrs = ets:new(dets_init, []),
-	    Input = HMod:bulk_input(Head1, Init, Cntrs),
+	    Input = dets_v9:bulk_input(Head1, Init, Cntrs),
 	    SlotNumbers = {Head1#head.min_no_slots, bulk_init, MaxSlots},
 	    {Reply, SizeData} = 
-		do_sort(Head1, SlotNumbers, Input, Cntrs, Fname, not_used),
+		do_sort(Head1, SlotNumbers, Input, Cntrs, Fname),
 	    Bulk = true,
 	    case Reply of 
 		{ok, NoDups, H1} ->
@@ -2297,7 +2264,8 @@ fmatch(Head, MP, Spec, N, Safe, From) ->
 	    {NewHead, Reply} = flookup_keys(Head, Keys),
 	    case Reply of
 		Objs when is_list(Objs) ->
-		    MatchingObjs = ets:match_spec_run(Objs, MP),
+                    {match_spec, MS} = MP,
+		    MatchingObjs = ets:match_spec_run(Objs, MS),
 		    {NewHead, {done, MatchingObjs}};
 		Error ->
 		    {NewHead, Error}
@@ -2377,7 +2345,7 @@ fmatch_delete(Head, C) ->
 	{[], _} ->
 	    {Head, {done, 0}};
 	{RTs, NC} ->
-	    MP = C#dets_cont.match_program,
+	    {match_spec, MP} = C#dets_cont.match_program,
 	    case catch filter_binary_terms(RTs, MP, []) of
 		{'EXIT', _} ->
                     Bad = dets_utils:bad_object(fmatch_delete, RTs),
@@ -2405,7 +2373,7 @@ do_fmatch_delete_var_keys(Head, MP, _Spec, From) ->
     C0 = init_scan(NewHead, default),
     {NewHead, {cont, C0#dets_cont{match_program = MP}, 0}}.
 
-do_fmatch_constant_keys(Head, Keys, MP) ->
+do_fmatch_constant_keys(Head, Keys, {match_spec, MP}) ->
     case flookup_keys(Head, Keys) of
 	{NewHead, ReadTerms} when is_list(ReadTerms) ->
 	    Terms = filter_terms(ReadTerms, MP, []),
@@ -2454,18 +2422,8 @@ do_delete(Head, Things, What) ->
 	    HeadError
     end.
 
-fmember(Head, Key) ->
-    case catch begin
-                   {Head2, [{_NoPid,Objs}]} = 
-                       update_cache(Head, [Key], {lookup, nopid}),
-                   {Head2, Objs =/= []}
-               end of
-        {NewHead, _} = Reply when is_record(NewHead, head) ->
-            Reply
-    end.
-
 fnext(Head, Key) ->
-    Slot = (Head#head.mod):db_hash(Key, Head),
+    Slot = dets_v9:db_hash(Key, Head),
     Ref = make_ref(),
     case catch {Ref, fnext(Head, Key, Slot)} of
 	{Ref, {H, R}} -> 
@@ -2476,7 +2434,7 @@ fnext(Head, Key) ->
 
 fnext(H, Key, Slot) ->
     {NH, []} = write_cache(H),
-    case (H#head.mod):slot_objs(NH, Slot) of
+    case dets_v9:slot_objs(NH, Slot) of
 	'$end_of_table' -> {NH, '$end_of_table'};
 	L -> fnext_search(NH, Key, Slot, L)
     end.
@@ -2490,7 +2448,7 @@ fnext_search(H, K, Slot, L) ->
 
 %% We've got to continue to search for the next key in the next slot
 fnext_slot(H, K, Slot) ->
-    case (H#head.mod):slot_objs(H, Slot) of
+    case dets_v9:slot_objs(H, Slot) of
 	'$end_of_table' -> {H, '$end_of_table'};
 	[] -> fnext_slot(H, K, Slot+1);
 	L -> {H, element(H#head.keypos, hd(L))}
@@ -2518,11 +2476,10 @@ fopen2(Fname, Tab) ->
 	    Acc = read_write,
 	    Ram = false, 
 	    {ok, Fd, FH} = read_file_header(Fname, Acc, Ram),
-            Mod = FH#fileheader.mod,
-            Do = case Mod:check_file_header(FH, Fd) of
-                     {ok, Head1, ExtraInfo} ->
+            Do = case dets_v9:check_file_header(FH, Fd) of
+                     {ok, Head1} ->
                          Head2 = Head1#head{filename = Fname},
-                         try {ok, Mod:init_freelist(Head2, ExtraInfo)}
+                         try {ok, dets_v9:init_freelist(Head2)}
                          catch
                              throw:_ ->
                                  {repair, " has bad free lists, repairing ..."}
@@ -2536,8 +2493,7 @@ fopen2(Fname, Tab) ->
             case Do of
 		{repair, Mess} ->
                     io:format(user, "dets: file ~tp~s~n", [Fname, Mess]),
-                    Version = default,
-                    case fsck(Fd, Tab, Fname, FH, default, default, Version) of
+                    case fsck(Fd, Tab, Fname, FH, default, default) of
                         ok ->
                             fopen2(Fname, Tab);
                         Error ->
@@ -2570,33 +2526,23 @@ fopen_existing_file(Tab, OpenArgs) ->
     #open_args{file = Fname, type = Type, keypos = Kp, repair = Rep,
                min_no_slots = MinSlots, max_no_slots = MaxSlots,
                ram_file = Ram, delayed_write = CacheSz, auto_save =
-               Auto, access = Acc, version = Version, debug = Debug} =
+               Auto, access = Acc, debug = Debug} =
         OpenArgs,
     {ok, Fd, FH} = read_file_header(Fname, Acc, Ram),
-    V9 = (Version =:= 9) or (Version =:= default),
     MinF = (MinSlots =:= default) or (MinSlots =:= FH#fileheader.min_no_slots),
     MaxF = (MaxSlots =:= default) or (MaxSlots =:= FH#fileheader.max_no_slots),
-    Mod = (FH#fileheader.mod),
-    Wh = case Mod:check_file_header(FH, Fd) of
-	     {ok, Head, true} when Rep =:= force, Acc =:= read_write,
-				   FH#fileheader.version =:= 9,
-				   FH#fileheader.no_colls =/= undefined,
-				   MinF, MaxF, V9 ->
-		 {compact, Head, true};
-             {ok, _Head, _Extra} when Rep =:= force, Acc =:= read ->
+    Wh = case dets_v9:check_file_header(FH, Fd) of
+	     {ok, Head} when Rep =:= force, Acc =:= read_write,
+                             FH#fileheader.no_colls =/= undefined,
+                             MinF, MaxF ->
+	         {compact, Head};
+             {ok, _Head} when Rep =:= force, Acc =:= read ->
                  throw({error, {access_mode, Fname}});
-	     {ok, Head, need_compacting} when Acc =:= read ->
-                 {final, Head, true}; % Version 8 only.
-	     {ok, _Head, need_compacting} when Rep =:= true ->
-		 %% The file needs to be compacted due to a very big
-		 %% and fragmented free_list. Version 8 only.
-		 M = " is now compacted ...",
-		 {repair, M};
-	     {ok, _Head, _Extra} when Rep =:= force ->
+	     {ok, _Head} when Rep =:= force ->
 		 M = ", repair forced.",
 		 {repair, M};
-	     {ok, Head, ExtraInfo} ->
-		 {final, Head, ExtraInfo};
+	     {ok, Head} ->
+		 {final, Head};
 	     {error, not_closed} when Rep =:= force, Acc =:= read_write ->
 		 M = ", repair forced.",
 		 {repair, M};
@@ -2605,17 +2551,13 @@ fopen_existing_file(Tab, OpenArgs) ->
 		 {repair, M};
 	     {error, not_closed} when Rep =:= false ->
 		 throw({error, {needs_repair, Fname}});
-	     {error, version_bump} when Rep =:= true, Acc =:= read_write ->
-                 %% Version 8 only
-		 M = " old version, upgrading ...",
-		 {repair, M};
 	     {error, Reason} ->
 		 throw({error, {Reason, Fname}})
 	 end,
     Do = case Wh of
-             {Tag, Hd, Extra} when Tag =:= final; Tag =:= compact ->
+             {Tag, Hd} when Tag =:= final; Tag =:= compact ->
                  Hd1 = Hd#head{filename = Fname},
-                 try {Tag, Mod:init_freelist(Hd1, Extra)}
+                 try {Tag, dets_v9:init_freelist(Hd1)}
                  catch
                      throw:_ ->
                          {repair, " has bad free lists, repairing ..."}
@@ -2643,23 +2585,20 @@ fopen_existing_file(Tab, OpenArgs) ->
 			      "now repairing ...~n", [Fname]),
                     {ok, Fd2, _FH} = read_file_header(Fname, Acc, Ram),
                     do_repair(Fd2, Tab, Fname, FH, MinSlots, MaxSlots, 
-			      Version, OpenArgs)
+			      OpenArgs)
 	    end;
 	{repair, Mess} ->
 	    io:format(user, "dets: file ~tp~s~n", [Fname, Mess]),
             do_repair(Fd, Tab, Fname, FH, MinSlots, MaxSlots, 
-		      Version, OpenArgs);
-	_ when FH#fileheader.version =/= Version, Version =/= default ->
-	    throw({error, {version_mismatch, Fname}});
+		      OpenArgs);
 	{final, H} ->
 	    H1 = H#head{auto_save = Auto},
 	    open_final(H1, Fname, Acc, Ram, CacheSz, Tab, Debug)
     end.
 
-do_repair(Fd, Tab, Fname, FH, MinSlots, MaxSlots, Version, OpenArgs) ->
-    case fsck(Fd, Tab, Fname, FH, MinSlots, MaxSlots, Version) of
+do_repair(Fd, Tab, Fname, FH, MinSlots, MaxSlots, OpenArgs) ->
+    case fsck(Fd, Tab, Fname, FH, MinSlots, MaxSlots) of
 	ok ->
-	    %% No need to update 'version'.
 	    erlang:garbage_collect(),
 	    fopen3(Tab, OpenArgs#open_args{repair = false});
 	Error ->
@@ -2673,8 +2612,8 @@ open_final(Head, Fname, Acc, Ram, CacheSz, Tab, Debug) ->
 		      filename = Fname,
 		      name = Tab,
 		      cache = dets_utils:new_cache(CacheSz)},
-    init_disk_map(Head1#head.version, Tab, Debug),
-    (Head1#head.mod):cache_segps(Head1#head.fptr, Fname, Head1#head.next),
+    init_disk_map(Tab, Debug),
+    dets_v9:cache_segps(Head1#head.fptr, Fname, Head1#head.next),
     check_growth(Head1),
     {ok, Head1}.
 
@@ -2683,7 +2622,7 @@ fopen_init_file(Tab, OpenArgs) ->
     #open_args{file = Fname, type = Type, keypos = Kp, 
                min_no_slots = MinSlotsArg, max_no_slots = MaxSlotsArg, 
 	       ram_file = Ram, delayed_write = CacheSz, auto_save = Auto, 
-               version = UseVersion, debug = Debug} = OpenArgs,
+               debug = Debug} = OpenArgs,
     MinSlots = choose_no_slots(MinSlotsArg, ?DEFAULT_MIN_NO_SLOTS),
     MaxSlots = choose_no_slots(MaxSlotsArg, ?DEFAULT_MAX_NO_SLOTS),
     FileSpec = if
@@ -2691,20 +2630,11 @@ fopen_init_file(Tab, OpenArgs) ->
 		   true -> Fname
 	       end,
     {ok, Fd} = dets_utils:open(FileSpec, open_args(read_write, Ram)),
-    Version = if
-                  UseVersion =:= default ->
-                      case os:getenv("DETS_USE_FILE_FORMAT") of
-                          "8" -> 8;
-                          _ -> 9
-                      end;
-                  true ->
-                      UseVersion
-              end,
-    Mod = version2module(Version),
     %% No need to truncate an empty file.
-    init_disk_map(Version, Tab, Debug),
-    case catch Mod:initiate_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots,
-				 Ram, CacheSz, Auto, true) of
+    init_disk_map(Tab, Debug),
+    case catch dets_v9:initiate_file(Fd, Tab, Fname, Type, Kp,
+                                     MinSlots, MaxSlots,
+                                     Ram, CacheSz, Auto, true) of
 	{error, Reason} when Ram ->
 	    _ = file:close(Fd),
 	    throw({error, Reason});
@@ -2719,15 +2649,13 @@ fopen_init_file(Tab, OpenArgs) ->
     end.
 
 %% Debug.
-init_disk_map(9, Name, Debug) ->
+init_disk_map(Name, Debug) ->
     case Debug orelse dets_utils:debug_mode() of
         true -> 
             dets_utils:init_disk_map(Name);
         false ->
             ok
-    end;
-init_disk_map(_Version, _Name, _Debug) ->
-    ok.
+    end.
 
 open_args(Access, RamFile) ->
     A1 = case Access of
@@ -2740,15 +2668,7 @@ open_args(Access, RamFile) ->
 	   end,
     A1 ++ A2 ++ [binary, read].
 
-version2module(V) when V =< 8 -> dets_v8;
-version2module(9) -> dets_v9.
-
-module2version(dets_v8) -> 8;
-module2version(dets_v9) -> 9;
-module2version(not_used) -> 9.
-
 %% -> ok | throw(Error) 
-%% For version 9 tables only.
 compact(SourceHead) ->
     #head{name = Tab, filename = Fname, fptr = SFd, type = Type, keypos = Kp,
 	  ram_file = Ram, auto_save = Auto} = SourceHead,
@@ -2759,7 +2679,7 @@ compact(SourceHead) ->
     %% It is normally not possible to have two open tables in the same
     %% process since the process dictionary is used for caching
     %% segment pointers, but here is works anyway--when reading a file
-    %% serially the pointers to not need to be used.
+    %% serially the pointers do not need to be used.
     Head = case catch dets_v9:prep_table_copy(Fd, Tab, Tmp, Type, Kp, Ram, 
 					      CacheSz, Auto, TblParms) of
 	       {ok, H} ->
@@ -2794,7 +2714,7 @@ compact(SourceHead) ->
 	    
 %% -> ok | Error
 %% Closes Fd.
-fsck(Fd, Tab, Fname, FH, MinSlotsArg, MaxSlotsArg, Version) ->
+fsck(Fd, Tab, Fname, FH, MinSlotsArg, MaxSlotsArg) ->
     %% MinSlots and MaxSlots are the option values.
     #fileheader{min_no_slots = MinSlotsFile, 
                 max_no_slots = MaxSlotsFile} = FH,
@@ -2807,10 +2727,10 @@ fsck(Fd, Tab, Fname, FH, MinSlotsArg, MaxSlotsArg, Version) ->
     %% If the number of objects (keys) turns out to be significantly
     %% different from NoSlots, we try again with the correct number of
     %% objects (keys).
-    case fsck_try(Fd, Tab, FH, Fname, SlotNumbers, Version) of
+    case fsck_try(Fd, Tab, FH, Fname, SlotNumbers) of
         {try_again, BetterNoSlots} ->
 	    BetterSlotNumbers = {MinSlots, BetterNoSlots, MaxSlots},
-            case fsck_try(Fd, Tab, FH, Fname, BetterSlotNumbers, Version) of
+            case fsck_try(Fd, Tab, FH, Fname, BetterSlotNumbers) of
                 {try_again, _} ->
                     _ = file:close(Fd),
                     {error, {cannot_repair, Fname}};
@@ -2829,7 +2749,7 @@ choose_no_slots(NoSlots, _) -> NoSlots.
 %% Initiating a table using a fun and repairing (or converting) a
 %% file are completely different things, but nevertheless the same
 %% method is used in both cases...
-fsck_try(Fd, Tab, FH, Fname, SlotNumbers, Version) ->
+fsck_try(Fd, Tab, FH, Fname, SlotNumbers) ->
     Tmp = tempfile(Fname),
     #fileheader{type = Type, keypos = KeyPos} = FH,
     {_MinSlots, EstNoSlots, MaxSlots} = SlotNumbers,
@@ -2838,7 +2758,7 @@ fsck_try(Fd, Tab, FH, Fname, SlotNumbers, Version) ->
 			  max_no_slots = MaxSlots,
                           ram_file = false, delayed_write = ?DEFAULT_CACHE,
                           auto_save = infinity, access = read_write,
-                          version = Version, debug = false},
+                          debug = false},
     case catch fopen3(Tab, OpenArgs) of
 	{ok, Head} ->
             case fsck_try_est(Head, Fd, Fname, SlotNumbers, FH) of
@@ -2888,10 +2808,9 @@ assure_no_file(File) ->
 %% -> {ok, NewHead} | {try_again, integer()} | Error
 fsck_try_est(Head, Fd, Fname, SlotNumbers, FH) ->
     %% Mod is the module to use for reading input when repairing.
-    Mod = FH#fileheader.mod,
     Cntrs = ets:new(dets_repair, []),
-    Input = Mod:fsck_input(Head, Fd, Cntrs, FH),
-    {Reply, SizeData} = do_sort(Head, SlotNumbers, Input, Cntrs, Fname, Mod),
+    Input = dets_v9:fsck_input(Head, Fd, Cntrs, FH),
+    {Reply, SizeData} = do_sort(Head, SlotNumbers, Input, Cntrs, Fname),
     Bulk = false,
     case Reply of 
         {ok, NoDups, H1} ->
@@ -2906,14 +2825,13 @@ fsck_try_est(Head, Fd, Fname, SlotNumbers, FH) ->
 	    Else
     end.
 
-do_sort(Head, SlotNumbers, Input, Cntrs, Fname, Mod) ->
-    OldV = module2version(Mod),
+do_sort(Head, SlotNumbers, Input, Cntrs, Fname) ->
     %% output_objs/4 replaces {LogSize,NoObjects} in Cntrs by
     %% {LogSize,Position,Data,NoObjects | NoCollections}.
     %% Data = {FileName,FileDescriptor} | [object()]
-    %% For small tables Data may be a list of objects which is more
+    %% For small tables Data can be a list of objects which is more
     %% efficient since no temporary files are created.
-    Output = (Head#head.mod):output_objs(OldV, Head, SlotNumbers, Cntrs),
+    Output = dets_v9:output_objs(Head, SlotNumbers, Cntrs),
     TmpDir = filename:dirname(Fname),
     Reply = (catch file_sorter:sort(Input, Output, 
 				    [{format, binary},{tmpdir, TmpDir}])),
@@ -2954,13 +2872,6 @@ fsck_copy1([SzData | L], Head, Bulk, NoDups) ->
 	{ok, Copied} when Copied =:= ExpectedSize;
 			  NoObjects =:= 0 -> % the segments
 	    fsck_copy1(L, Head, Bulk, NoDups);
-	{ok, Copied} when Bulk, Head#head.version =:= 8 ->
-	    NoZeros = ExpectedSize - Copied,
-	    Dups = NoZeros div Size,
-	    Addr = Pos+Copied,
-	    NewHead = free_n_objects(Head, Addr, Size-1, NoDups),
-	    NewNoDups = NoDups - Dups,
-	    fsck_copy1(L, NewHead, Bulk, NewNoDups);
 	{ok, _Copied} -> % should never happen
 	    close_files(Bulk, L, Head),
 	    Reason = if Bulk -> initialization_failed; 
@@ -2975,13 +2886,6 @@ fsck_copy1([], Head, _Bulk, NoDups) when NoDups =/= 0 ->
 fsck_copy1([], Head, _Bulk, _NoDups) ->
     {ok, Head#head{update_mode = dirty}}. 
 
-free_n_objects(Head, _Addr, _Size, 0) ->
-    Head;
-free_n_objects(Head, Addr, Size, N) ->
-    {NewHead, _} = dets_utils:free(Head, Addr, Size),
-    NewAddr = Addr + Size + 1,
-    free_n_objects(NewHead, NewAddr, Size, N-1).
-
 close_files(false, SizeData, Head) ->
     _ = file:close(Head#head.fptr),
     close_files(true, SizeData, Head);
@@ -3000,7 +2904,7 @@ close_tmp(Fd) ->
 fslot(H, Slot) ->
     case catch begin
                    {NH, []} = write_cache(H),
-                   Objs = (NH#head.mod):slot_objs(NH, Slot),
+                   Objs = dets_v9:slot_objs(NH, Slot),
                    {NH, Objs}
                end of
         {NewHead, _Objects} = Reply when is_record(NewHead, head) ->
@@ -3050,7 +2954,7 @@ where_is_object(Head, Object) ->
 	true ->
 	    case catch write_cache(Head) of
 		{NewHead, []} ->
-		    {NewHead, (Head#head.mod):find_object(NewHead, Object)};
+		    {NewHead, dets_v9:find_object(NewHead, Object)};
 		{NewHead, _} = HeadError when is_record(NewHead, head) ->
 		    HeadError
 	    end;
@@ -3063,13 +2967,9 @@ check_objects([T | Ts], Kp) when tuple_size(T) >= Kp ->
 check_objects(L, _Kp) ->
     L =:= [].
 
-no_things(Head) when Head#head.no_keys =:= undefined ->
-    Head#head.no_objects;
 no_things(Head) ->
     Head#head.no_keys.
 
-file_no_things(FH) when FH#fileheader.no_keys =:= undefined ->
-    FH#fileheader.no_objects;
 file_no_things(FH) ->
     FH#fileheader.no_keys.
 
@@ -3110,7 +3010,7 @@ update_cache(Head, ToAdd) ->
     if 
 	Lookup; NewSize >= Cache#cache.tsize ->
 	    %% The cache is considered full, or some lookup.
-	    {NewHead, LU, PwriteList} = (Head#head.mod):write_cache(Head1),
+	    {NewHead, LU, PwriteList} = dets_v9:write_cache(Head1),
 	    {NewHead, Found ++ LU, PwriteList};
 	NewC =:= [] ->
 	    {Head1, Found, []};
@@ -3195,7 +3095,7 @@ delayed_write(Head, WrTime) ->
 
 %% -> {NewHead, [LookedUpObject]} | throw({NewHead, Error})
 write_cache(Head) ->
-    {Head1, LU, PwriteList} = (Head#head.mod):write_cache(Head),
+    {Head1, LU, PwriteList} = dets_v9:write_cache(Head),
     {NewHead, ok} = dets_utils:pwrite(Head1, PwriteList),
     {NewHead, LU}.
 
@@ -3248,7 +3148,7 @@ scan(Head, C) -> % when is_record(C, dets_cont)
     scan(Bin, Head, From, To, L, [], R, {C, Head#head.type}).
 
 scan(Bin, H, From, To, L, Ts, R, {C0, Type} = C) ->
-    case (H#head.mod):scan_objs(H, Bin, From, To, L, Ts, R, Type) of
+    case dets_v9:scan_objs(H, Bin, From, To, L, Ts, R, Type) of
         {more, NFrom, NTo, NL, NTs, NR, Sz} ->
             scan_read(H, NFrom, NTo, Sz, NL, NTs, NR, C);
         {stop, <<>>=B, NFrom, NTo, <<>>=NL, NTs} ->
@@ -3317,7 +3217,7 @@ file_info(FileName) ->
     case catch read_file_header(FileName, read, false) of
 	{ok, Fd, FH} ->
 	    _ = file:close(Fd),
-            (FH#fileheader.mod):file_info(FH);
+            dets_v9:file_info(FH);
 	Other ->
 	    Other
     end.
@@ -3332,15 +3232,13 @@ get_head_field(Fd, Field) ->
 view(FileName) ->
     case catch read_file_header(FileName, read, false) of
         {ok, Fd, FH} ->
-	    Mod = FH#fileheader.mod,
-            try Mod:check_file_header(FH, Fd) of
-                {ok, H0, ExtraInfo} ->
-                    Mod = FH#fileheader.mod,
-                    case Mod:check_file_header(FH, Fd) of
-                        {ok, H0, ExtraInfo} ->
-                            H = Mod:init_freelist(H0, ExtraInfo),
+            try dets_v9:check_file_header(FH, Fd) of
+                {ok, H0} ->
+                    case dets_v9:check_file_header(FH, Fd) of
+                        {ok, H0} ->
+                            H = dets_v9:init_freelist(H0),
                             v_free_list(H),
-                            Mod:v_segments(H),
+                            dets_v9:v_segments(H),
                             ok;
                         X ->
                             X